Skip to content

Commit 02ec490

Browse files
karllessardkarllessard
authored
Migrate on Java 11 as minimum supported version
1 parent 5210c7e commit 02ec490

File tree

12 files changed

+226
-51
lines changed

12 files changed

+226
-51
lines changed

‎.github/workflows/ci.yml

+37-14
Original file line numberDiff line numberDiff line change
@@ -20,53 +20,61 @@ jobs:
2020
runs-on: ubuntu-latest
2121
container: centos:7
2222
steps:
23-
- name: Checkout repository
24-
uses: actions/checkout@v1
2523
- name: Install environment
2624
run: |
2725
yum -y update
2826
yum -y install centos-release-scl-rh epel-release
29-
yum -y install java-11-openjdk-devel devtoolset-9
27+
yum -y install devtoolset-9
3028
echo Downloading Maven
3129
curl -L https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz -o $HOME/apache-maven-3.6.3-bin.tar.gz
3230
tar xzf $HOME/apache-maven-3.6.3-bin.tar.gz -C /opt/
3331
ln -sf /opt/apache-maven-3.6.3/bin/mvn /usr/bin/mvn
32+
- name: Configure Java
33+
uses: actions/setup-java@v2
34+
with:
35+
distribution: 'adopt'
36+
java-version: '17'
37+
- name: Checkout repository
38+
uses: actions/checkout@v1
3439
- name: Build project
3540
run: |
3641
source scl_source enable devtoolset-9 || true
37-
export JAVA_HOME=$(dirname $(dirname $(readlink $(readlink $(which javac)))))
3842
echo $JAVA_HOME
3943
mvn -version
40-
mvn clean install -Pdev,jdk11 -B -U -e -Dlint.skip=true
44+
mvn clean install -Pdev,jdk17 -B -U -e -Dlint.skip=true
4145
- name: Run lint checks
4246
run: |
43-
mvn compiler:compile -Pdev,jdk11 -B -U -e
47+
mvn compiler:compile -Pdev,jdk17 -B -U -e
4448
check-format:
4549
if: github.event_name == 'pull_request'
4650
runs-on: ubuntu-latest
4751
container: centos:7
4852
steps:
49-
- name: Checkout repository
50-
uses: actions/checkout@v1
5153
- name: Install environment
5254
run: |
5355
yum -y update
5456
yum -y install centos-release-scl-rh epel-release
55-
yum -y install java-11-openjdk-devel devtoolset-9
57+
yum -y install devtoolset-9
5658
echo Downloading Maven
5759
curl -L https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz -o $HOME/apache-maven-3.6.3-bin.tar.gz
5860
tar xzf $HOME/apache-maven-3.6.3-bin.tar.gz -C /opt/
5961
ln -sf /opt/apache-maven-3.6.3/bin/mvn /usr/bin/mvn
62+
- name: Configure Java
63+
uses: actions/setup-java@v2
64+
with:
65+
distribution: 'adopt'
66+
java-version: '17'
67+
- name: Checkout repository
68+
uses: actions/checkout@v1
6069
- name: Build project
6170
run: |
6271
source scl_source enable devtoolset-9 || true
63-
export JAVA_HOME=$(dirname $(dirname $(readlink $(readlink $(which javac)))))
6472
echo $JAVA_HOME
6573
mvn -version
66-
mvn clean install -Pdev,jdk11 -B -U -e -Dlint.skip=true -Dmaven.test.skip=true
74+
mvn clean install -Pdev,jdk17 -B -U -e -Dlint.skip=true -Dmaven.test.skip=true
6775
- name: Run format checks
6876
run: |
69-
mvn spotless:check -Pdev,jdk11 -B -U -e
77+
mvn spotless:check -Pdev,jdk17 -B -U -e
7078
prepare:
7179
runs-on: ubuntu-latest
7280
outputs:
@@ -99,7 +107,7 @@ jobs:
99107
yum --disablerepo updates -y install $GLIBC
100108
yum -x "$GLIBC" -y update
101109
yum -x "$GLIBC" -y install centos-release-scl-rh epel-release
102-
yum -x "$GLIBC" -y install java-1.8.0-openjdk-devel devtoolset-9 rh-git218 patch perl-Data-Dumper python36-devel python36-numpy python36-pip python36-six
110+
yum -x "$GLIBC" -y install devtoolset-9 rh-git218 patch perl-Data-Dumper python36-devel python36-numpy python36-pip python36-six
103111
echo Downloading Maven
104112
curl -L https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz -o $HOME/apache-maven-3.6.3-bin.tar.gz
105113
tar xzf $HOME/apache-maven-3.6.3-bin.tar.gz -C /opt/
@@ -124,6 +132,11 @@ jobs:
124132
rm -f $(find /usr/local/cuda/ -name '*.a' -and -not -name libcudart_static.a -and -not -name libcudadevrt.a)
125133
rm -rf /usr/local/cuda/doc* /usr/local/cuda/libnvvp* /usr/local/cuda/nsight* /usr/local/cuda/samples*
126134
fi
135+
- name: Configure Java
136+
uses: actions/setup-java@v2
137+
with:
138+
distribution: 'adopt'
139+
java-version: '11'
127140
- name: Checkout repository
128141
uses: actions/checkout@v1
129142
- name: Build project
@@ -163,6 +176,11 @@ jobs:
163176
curl -L https://github.com/bazelbuild/bazel/releases/download/3.7.2/bazel-3.7.2-installer-darwin-x86_64.sh -o bazel.sh --retry 10
164177
bash bazel.sh
165178
brew install libomp perl
179+
- name: Configure Java
180+
uses: actions/setup-java@v2
181+
with:
182+
distribution: 'adopt'
183+
java-version: '11'
166184
- name: Checkout repository
167185
uses: actions/checkout@v1
168186
- name: Build project
@@ -186,7 +204,7 @@ jobs:
186204
df -h
187205
windows-x86_64:
188206
if: github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'CI build')
189-
runs-on: windows-latest
207+
runs-on: windows-2019
190208
needs: prepare
191209
strategy:
192210
matrix:
@@ -223,6 +241,11 @@ jobs:
223241
cp.exe -a cuda/include cuda/lib cuda/bin "C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v11.2/"
224242
)
225243
echo %JAVA_HOME%
244+
- name: Configure Java
245+
uses: actions/setup-java@v2
246+
with:
247+
distribution: 'adopt'
248+
java-version: '11'
226249
- name: Checkout repository
227250
uses: actions/checkout@v1
228251
- name: Build project

‎.mvn/jvm.config

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
2+
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
3+
--add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
4+
--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
5+
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
6+
--add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED
7+
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
8+
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
9+
--add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
10+
--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED

‎README.md

+13-13
Original file line numberDiff line numberDiff line change
@@ -137,19 +137,19 @@ to add Sonatype OSS repository in your pom.xml, like the following
137137
</dependencies>
138138
```
139139

140-
## TensorFlow Version Support
141-
142-
This table shows the mapping between different version of TensorFlow for Java and the core runtime libraries.
143-
144-
| TensorFlow Java Version | TensorFlow Version |
145-
| ------------- | ------------- |
146-
| 0.2.0 | 2.3.1 |
147-
| 0.3.0 | 2.4.1 |
148-
| 0.3.1 | 2.4.1 |
149-
| 0.3.2 | 2.4.1 |
150-
| 0.3.3 | 2.4.1 |
151-
| 0.4.0 | 2.7.0 |
152-
| 0.5.0-SNAPSHOT | 2.7.0 |
140+
## TensorFlow/Java Version Support
141+
142+
This table shows the mapping between TensorFlow, TensorFlow Java and minimum supported Java versions.
143+
144+
| TensorFlow Java Version | TensorFlow Version | Minimum Java Version |
145+
| ------------- | ------------- | --------------- |
146+
| 0.2.0 | 2.3.1 | 8 |
147+
| 0.3.0 | 2.4.1 | 8 |
148+
| 0.3.1 | 2.4.1 | 8 |
149+
| 0.3.2 | 2.4.1 | 8 |
150+
| 0.3.3 | 2.4.1 | 8 |
151+
| 0.4.0 | 2.7.0 | 8 |
152+
| 0.5.0-SNAPSHOT | 2.7.0 | 11 |
153153

154154
## How to Contribute?
155155

‎pom.xml

+31-16
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@
3737

3838
<properties>
3939
<project.build.sourceEncoding>UTF8</project.build.sourceEncoding>
40-
<maven.compiler.source>1.8</maven.compiler.source>
41-
<maven.compiler.target>1.8</maven.compiler.target>
40+
<maven.compiler.source>11</maven.compiler.source>
41+
<maven.compiler.target>11</maven.compiler.target>
42+
<maven.compiler.release>11</maven.compiler.release>
4243
<junit.version>5.6.2</junit.version>
4344
<jmh.version>1.21</jmh.version>
4445
<versions-plugin.version>2.7</versions-plugin.version>
@@ -174,11 +175,11 @@
174175
</profile>
175176

176177
<profile>
177-
<id>jdk11</id>
178+
<id>jdk17</id>
178179
<properties>
179-
<maven.compiler.source>11</maven.compiler.source>
180-
<maven.compiler.target>11</maven.compiler.target>
181-
<maven.compiler.release>11</maven.compiler.release>
180+
<maven.compiler.source>17</maven.compiler.source>
181+
<maven.compiler.target>17</maven.compiler.target>
182+
<maven.compiler.release>17</maven.compiler.release>
182183
</properties>
183184
</profile>
184185

@@ -189,11 +190,9 @@
189190
<profile>
190191
<id>lint</id>
191192
<activation>
192-
<!-- activate lint checks only on JDK1.9+ (required by Error Prone) -->
193-
<jdk>(1.9,)</jdk>
194193
<!-- custom property to disable link checks on command line (enabled by default) -->
195194
<property>
196-
<name>!lint.skip</name>
195+
<name>lint.skip</name>
197196
<value>!true</value>
198197
</property>
199198
</activation>
@@ -205,13 +204,15 @@
205204
<version>3.8.0</version>
206205
<configuration>
207206
<showWarnings>true</showWarnings>
208-
<fork>true</fork> <!-- Required for JDK16+ -->
209207
<compilerArgs combine.children="append">
210208
<!--arg>-Werror</arg--> <!-- Disabled (temporarily?) -->
211209
<arg>-Xlint:all</arg>
212210
<arg>-XDcompilePolicy=simple</arg>
213211
<arg>-Xplugin:ErrorProne</arg>
214-
<!-- Following are required on JDK16+ -->
212+
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
213+
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
214+
215+
<!-- We need to repeat all arguments found in jvm.config here or we'll lose them -->
215216
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
216217
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
217218
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
@@ -220,8 +221,6 @@
220221
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
221222
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
222223
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
223-
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
224-
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
225224
</compilerArgs>
226225
<annotationProcessorPaths combine.children="append">
227226
<path>
@@ -303,6 +302,14 @@
303302

304303
<build>
305304
<plugins>
305+
<plugin>
306+
<groupId>org.apache.maven.plugins</groupId>
307+
<artifactId>maven-compiler-plugin</artifactId>
308+
<version>3.8.0</version>
309+
<configuration>
310+
<fork>true</fork> <!-- Required for JDK16+ -->
311+
</configuration>
312+
</plugin>
306313
<!-- GPG signed components: http://central.sonatype.org/pages/apache-maven.html#gpg-signed-components -->
307314
<plugin>
308315
<groupId>org.apache.maven.plugins</groupId>
@@ -366,15 +373,12 @@
366373
<artifactId>spotless-maven-plugin</artifactId>
367374
<version>${spotless.version}</version>
368375
<configuration>
369-
370376
<ratchetFrom>origin/master</ratchetFrom>
371-
372377
<lineEndings/>
373378
<java>
374379
<googleJavaFormat>
375380
<version>1.14.0</version>
376381
</googleJavaFormat>
377-
378382
<removeUnusedImports/>
379383
</java>
380384
</configuration>
@@ -387,6 +391,17 @@
387391
<artifactId>maven-jar-plugin</artifactId>
388392
<version>3.2.0</version>
389393
</plugin>
394+
<plugin>
395+
<groupId>org.apache.maven.plugins</groupId>
396+
<artifactId>maven-surefire-plugin</artifactId>
397+
<version>3.0.0-M5</version>
398+
<configuration combine.children="append">
399+
<includes>
400+
<include>**/*Test.java</include>
401+
</includes>
402+
<useModulePath>false</useModulePath>
403+
</configuration>
404+
</plugin>
390405
</plugins>
391406
</pluginManagement>
392407
</build>

‎tensorflow-core/tensorflow-core-api/pom.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,9 @@
203203
<includes>
204204
<include>org/tensorflow/internal/c_api/presets/*.java</include>
205205
</includes>
206+
<!-- Build on Java8 to prevent the plugin to automatically include module-info.java (excluding it won't work) -->
207+
<release>8</release>
208+
<compilerArgs combine.self="override"></compilerArgs>
206209
</configuration>
207210
</execution>
208211
</executions>
@@ -433,7 +436,6 @@
433436
</plugin>
434437
<plugin>
435438
<artifactId>maven-surefire-plugin</artifactId>
436-
<version>3.0.0-M5</version>
437439
<executions>
438440
<execution>
439441
<!--

‎tensorflow-core/tensorflow-core-api/src/main/java/module-info.java

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
/*
2+
Copyright 2022 The TensorFlow Authors. All Rights Reserved.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
=======================================================================
16+
*/
17+
module org.tensorflow {
18+
requires transitive org.tensorflow.ndarray;
19+
requires org.bytedeco.javacpp;
20+
requires com.google.protobuf;
21+
requires java.logging;
22+
23+
exports org.tensorflow;
24+
exports org.tensorflow.exceptions;
25+
exports org.tensorflow.types;
26+
exports org.tensorflow.types.annotation;
27+
exports org.tensorflow.types.family;
28+
exports org.tensorflow.op;
29+
exports org.tensorflow.op.annotation;
30+
exports org.tensorflow.op.core;
31+
exports org.tensorflow.op.audio;
32+
exports org.tensorflow.op.bitwise;
33+
exports org.tensorflow.op.cluster;
34+
exports org.tensorflow.op.collective;
35+
exports org.tensorflow.op.data;
36+
exports org.tensorflow.op.data.experimental;
37+
exports org.tensorflow.op.debugging;
38+
exports org.tensorflow.op.dtypes;
39+
exports org.tensorflow.op.estimator;
40+
exports org.tensorflow.op.image;
41+
exports org.tensorflow.op.io;
42+
exports org.tensorflow.op.linalg;
43+
exports org.tensorflow.op.linalg.sparse;
44+
exports org.tensorflow.op.math;
45+
exports org.tensorflow.op.math.special;
46+
exports org.tensorflow.op.nn;
47+
exports org.tensorflow.op.quantization;
48+
exports org.tensorflow.op.ragged;
49+
exports org.tensorflow.op.random;
50+
exports org.tensorflow.op.risc;
51+
exports org.tensorflow.op.signal;
52+
exports org.tensorflow.op.sparse;
53+
exports org.tensorflow.op.strings;
54+
exports org.tensorflow.op.summary;
55+
exports org.tensorflow.op.tpu;
56+
exports org.tensorflow.op.train;
57+
exports org.tensorflow.op.xla;
58+
exports org.tensorflow.proto.data;
59+
exports org.tensorflow.proto.data.experimental;
60+
exports org.tensorflow.proto.data.model;
61+
exports org.tensorflow.proto.distruntime;
62+
exports org.tensorflow.proto.example;
63+
exports org.tensorflow.proto.framework;
64+
exports org.tensorflow.proto.profiler;
65+
exports org.tensorflow.proto.util;
66+
exports org.tensorflow.proto.util.testlog;
67+
}

0 commit comments

Comments
 (0)