Upgrade test suite java version to run on > 8, upgrade kotlin version

deeplearning4j · Oct 12, 2022 · c1bf871 · c1bf871
1 parent 6646f1c
commit c1bf871
Show file tree

Hide file tree

Showing 21 changed files with 115 additions and 62 deletions.
diff --git a/README.md b/README.md
@@ -35,12 +35,12 @@ Deeplearning4J has quite a few dependencies. For this reason we only support usa
   <dependency>
       <groupId>org.deeplearning4j</groupId>
       <artifactId>deeplearning4j-core</artifactId>
-      <version>1.0.0-M1.1</version>
+      <version>1.0.0-M2.1</version>
   </dependency>
   <dependency>
       <groupId>org.nd4j</groupId>
       <artifactId>nd4j-native-platform</artifactId>
-      <version>1.0.0-M1.1</version>
+      <version>1.0.0-M2.1</version>
   </dependency>
 </dependencies>
 ```
@@ -110,6 +110,10 @@ mvn -B -V -U clean install -pl  -Dlibnd4j.platform=linux-x86_64 -Dlibnd4j.chip=c
 
 An example of GPU "CC" or compute capability is 61 for Titan X Pascal.
 
+## Running project in Intellij IDEA:
+1. Ensure you follow https://stackoverflow.com/questions/45370178/exporting-a-package-from-system-module-is-not-allowed-with-release on jdk 9 or later
+2. Ignore all nd4j-shade submodules. Right click on each folder and click: Maven -> Ignore project
+
 
 ## License
 

diff --git a/contrib/codegen-tools/codegen/pom.xml b/contrib/codegen-tools/codegen/pom.xml
@@ -18,10 +18,10 @@
         <junit.version>5.8.0-M1</junit.version>
         <junit.platform.launcher.version>1.8.0-M1</junit.platform.launcher.version>
         <junit-jupiter.version>5.4.2</junit-jupiter.version>
-        <java.version>1.8</java.version>
+        <java.version>11</java.version>
         <maven-shade-plugin.version>3.1.1</maven-shade-plugin.version>
         <kotlin.version>1.3.50</kotlin.version>
-        <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
+        <kotlin.compiler.jvmTarget>11</kotlin.compiler.jvmTarget>
         <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
         <javapoet.version>1.13.0</javapoet.version>
     </properties>
@@ -249,7 +249,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>3.8.1</version>
                 <executions>
                     <!-- Replacing default-compile as it is treated specially by maven -->
                     <execution>
@@ -275,6 +275,7 @@
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
+
                 </configuration>
             </plugin>
         </plugins>

diff --git a/contrib/codegen-tools/libnd4j-gen/pom.xml b/contrib/codegen-tools/libnd4j-gen/pom.xml
@@ -33,8 +33,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
     <nd4j.version>1.0.0-SNAPSHOT</nd4j.version>
     <maven-shade-plugin.version>3.1.1</maven-shade-plugin.version>
   <javaparser.version>3.24.4</javaparser.version>

diff --git a/contrib/version-updater/pom.xml b/contrib/version-updater/pom.xml
@@ -13,8 +13,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
     <picocli.version>4.6.1</picocli.version>
   </properties>
 

diff --git a/datavec/datavec-arrow/src/main/java9/module-info.java b/datavec/datavec-arrow/src/main/java9/module-info.java
@@ -1,4 +1,5 @@
 open module datavec.arrow {
+    requires java.nio;
     requires commons.io;
     requires slf4j.api;
     requires arrow.memory.core;

diff --git a/datavec/datavec-data/datavec-data-image/pom.xml b/datavec/datavec-data/datavec-data-image/pom.xml
@@ -139,6 +139,9 @@
                         <classpathDependencyExclude>com.google.android:android
                         </classpathDependencyExclude>
                     </classpathDependencyExcludes>
+                    <argLine>
+                        --add-exports java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED
+                    </argLine>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java9/module-info.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java9/module-info.java
@@ -1,4 +1,5 @@
 open module nd4j.api {
+    requires java.nio;
     requires byteunits;
     requires commons.io;
     requires commons.net;

diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda-preset/pom.xml b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda-preset/pom.xml
@@ -117,8 +117,14 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <source>8</source>
-                    <target>8</target>
+                    <source>11</source>
+                    <target>11</target>
+                    <compilerArgs>
+                        <arg>--add-exports</arg>
+                        <arg>java.base/java.nio=ALL-UNNAMED</arg>
+                        <arg>--add-opens</arg>
+                        <arg>java.base/java.nio=ALL-UNNAMED</arg>
+                    </compilerArgs>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/pom.xml b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/pom.xml
@@ -115,7 +115,8 @@
                         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 -Dfile.encoding=UTF-8 -Xmx${test.heap.size} -Dorg.bytedeco.javacpp.maxphysicalbytes=${test.offheap.size} -Dorg.bytedeco.javacpp.maxbytes=${test.offheap.size}</argLine>
+                    <argLine>--add-exports java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED -Ddtype=float -Dfile.encoding=UTF-8 -Xmx${test.heap.size} -Dorg.bytedeco.javacpp.maxphysicalbytes=${test.offheap.size} -Dorg.bytedeco.javacpp.maxbytes=${test.offheap.size}
+                    </argLine>
 
                 </configuration>
             </plugin>
@@ -231,8 +232,14 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <source>8</source>
-                    <target>8</target>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                    <compilerArgs>
+                        <arg>--add-exports</arg>
+                        <arg>java.base/java.nio=ALL-UNNAMED</arg>
+                        <arg>--add-opens</arg>
+                        <arg>java.base/java.nio=ALL-UNNAMED</arg>
+                    </compilerArgs>
                 </configuration>
             </plugin>
 

diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-minimizer-preset/pom.xml b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-minimizer-preset/pom.xml
@@ -173,8 +173,14 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <source>8</source>
-                    <target>8</target>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                    <compilerArgs>
+                        <arg>--add-exports</arg>
+                        <arg>java.base/java.nio=ALL-UNNAMED</arg>
+                        <arg>--add-opens</arg>
+                        <arg>java.base/java.nio=ALL-UNNAMED</arg>
+                    </compilerArgs>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/pom.xml b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/pom.xml
@@ -159,8 +159,14 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <source>8</source>
-                    <target>8</target>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                    <compilerArgs>
+                        <arg>--add-exports</arg>
+                        <arg>java.base/java.nio=ALL-UNNAMED</arg>
+                        <arg>--add-opens</arg>
+                        <arg>java.base/java.nio=ALL-UNNAMED</arg>
+                    </compilerArgs>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/pom.xml b/nd4j/nd4j-backends/nd4j-backend-impls/pom.xml
@@ -106,7 +106,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>-Xmx${test.heap.size} -Dorg.bytedeco.javacpp.maxphysicalbytes=${test.offheap.size} -Dorg.bytedeco.javacpp.maxbytes=${test.offheap.size}</argLine>
+                        <argLine>--add-exports java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED  -Xmx${test.heap.size} -Dorg.bytedeco.javacpp.maxphysicalbytes=${test.offheap.size} -Dorg.bytedeco.javacpp.maxbytes=${test.offheap.size}</argLine>
                         <forkedProcessTimeoutInSeconds>240</forkedProcessTimeoutInSeconds>
                         <forkedProcessExitTimeoutInSeconds>240</forkedProcessExitTimeoutInSeconds>
                         <parallelTestsTimeoutInSeconds>240</parallelTestsTimeoutInSeconds>
@@ -141,7 +141,7 @@
             <activation>
                 <activeByDefault>false</activeByDefault>
             </activation>
-            
+
             <modules>
                 <module>nd4j-native</module>
                 <module>nd4j-native-preset</module>

diff --git a/nd4j/nd4j-common/pom.xml b/nd4j/nd4j-common/pom.xml
@@ -36,8 +36,8 @@
     <name>nd4j-common</name>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
         <module.name>nd4j.common</module.name>
     </properties>
 

diff --git a/nd4j/samediff-import/pom.xml b/nd4j/samediff-import/pom.xml
@@ -47,13 +47,13 @@
 
   <properties>
     <kotlin.version>1.4.30</kotlin.version>
-    <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
+    <kotlin.compiler.jvmTarget>11</kotlin.compiler.jvmTarget>
     <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
     <junit.version>5.8.0-M1</junit.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 
-    <java.version>1.8</java.version>
+    <java.version>11</java.version>
     <maven-shade-plugin.version>3.1.1</maven-shade-plugin.version>
     <test.heap.size>2g</test.heap.size>
     <test.offheap.size>2g</test.offheap.size>
@@ -160,6 +160,16 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
+          <configuration>
+            <compilerArgs>
+              <source>${maven.compiler.source}</source>
+              <target>${maven.compiler.target}</target>
+              <arg>--add-exports</arg>
+              <arg>java.base/java.nio=ALL-UNNAMED</arg>
+              <arg>--add-opens</arg>
+              <arg>java.base/java.nio=ALL-UNNAMED</arg>
+            </compilerArgs>
+          </configuration>
           <executions>
             <!-- Replacing default-compile as it is treated specially by maven -->
             <execution>
@@ -182,10 +192,6 @@
               <goals> <goal>testCompile</goal> </goals>
             </execution>
           </executions>
-          <configuration>
-            <source>${java.version}</source>
-            <target>${java.version}</target>
-          </configuration>
         </plugin>
       </plugins>
     </pluginManagement>

diff --git a/omnihub/pom.xml b/omnihub/pom.xml
@@ -22,9 +22,9 @@
         <junit.version>5.8.0-M1</junit.version>
         <junit.platform.launcher.version>1.8.0-M1</junit.platform.launcher.version>
         <junit-jupiter.version>5.4.2</junit-jupiter.version>
-        <java.version>1.8</java.version>
+        <java.version>11</java.version>
         <maven-shade-plugin.version>3.1.1</maven-shade-plugin.version>
-        <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
+        <kotlin.compiler.jvmTarget>11</kotlin.compiler.jvmTarget>
         <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
         <module.name>omnihub</module.name>
     </properties>
@@ -157,10 +157,10 @@
     <build>
         <plugins>
 
-      <!--      <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-            </plugin>-->
+            <!--      <plugin>
+                      <groupId>org.moditect</groupId>
+                      <artifactId>moditect-maven-plugin</artifactId>
+                  </plugin>-->
 
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -286,7 +286,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>3.8.1</version>
                 <executions>
                     <!-- Replacing default-compile as it is treated specially by maven -->
                     <execution>
@@ -306,12 +306,19 @@
                     <execution>
                         <id>java-test-compile</id>
                         <phase>test-compile</phase>
-                        <goals> <goal>testCompile</goal> </goals>
+                        <goals> <goal>testCompile</goal>
+                        </goals>
                     </execution>
                 </executions>
                 <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                    <compilerArgs>
+                        <arg>--add-exports</arg>
+                        <arg>java.base/java.nio=ALL-UNNAMED</arg>
+                        <arg>--add-opens</arg>
+                        <arg>java.base/java.nio=ALL-UNNAMED</arg>
+                    </compilerArgs>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/platform-tests/pom.xml b/platform-tests/pom.xml
@@ -56,14 +56,14 @@
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
 
         <kotlin.version>1.4.30</kotlin.version>
-        <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
+        <kotlin.compiler.jvmTarget>11</kotlin.compiler.jvmTarget>
         <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
         <junit.version>5.8.0-M1</junit.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <lz4.version>1.8.0</lz4.version>
 
 
-        <java.version>1.8</java.version>
+        <java.version>11</java.version>
         <maven-shade-plugin.version>3.1.1</maven-shade-plugin.version>
         <log4j2.version>2.17.2</log4j2.version>
         <netty.version>4.1.74.Final</netty.version>
@@ -658,6 +658,16 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <compilerArgs>
+                        <arg>--add-exports</arg>
+                        <arg>java.base/java.nio=ALL-UNNAMED</arg>
+                        <arg>--add-opens</arg>
+                        <arg>java.base/java.nio=ALL-UNNAMED</arg>
+                    </compilerArgs>
+                </configuration>
                 <executions>
                     <!-- Replacing default-compile as it is treated specially by maven -->
                     <execution>
@@ -684,10 +694,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                </configuration>
             </plugin>
 
 
@@ -823,7 +829,7 @@
                         </classpathDependencyExclude>
                     </classpathDependencyExcludes>
                     <useManifestOnlyJar>false</useManifestOnlyJar>
-                    <argLine>-Dorg.nd4j.arraynogc=${test.nogc} -Dorg.bytedeco.javacpp.logger.debug=true -Dorg.bytedeco.javacpp.nopointergc=${test.nogc} -Xmx${test.heap.size} -Dorg.bytedeco.javacpp.maxphysicalbytes=${test.offheap.size} -Dorg.bytedeco.javacpp.maxbytes=${test.offheap.size} </argLine>
+                    <argLine> --add-exports java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED -Dorg.nd4j.arraynogc=${test.nogc} -Dorg.bytedeco.javacpp.logger.debug=true -Dorg.bytedeco.javacpp.nopointergc=${test.nogc} -Xmx${test.heap.size} -Dorg.bytedeco.javacpp.maxphysicalbytes=${test.offheap.size} -Dorg.bytedeco.javacpp.maxbytes=${test.offheap.size} </argLine>
                     <forkedProcessTimeoutInSeconds>240</forkedProcessTimeoutInSeconds>
                     <forkedProcessExitTimeoutInSeconds>240</forkedProcessExitTimeoutInSeconds>
                     <parallelTestsTimeoutInSeconds>240</parallelTestsTimeoutInSeconds>

diff --git a/...org/eclipse/deeplearning4j/dl4jcore/datasets/iterator/DummyBlockDataSetIteratorTests.java b/...org/eclipse/deeplearning4j/dl4jcore/datasets/iterator/DummyBlockDataSetIteratorTests.java
@@ -22,7 +22,6 @@
 
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
-import lombok.var;
 import org.deeplearning4j.BaseDL4JTest;
 import org.deeplearning4j.datasets.iterator.DummyBlockDataSetIterator;
 import org.eclipse.deeplearning4j.dl4jcore.datasets.iterator.tools.SimpleVariableGenerator;

diff --git a/...test/java/org/eclipse/deeplearning4j/nd4j/autodiff/opvalidation/TestMiscOpValidation.java b/...test/java/org/eclipse/deeplearning4j/nd4j/autodiff/opvalidation/TestMiscOpValidation.java
@@ -22,7 +22,6 @@
 
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
-import lombok.var;
 import org.datavec.api.records.reader.RecordReader;
 import org.datavec.api.records.reader.impl.collection.CollectionRecordReader;
 import org.datavec.api.writable.IntWritable;

diff --git a/platform-tests/src/test/java/org/eclipse/deeplearning4j/nd4j/linalg/Nd4jTestsC.java b/platform-tests/src/test/java/org/eclipse/deeplearning4j/nd4j/linalg/Nd4jTestsC.java
@@ -22,7 +22,6 @@
 
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
-import lombok.var;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.math3.stat.descriptive.rank.Percentile;
 import org.apache.commons.math3.util.FastMath;