From dcf226e45c80c6b74664af6102fd329bb43e812a Mon Sep 17 00:00:00 2001 From: Adam Pocock Date: Fri, 1 Mar 2024 16:23:42 -0500 Subject: [PATCH 1/5] Candidate fixes for profiles. --- pom.xml | 2 +- tensorflow-core/pom.xml | 572 ------------------ .../op/javadoc/CoreJavaDocNodeRenderer.java | 13 +- .../tensorflow-core-native/pom.xml | 15 +- 4 files changed, 15 insertions(+), 587 deletions(-) diff --git a/pom.xml b/pom.xml index f86e92bc69a..26aef342cbd 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ 5.10.0 1.37 2.7 - 2.10.0 + 2.25.0 true true true diff --git a/tensorflow-core/pom.xml b/tensorflow-core/pom.xml index 89b4b06a2d3..3306bd9f2ce 100644 --- a/tensorflow-core/pom.xml +++ b/tensorflow-core/pom.xml @@ -61,7 +61,6 @@ macosx-x86_64${javacpp.platform.extension} windows-x86_64${javacpp.platform.extension} 1.5.10 - @@ -91,577 +90,6 @@ ${os.name}-${os.arch} - ${os.name}-${os.arch} - ${os.name}-${os.arch} - ${os.name}-${os.arch} - ${os.name}-${os.arch} - ${os.name}-${os.arch} - ${os.name}-${os.arch} - ${os.name}-${os.arch}${javacpp.platform.extension} - ${os.name}-${os.arch}${javacpp.platform.extension} - ${os.name}-${os.arch}${javacpp.platform.extension} - ${os.name}-${os.arch}${javacpp.platform.extension} - ${os.name}-${os.arch}${javacpp.platform.extension} - ${os.name}-${os.arch}${javacpp.platform.extension} - - - - - javacpp-platform-custom - - - javacpp.platform - - - - ${javacpp.platform} - ${javacpp.platform} - ${javacpp.platform} - ${javacpp.platform} - ${javacpp.platform} - ${javacpp.platform} - ${javacpp.platform} - ${javacpp.platform} - ${javacpp.platform} - ${javacpp.platform}${javacpp.platform.extension} - ${javacpp.platform}${javacpp.platform.extension} - ${javacpp.platform}${javacpp.platform.extension} - ${javacpp.platform}${javacpp.platform.extension} - ${javacpp.platform}${javacpp.platform.extension} - ${javacpp.platform}${javacpp.platform.extension} - ${javacpp.platform}${javacpp.platform.extension} - ${javacpp.platform}${javacpp.platform.extension} - ${javacpp.platform}${javacpp.platform.extension} - - - - - javacpp.platform.custom-true - - - javacpp.platform.custom - - - - - - - - - - - - - - - - - - - - - - - - - - - javacpp-platform-none - - - javacpp.platform.none - - - - - - - - - - - - - - - - - - - - - - - - - - - javacpp-platform-linux-armhf - - - javacpp.platform - linux-armhf - - - - ${javacpp.platform} - - - - - - - - - ${javacpp.platform}${javacpp.platform.extension} - - - - - - - - - - - - - javacpp-platform-linux-arm64 - - - javacpp.platform - linux-arm64 - - - - - ${javacpp.platform} - - - - - - - - - ${javacpp.platform}${javacpp.platform.extension} - - - - - - - - - - - - javacpp-platform-linux-x86_64 - - - javacpp.platform - linux-x86_64 - - - - - - - - ${javacpp.platform} - - - - - - - - - ${javacpp.platform}${javacpp.platform.extension} - - - - - - - - - javacpp-platform-macosx-arm64 - - - javacpp.platform - macosx-arm64 - - - - - - - - - ${javacpp.platform} - - - - - - - - - ${javacpp.platform}${javacpp.platform.extension} - - - - - - - - javacpp-platform-macosx-x86_64 - - - javacpp.platform - macosx-x86_64 - - - - - - - - - - ${javacpp.platform} - - - - - - - - - ${javacpp.platform}${javacpp.platform.extension} - - - - - - - javacpp-platform-windows-x86_64 - - - javacpp.platform - windows-x86_64 - - - - - - - - - - - - ${javacpp.platform} - - - - - - - - - ${javacpp.platform}${javacpp.platform.extension} - - - - - - javacpp.platform.linux-armhf-true - - - javacpp.platform.linux-armhf - - - - linux-armhf - linux-armhf${javacpp.platform.extension} - - - - - javacpp.platform.linux-arm64-true - - - javacpp.platform.linux-arm64 - - - - linux-arm64 - linux-arm64${javacpp.platform.extension} - - - - - javacpp.platform.linux-x86_64-true - - - javacpp.platform.linux-x86_64 - - - - linux-x86_64 - linux-x86_64${javacpp.platform.extension} - - - - - javacpp.platform.macosx-arm64-true - - - javacpp.platform.macosx-arm64 - - - - macosx-arm64 - macosx-arm64${javacpp.platform.extension} - - - - - javacpp.platform.macosx-x86_64-true - - - javacpp.platform.macosx-x86_64 - - - - macosx-x86_64 - macosx-x86_64${javacpp.platform.extension} - - - - - javacpp.platform.windows-x86_64-true - - - javacpp.platform.windows-x86_64 - - - - windows-x86_64 - windows-x86_64${javacpp.platform.extension} - - - - - javacpp.platform.custom-linux-arm - - - javacpp.platform.host - - linuxarm - - - linux-armhf - linux-armhf${javacpp.platform.extension} - - - - - javacpp.platform.custom-linux-armhf - - - javacpp.platform.host - - linuxarmhf - - - linux-armhf - linux-armhf${javacpp.platform.extension} - - - - - javacpp.platform.custom-linux-aarch64 - - - javacpp.platform.host - - linuxaarch64 - - - linux-arm64 - linux-arm64${javacpp.platform.extension} - - - - - javacpp.platform.custom-linux-armv8 - - - javacpp.platform.host - - linuxarmv8 - - - linux-arm64 - linux-arm64${javacpp.platform.extension} - - - - - javacpp.platform.custom-linux-arm64 - - - javacpp.platform.host - - linuxarm64 - - - linux-arm64 - linux-arm64${javacpp.platform.extension} - - - - - javacpp.platform.custom-linux-amd64 - - - javacpp.platform.host - - linuxamd64 - - - linux-x86_64 - linux-x86_64${javacpp.platform.extension} - - - - - javacpp.platform.custom-linux-x86-64 - - - javacpp.platform.host - - linuxx86-64 - - - linux-x86_64 - linux-x86_64${javacpp.platform.extension} - - - - - javacpp.platform.custom-linux-x86_64 - - - javacpp.platform.host - - linuxx86_64 - - - linux-x86_64 - linux-x86_64${javacpp.platform.extension} - - - - - javacpp.platform.custom-macosx-amd64 - - - javacpp.platform.host - - mac os xamd64 - - - macosx-x86_64 - macosx-x86_64${javacpp.platform.extension} - - - - - javacpp.platform.custom-macosx-x86-64 - - - javacpp.platform.host - - mac os xx86-64 - - - macosx-x86_64 - macosx-x86_64${javacpp.platform.extension} - - - - - javacpp.platform.custom-macosx-aarch64 - - - javacpp.platform.host - - mac os xaarch64 - - - macosx-arm64 - macosx-arm64${javacpp.platform.extension} - - - - - javacpp.platform.custom-macosx-x86_64 - - - javacpp.platform.host - - mac os xx86_64 - - - macosx-x86_64 - macosx-x86_64${javacpp.platform.extension} - - - - - javacpp.platform.custom-windows-amd64 - - - javacpp.platform.host - - windowsamd64 - - - windows-x86_64 - windows-x86_64${javacpp.platform.extension} - - - - - javacpp.platform.custom-windows-x86-64 - - - javacpp.platform.host - - windowsx86-64 - - - windows-x86_64 - windows-x86_64${javacpp.platform.extension} - - - - - javacpp.platform.custom-windows-x86_64 - - - javacpp.platform.host - - windowsx86_64 - - - windows-x86_64 - windows-x86_64${javacpp.platform.extension} diff --git a/tensorflow-core/tensorflow-core-generator/src/main/java/org/tensorflow/generator/op/javadoc/CoreJavaDocNodeRenderer.java b/tensorflow-core/tensorflow-core-generator/src/main/java/org/tensorflow/generator/op/javadoc/CoreJavaDocNodeRenderer.java index 82be0136b2b..8d47f030679 100644 --- a/tensorflow-core/tensorflow-core-generator/src/main/java/org/tensorflow/generator/op/javadoc/CoreJavaDocNodeRenderer.java +++ b/tensorflow-core/tensorflow-core-generator/src/main/java/org/tensorflow/generator/op/javadoc/CoreJavaDocNodeRenderer.java @@ -151,15 +151,10 @@ public class CoreJavaDocNodeRenderer extends AbstractVisitor implements NodeRend "", }; private static final Set allowedHtml5Tags = new HashSet<>(Arrays.asList(html5Tags)); - private static final Map urlLinkConversion = - new HashMap() { - { - put("../../../api_docs/python/math_ops", "org.tensorflow.op.MathOps"); - put( - "https://www.tensorflow.org/api_docs/python/tf/tensor_scatter_nd_update", - "org.tensorflow.op.Ops#tensorScatterNdUpdate"); - } - }; + private static final Map urlLinkConversion = Map.of( + "../../../api_docs/python/math_ops", "org.tensorflow.op.MathOps", + "https://www.tensorflow.org/api_docs/python/tf/tensor_scatter_nd_update", "org.tensorflow.op.Ops#tensorScatterNdUpdate"); + protected final JavaDocNodeRendererContext context; private final JavaDocWriter writer; private boolean firstParagraph; diff --git a/tensorflow-core/tensorflow-core-native/pom.xml b/tensorflow-core/tensorflow-core-native/pom.xml index 00c67371547..8dfab99d6dc 100644 --- a/tensorflow-core/tensorflow-core-native/pom.xml +++ b/tensorflow-core/tensorflow-core-native/pom.xml @@ -148,23 +148,23 @@ - ${project.build.directory}/${artifactId}-${project.version}-${javacpp.platform.linux-x86_64}.jar + ${project.build.directory}/${project.artifactId}-${project.version}-${javacpp.platform.linux-x86_64}.jar ${javacpp.platform.linux-x86_64} - ${project.build.directory}/${artifactId}-${project.version}-${javacpp.platform.linux-x86_64}-gpu.jar + ${project.build.directory}/${project.artifactId}-${project.version}-${javacpp.platform.linux-x86_64}-gpu.jar ${javacpp.platform.linux-x86_64}-gpu - ${project.build.directory}/${artifactId}-${project.version}-${javacpp.platform.macosx-arm64}.jar + ${project.build.directory}/${project.artifactId}-${project.version}-${javacpp.platform.macosx-arm64}.jar ${javacpp.platform.macosx-arm64} - ${project.build.directory}/${artifactId}-${project.version}-${javacpp.platform.macosx-x86_64}.jar + ${project.build.directory}/${project.artifactId}-${project.version}-${javacpp.platform.macosx-x86_64}.jar ${javacpp.platform.macosx-x86_64} - ${project.build.directory}/${artifactId}-${project.version}-${javacpp.platform.windows-x86_64}.jar + ${project.build.directory}/${project.artifactId}-${project.version}-${javacpp.platform.windows-x86_64}.jar ${javacpp.platform.windows-x86_64} @@ -528,6 +528,11 @@ jar + + + tensorflow.nativelib.${os.name}.${os.arch} + + ${native.classifier} true From c952089b099a8a24ddf0ddf1ddb3d50352ea306e Mon Sep 17 00:00:00 2001 From: Adam Pocock Date: Fri, 1 Mar 2024 16:27:32 -0500 Subject: [PATCH 2/5] Moving tensorflow-core-platform to the deploying profile. --- tensorflow-core/pom.xml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tensorflow-core/pom.xml b/tensorflow-core/pom.xml index 3306bd9f2ce..b6ddbd65797 100644 --- a/tensorflow-core/pom.xml +++ b/tensorflow-core/pom.xml @@ -34,7 +34,6 @@ tensorflow-core-native tensorflow-core-generator tensorflow-core-api - tensorflow-core-platform @@ -73,6 +72,9 @@ ${os.name}-${os.arch} + + tensorflow-core-platform + @@ -83,17 +85,13 @@ --> javacpp-platform-host - true - javacpp.platform.host + !javacpp.platform ${os.name}-${os.arch} - - - From 00a84dc0eac93ecffec01ff76ec91530f0ff4835 Mon Sep 17 00:00:00 2001 From: Adam Pocock Date: Fri, 1 Mar 2024 16:32:36 -0500 Subject: [PATCH 3/5] Make spotless happy. --- .../generator/op/javadoc/CoreJavaDocNodeRenderer.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tensorflow-core/tensorflow-core-generator/src/main/java/org/tensorflow/generator/op/javadoc/CoreJavaDocNodeRenderer.java b/tensorflow-core/tensorflow-core-generator/src/main/java/org/tensorflow/generator/op/javadoc/CoreJavaDocNodeRenderer.java index 8d47f030679..cc80f5f0bb6 100644 --- a/tensorflow-core/tensorflow-core-generator/src/main/java/org/tensorflow/generator/op/javadoc/CoreJavaDocNodeRenderer.java +++ b/tensorflow-core/tensorflow-core-generator/src/main/java/org/tensorflow/generator/op/javadoc/CoreJavaDocNodeRenderer.java @@ -3,7 +3,6 @@ import com.google.common.base.CaseFormat; import java.util.Arrays; import java.util.Collections; -import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.Map; @@ -151,9 +150,11 @@ public class CoreJavaDocNodeRenderer extends AbstractVisitor implements NodeRend "", }; private static final Set allowedHtml5Tags = new HashSet<>(Arrays.asList(html5Tags)); - private static final Map urlLinkConversion = Map.of( - "../../../api_docs/python/math_ops", "org.tensorflow.op.MathOps", - "https://www.tensorflow.org/api_docs/python/tf/tensor_scatter_nd_update", "org.tensorflow.op.Ops#tensorScatterNdUpdate"); + private static final Map urlLinkConversion = + Map.of( + "../../../api_docs/python/math_ops", "org.tensorflow.op.MathOps", + "https://www.tensorflow.org/api_docs/python/tf/tensor_scatter_nd_update", + "org.tensorflow.op.Ops#tensorScatterNdUpdate"); protected final JavaDocNodeRendererContext context; private final JavaDocWriter writer; From aa740ad9c6d4b0757f7ec86cc866d8f711d2588e Mon Sep 17 00:00:00 2001 From: Adam Pocock Date: Fri, 8 Mar 2024 16:42:47 -0500 Subject: [PATCH 4/5] Removing extensions from tensorflow-core-platform pom. --- tensorflow-core/tensorflow-core-platform/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tensorflow-core/tensorflow-core-platform/pom.xml b/tensorflow-core/tensorflow-core-platform/pom.xml index 8da78e44c86..5ed680a8bf2 100644 --- a/tensorflow-core/tensorflow-core-platform/pom.xml +++ b/tensorflow-core/tensorflow-core-platform/pom.xml @@ -41,25 +41,25 @@ org.tensorflow tensorflow-core-native ${project.version} - ${javacpp.platform.linux-x86_64.extension} + linux-x86_64 org.tensorflow tensorflow-core-native ${project.version} - ${javacpp.platform.macosx-arm64.extension} + macosx-arm64 org.tensorflow tensorflow-core-native ${project.version} - ${javacpp.platform.macosx-x86_64.extension} + macosx-x86_64 org.tensorflow tensorflow-core-native ${project.version} - ${javacpp.platform.windows-x86_64.extension} + windows-x86_64 From 25794653369362fe3b744e9292d8a3ef58900064 Mon Sep 17 00:00:00 2001 From: Adam Pocock Date: Fri, 29 Mar 2024 14:19:23 -0400 Subject: [PATCH 5/5] More pom fixes. --- pom.xml | 2 ++ tensorflow-core/pom.xml | 20 -------------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/pom.xml b/pom.xml index 26aef342cbd..41d80cf24fa 100644 --- a/pom.xml +++ b/pom.xml @@ -36,6 +36,8 @@ + ${os.name}-${os.arch} + UTF8 11 11 diff --git a/tensorflow-core/pom.xml b/tensorflow-core/pom.xml index b6ddbd65797..d0ea8480f95 100644 --- a/tensorflow-core/pom.xml +++ b/tensorflow-core/pom.xml @@ -69,29 +69,9 @@ must have already been built, tested and deployed priorly from their respective platform. --> deploying - - ${os.name}-${os.arch} - tensorflow-core-platform - - - - javacpp-platform-host - - - !javacpp.platform - - - - ${os.name}-${os.arch} - -