Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc1bf871

Browse files
committed
Upgrade test suite java version to run on > 8, upgrade kotlin version
1 parent6646f1c commitc1bf871

File tree

21 files changed

+115
-62
lines changed

21 files changed

+115
-62
lines changed

‎README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ Deeplearning4J has quite a few dependencies. For this reason we only support usa
3535
<dependency>
3636
<groupId>org.deeplearning4j</groupId>
3737
<artifactId>deeplearning4j-core</artifactId>
38-
<version>1.0.0-M1.1</version>
38+
<version>1.0.0-M2.1</version>
3939
</dependency>
4040
<dependency>
4141
<groupId>org.nd4j</groupId>
4242
<artifactId>nd4j-native-platform</artifactId>
43-
<version>1.0.0-M1.1</version>
43+
<version>1.0.0-M2.1</version>
4444
</dependency>
4545
</dependencies>
4646
```
@@ -110,6 +110,10 @@ mvn -B -V -U clean install -pl -Dlibnd4j.platform=linux-x86_64 -Dlibnd4j.chip=c
110110

111111
An example of GPU "CC" or compute capability is 61 for Titan X Pascal.
112112

113+
##Running project in Intellij IDEA:
114+
1. Ensure you followhttps://stackoverflow.com/questions/45370178/exporting-a-package-from-system-module-is-not-allowed-with-release on jdk 9 or later
115+
2. Ignore all nd4j-shade submodules. Right click on each folder and click: Maven -> Ignore project
116+
113117

114118
##License
115119

‎contrib/codegen-tools/codegen/pom.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
<junit.version>5.8.0-M1</junit.version>
1919
<junit.platform.launcher.version>1.8.0-M1</junit.platform.launcher.version>
2020
<junit-jupiter.version>5.4.2</junit-jupiter.version>
21-
<java.version>1.8</java.version>
21+
<java.version>11</java.version>
2222
<maven-shade-plugin.version>3.1.1</maven-shade-plugin.version>
2323
<kotlin.version>1.3.50</kotlin.version>
24-
<kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
24+
<kotlin.compiler.jvmTarget>11</kotlin.compiler.jvmTarget>
2525
<kotlin.compiler.incremental>true</kotlin.compiler.incremental>
2626
<javapoet.version>1.13.0</javapoet.version>
2727
</properties>
@@ -249,7 +249,7 @@
249249
<plugin>
250250
<groupId>org.apache.maven.plugins</groupId>
251251
<artifactId>maven-compiler-plugin</artifactId>
252-
<version>3.5.1</version>
252+
<version>3.8.1</version>
253253
<executions>
254254
<!-- Replacing default-compile as it is treated specially by maven-->
255255
<execution>
@@ -275,6 +275,7 @@
275275
<configuration>
276276
<source>${java.version}</source>
277277
<target>${java.version}</target>
278+
278279
</configuration>
279280
</plugin>
280281
</plugins>

‎contrib/codegen-tools/libnd4j-gen/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333

3434
<properties>
3535
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
36-
<maven.compiler.source>1.8</maven.compiler.source>
37-
<maven.compiler.target>1.8</maven.compiler.target>
36+
<maven.compiler.source>11</maven.compiler.source>
37+
<maven.compiler.target>11</maven.compiler.target>
3838
<nd4j.version>1.0.0-SNAPSHOT</nd4j.version>
3939
<maven-shade-plugin.version>3.1.1</maven-shade-plugin.version>
4040
<javaparser.version>3.24.4</javaparser.version>

‎contrib/version-updater/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
<properties>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16-
<maven.compiler.source>1.8</maven.compiler.source>
17-
<maven.compiler.target>1.8</maven.compiler.target>
16+
<maven.compiler.source>11</maven.compiler.source>
17+
<maven.compiler.target>11</maven.compiler.target>
1818
<picocli.version>4.6.1</picocli.version>
1919
</properties>
2020

‎datavec/datavec-arrow/src/main/java9/module-info.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
openmoduledatavec.arrow {
2+
requiresjava.nio;
23
requirescommons.io;
34
requiresslf4j.api;
45
requiresarrow.memory.core;

‎datavec/datavec-data/datavec-data-image/pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,9 @@
139139
<classpathDependencyExclude>com.google.android:android
140140
</classpathDependencyExclude>
141141
</classpathDependencyExcludes>
142+
<argLine>
143+
--add-exports java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED
144+
</argLine>
142145
</configuration>
143146
</plugin>
144147
</plugins>

‎nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java9/module-info.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
openmodulend4j.api {
2+
requiresjava.nio;
23
requiresbyteunits;
34
requirescommons.io;
45
requirescommons.net;

‎nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda-preset/pom.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,14 @@
117117
</execution>
118118
</executions>
119119
<configuration>
120-
<source>8</source>
121-
<target>8</target>
120+
<source>11</source>
121+
<target>11</target>
122+
<compilerArgs>
123+
<arg>--add-exports</arg>
124+
<arg>java.base/java.nio=ALL-UNNAMED</arg>
125+
<arg>--add-opens</arg>
126+
<arg>java.base/java.nio=ALL-UNNAMED</arg>
127+
</compilerArgs>
122128
</configuration>
123129
</plugin>
124130
<plugin>

‎nd4j/nd4j-backends/nd4j-backend-impls/nd4j-cuda/pom.xml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@
115115
Maximum heap size was set to 6g, as a minimum required value for tests run.
116116
Depending on a build machine, default value is not always enough.
117117
-->
118-
<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>
118+
<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}
119+
</argLine>
119120

120121
</configuration>
121122
</plugin>
@@ -231,8 +232,14 @@
231232
</execution>
232233
</executions>
233234
<configuration>
234-
<source>8</source>
235-
<target>8</target>
235+
<source>${maven.compiler.source}</source>
236+
<target>${maven.compiler.target}</target>
237+
<compilerArgs>
238+
<arg>--add-exports</arg>
239+
<arg>java.base/java.nio=ALL-UNNAMED</arg>
240+
<arg>--add-opens</arg>
241+
<arg>java.base/java.nio=ALL-UNNAMED</arg>
242+
</compilerArgs>
236243
</configuration>
237244
</plugin>
238245

‎nd4j/nd4j-backends/nd4j-backend-impls/nd4j-minimizer-preset/pom.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,14 @@
173173
</execution>
174174
</executions>
175175
<configuration>
176-
<source>8</source>
177-
<target>8</target>
176+
<source>${maven.compiler.source}</source>
177+
<target>${maven.compiler.target}</target>
178+
<compilerArgs>
179+
<arg>--add-exports</arg>
180+
<arg>java.base/java.nio=ALL-UNNAMED</arg>
181+
<arg>--add-opens</arg>
182+
<arg>java.base/java.nio=ALL-UNNAMED</arg>
183+
</compilerArgs>
178184
</configuration>
179185
</plugin>
180186
<plugin>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp