Brutex
/
cavis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/eclipse/deeplearning4j

master
agibsonccc 2021-03-06 20:50:32 +09:00
parent b41ee439d0 4927a762eb
commit 7092dcc42e
9 changed files with 3070 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
datavec/pom.xml
View File

@ -159,7 +159,8 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<argLine>-Ddtype=float -Dfile.encoding=UTF-8</argLine>
<argLine>-Dorg.bytedeco.javacpp.logger.debug=true -Djava.library.path="${nd4j.basedir}/nd4j-backends/nd4j-backend-impls/nd4j-cuda/target/classes"</argLine>
<!--
By default: Surefire will set the classpath based on the manifest. Because tests are not included
in the JAR, any tests that rely on class path scanning for resources in the tests directory will not

3015
libnd4j/test-results.txt Normal file
View File

File diff suppressed because one or more lines are too long

6
nd4j/nd4j-backends/nd4j-backend-impls/pom.xml
View File

@ -81,6 +81,7 @@
<build>
<plugins>
<!-- Skip execution of Javadoc since some versions run out of memory -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@ -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.
-->
<argLine>-Ddtype=float -Dfile.encoding=UTF-8 -Xmx8g</argLine>
<argLine>-Dorg.bytedeco.javacpp.logger.debug=true -Djava.library.path="${nd4j.basedir}/nd4j-backends/nd4j-backend-impls/nd4j-cuda/target/classes"</argLine>
</configuration>
</plugin>
<plugin>
@ -214,6 +215,8 @@
<module>nd4j-native-preset</module>
<module>nd4j-native-platform</module>
</modules>
</profile>
<profile>
<id>cuda</id>
@ -228,6 +231,7 @@
<module>nd4j-cuda-preset</module>
<module>nd4j-cuda-platform</module>
</modules>
</profile>
<profile>
<id>libnd4j-cuda</id>

5
nd4j/nd4j-backends/nd4j-tests/pom.xml
View File

@ -362,8 +362,11 @@
<configuration>
<environmentVariables>
<LD_LIBRARY_PATH>
${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
</LD_LIBRARY_PATH>
<PATH>
${env.PATH}:${user.dir}:${libnd4jhome}/blasbuild/cpu/blas/:${nd4j.native.basedir}/target/classes
</PATH>
</environmentVariables>
<testSourceDirectory>src/test/java</testSourceDirectory>
<includes>

2
nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-client/pom.xml
View File

@ -105,7 +105,7 @@
<include>*.java</include>
<include>**/*.java</include>
</includes>
<argLine>-Ddtype=float -Xmx8g</argLine>
<argLine>-Dorg.bytedeco.javacpp.logger.debug=true -Djava.library.path="${nd4j.basedir}/nd4j-backends/nd4j-backend-impls/nd4j-cuda/target/classes"</argLine>
</configuration>
</plugin>
</plugins>

2
nd4j/nd4j-parameter-server-parent/nd4j-parameter-server-node/pom.xml
View File

@ -107,7 +107,7 @@
<include>*.java</include>
<include>**/*.java</include>
</includes>
<argLine>-Ddtype=float -Xmx8g</argLine>
<argLine>-Dorg.bytedeco.javacpp.logger.debug=true -Djava.library.path="${nd4j.basedir}/nd4j-backends/nd4j-backend-impls/nd4j-cuda/target/classes"</argLine>
</configuration>
</plugin>
</plugins>

18
nd4j/nd4j-serde/nd4j-aeron/pom.xml
View File

@ -90,11 +90,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<dependencies>
<dependency>
<groupId>org.nd4j</groupId>
<artifactId>nd4j-native</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<configuration>
<environmentVariables>
<LD_LIBRARY_PATH>
${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
</LD_LIBRARY_PATH>
</environmentVariables>
<testSourceDirectory>src/test/java</testSourceDirectory>
<includes>
@ -119,6 +125,7 @@
For testing large zoo models, this may not be enough (so comment it out).
-->
<argLine>-Dorg.bytedeco.javacpp.logger.debug=true -Djava.library.path="${nd4j.basedir}/nd4j-backends/nd4j-backend-impls/nd4j-native/target/classes"</argLine>
</configuration>
</plugin>
</plugins>
@ -150,9 +157,6 @@
</dependencies>
<configuration>
<environmentVariables>
<LD_LIBRARY_PATH>
${env.LD_LIBRARY_PATH}:${user.dir}:${libnd4jhome}/blasbuild/cuda/blas/
</LD_LIBRARY_PATH>
</environmentVariables>
<testSourceDirectory>src/test/java</testSourceDirectory>
<includes>
@ -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.
-->
<argLine>-Ddtype=float -Xmx6g</argLine>
<argLine>-Dorg.bytedeco.javacpp.logger.debug=true -Djava.library.path="${nd4j.basedir}/nd4j-backends/nd4j-backend-impls/nd4j-cuda/target/classes"</argLine>
</configuration>
</plugin>
</plugins>

27
pom.xml
View File

@ -176,6 +176,9 @@
<javacpp.platform.additionalIncludePaths />
<javacpp.platform.cppincludepath />
<javacpp.platform.library.path />
<!-- Used in nd4j-backend-impls for directory-maven-plugin to assist with finding native libs for tests -->
<nd4j.native.basedir />
<nd4j.cuda.basedir />
<javacpp.version>1.5.4</javacpp.version>
<javacpp-presets.version>1.5.4</javacpp-presets.version>
<javacv.version>1.5.4</javacv.version>
@ -315,6 +318,7 @@
<rxjava.version>2.2.0</rxjava.version>
<kotlin.version>1.4.30</kotlin.version>
<junit4git.version>1.3</junit4git.version>
</properties>
@ -606,6 +610,27 @@
</pluginManagement>
<plugins>
<plugin>
<groupId>org.commonjava.maven.plugins</groupId>
<artifactId>directory-maven-plugin</artifactId>
<version>0.3.1</version>
<executions>
<execution>
<id>native-dir</id>
<goals>
<goal>directory-of</goal>
</goals>
<phase>initialize</phase>
<configuration>
<property>nd4j.basedir</property>
<project>
<groupId>org.nd4j</groupId>
<artifactId>nd4j</artifactId>
</project>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
@ -939,6 +964,8 @@
<libnd4jhome>${basedir}/../../../../libnd4j/</libnd4jhome>
</properties>
</profile>
<!-- For Android: -Dplatform=android-arm -->
<profile>
<id>javacpp-platform-default</id>

3
rl4j/pom.xml
View File

@ -101,7 +101,8 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<argLine>-Ddtype=double</argLine>
<argLine>-Ddtype=double -Dorg.bytedeco.javacpp.logger.debug=true -Djava.library.path="${nd4j.basedir}/nd4j-backends/nd4j-backend-impls/nd4j-cuda/target/classes"</argLine>
<!--
By default: Surefire will set the classpath based on the manifest. Because tests are not included
in the JAR, any tests that rely on class path scanning for resources in the tests directory will not