From 16d027bb2c979bf76485742c0eb6cbd652063f2d Mon Sep 17 00:00:00 2001 From: agibsonccc Date: Sat, 6 Mar 2021 20:07:11 +0900 Subject: [PATCH] Update surefire plugin loading paths --- datavec/pom.xml | 3 +- libnd4j/test-results.txt | 3015 +++++++++++++++++ libnd4j/tests_cpu/run_tests.sh | 12 +- .../java/org/nd4j/nativeblas/Nd4jCpu.java | 48 +- nd4j/nd4j-backends/nd4j-backend-impls/pom.xml | 6 +- nd4j/nd4j-backends/nd4j-tests/pom.xml | 5 +- .../nd4j-parameter-server-client/pom.xml | 2 +- .../nd4j-parameter-server-node/pom.xml | 2 +- nd4j/nd4j-serde/nd4j-aeron/pom.xml | 22 +- pom.xml | 27 + rl4j/pom.xml | 3 +- 11 files changed, 3102 insertions(+), 43 deletions(-) create mode 100644 libnd4j/test-results.txt diff --git a/datavec/pom.xml b/datavec/pom.xml index d1c46077f..7808f50d4 100644 --- a/datavec/pom.xml +++ b/datavec/pom.xml @@ -159,7 +159,8 @@ maven-surefire-plugin ${maven-surefire-plugin.version} - -Ddtype=float -Dfile.encoding=UTF-8 + -Dorg.bytedeco.javacpp.logger.debug=true -Djava.library.path="${nd4j.basedir}/nd4j-backends/nd4j-backend-impls/nd4j-cuda/target/classes" + org.apache.maven.plugins @@ -140,7 +141,7 @@ Maximum heap size was set to 8g, as a minimum required value for tests run. Depending on a build machine, default value is not always enough. --> - -Ddtype=float -Dfile.encoding=UTF-8 -Xmx8g + -Dorg.bytedeco.javacpp.logger.debug=true -Djava.library.path="${nd4j.basedir}/nd4j-backends/nd4j-backend-impls/nd4j-cuda/target/classes" @@ -214,6 +215,8 @@ nd4j-native-preset nd4j-native-platform + + cuda @@ -228,6 +231,7 @@ nd4j-cuda-preset nd4j-cuda-platform + libnd4j-cuda diff --git a/nd4j/nd4j-backends/nd4j-tests/pom.xml b/nd4j/nd4j-backends/nd4j-tests/pom.xml index 7d8dcb5af..591c71c29 100644 --- a/nd4j/nd4j-backends/nd4j-tests/pom.xml +++ b/nd4j/nd4j-backends/nd4j-tests/pom.xml @@ -362,8 +362,11 @@ - ${env.LD_LIBRARY_PATH}:${user.dir}:${libnd4jhome}/blasbuild/cpu/blas/ + ${env.LD_LIBRARY_PATH}:${user.dir}:${libnd4jhome}/blasbuild/cpu/blas/:${nd4j.native.basedir}/target/classes + + ${env.PATH}:${user.dir}:${libnd4jhome}/blasbuild/cpu/blas/:${nd4j.native.basedir}/target/classes + src/test/java diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-client/pom.xml b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-client/pom.xml index 98a8b070f..f93126235 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-client/pom.xml +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-client/pom.xml @@ -105,7 +105,7 @@ *.java **/*.java - -Ddtype=float -Xmx8g + -Dorg.bytedeco.javacpp.logger.debug=true -Djava.library.path="${nd4j.basedir}/nd4j-backends/nd4j-backend-impls/nd4j-cuda/target/classes" diff --git a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/pom.xml b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/pom.xml index 234845c67..4f724936b 100644 --- a/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/pom.xml +++ b/nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/pom.xml @@ -107,7 +107,7 @@ *.java **/*.java - -Ddtype=float -Xmx8g + -Dorg.bytedeco.javacpp.logger.debug=true -Djava.library.path="${nd4j.basedir}/nd4j-backends/nd4j-backend-impls/nd4j-cuda/target/classes" diff --git a/nd4j/nd4j-serde/nd4j-aeron/pom.xml b/nd4j/nd4j-serde/nd4j-aeron/pom.xml index 236004a0c..8a24da6a0 100644 --- a/nd4j/nd4j-serde/nd4j-aeron/pom.xml +++ b/nd4j/nd4j-serde/nd4j-aeron/pom.xml @@ -20,8 +20,8 @@ --> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 @@ -90,11 +90,17 @@ org.apache.maven.plugins maven-surefire-plugin + true + + + org.nd4j + nd4j-native + ${project.version} + + - - ${env.LD_LIBRARY_PATH}${path.separator}${user.dir}${path.separator}${libnd4jhome}/blasbuild/cpu/blas/${path.separator}${libnd4jhome}/../nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/target/classes - + src/test/java @@ -119,6 +125,7 @@ For testing large zoo models, this may not be enough (so comment it out). --> + -Dorg.bytedeco.javacpp.logger.debug=true -Djava.library.path="${nd4j.basedir}/nd4j-backends/nd4j-backend-impls/nd4j-native/target/classes" @@ -150,9 +157,6 @@ - - ${env.LD_LIBRARY_PATH}:${user.dir}:${libnd4jhome}/blasbuild/cuda/blas/ - src/test/java @@ -175,7 +179,7 @@ Maximum heap size was set to 6g, as a minimum required value for tests run. Depending on a build machine, default value is not always enough. --> - -Ddtype=float -Xmx6g + -Dorg.bytedeco.javacpp.logger.debug=true -Djava.library.path="${nd4j.basedir}/nd4j-backends/nd4j-backend-impls/nd4j-cuda/target/classes" diff --git a/pom.xml b/pom.xml index 034af675e..3764dca01 100644 --- a/pom.xml +++ b/pom.xml @@ -176,6 +176,9 @@ + + + 1.5.4 1.5.4 1.5.4 @@ -315,6 +318,7 @@ 2.2.0 1.4.30 1.3 + @@ -606,6 +610,27 @@ + + org.commonjava.maven.plugins + directory-maven-plugin + 0.3.1 + + + native-dir + + directory-of + + initialize + + nd4j.basedir + + org.nd4j + nd4j + + + + + org.apache.maven.plugins maven-source-plugin @@ -939,6 +964,8 @@ ${basedir}/../../../../libnd4j/ + + javacpp-platform-default diff --git a/rl4j/pom.xml b/rl4j/pom.xml index eb9ae1c8b..0b5ee45c3 100644 --- a/rl4j/pom.xml +++ b/rl4j/pom.xml @@ -101,7 +101,8 @@ maven-surefire-plugin ${maven-surefire-plugin.version} - -Ddtype=double + -Ddtype=double -Dorg.bytedeco.javacpp.logger.debug=true -Djava.library.path="${nd4j.basedir}/nd4j-backends/nd4j-backend-impls/nd4j-cuda/target/classes" +