Skip to content

Commit 75402be

Browse files
CraigacpCraigacp
authored
Bumps TF version to 2.20 (#631)
* Upgrading to TF 2.20. Dropping Windows support. * Working on bazel protobuf generation. * Working on bazel protobuf generation. * Regenerated protos and ops. * Fixing libomp on Linux arm64. * Fixing library name in JavaCPP generator.
1 parent d5d2ba3 commit 75402be

File tree

559 files changed

+47452
-42375
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

559 files changed

+47452
-42375
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -139,55 +139,9 @@ jobs:
139139
- name: Deploy native artifact
140140
if: env.DEPLOY_RELEASE == 'true' || env.DEPLOY_SNAPSHOT == 'true'
141141
run: mvn -f tensorflow-core/tensorflow-core-native/pom.xml deploy:deploy-file@native-only -B -e -Djavacpp.platform=${{ github.job }} -Djavacpp.platform.extension=${{ matrix.ext }} -Durl=${{ needs.prepare.outputs.repositoryUrl }}
142-
windows-x86_64:
143-
runs-on: windows-2022
144-
needs: prepare
145-
strategy:
146-
matrix:
147-
ext: [""] #, -gpu]
148-
steps:
149-
- name: Install environment
150-
shell: cmd
151-
run: |
152-
set "PATH=C:\msys64\usr\bin;%PATH%"
153-
python -m pip install numpy six
154-
set "EXT=${{ matrix.ext }}"
155-
echo %JAVA_HOME%
156-
- name: Configure Java
157-
uses: actions/setup-java@v5
158-
with:
159-
distribution: 'adopt'
160-
java-version: '11'
161-
- name: Checkout repository
162-
uses: actions/checkout@v6
163-
- name: Build project
164-
shell: cmd
165-
run: |
166-
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
167-
set "PATH=C:\msys64\usr\bin;%PATH%"
168-
echo Shorten work paths to prevent Bazel from reaching MAX_PATH limit
169-
mkdir C:\tmp
170-
set "TEST_TMPDIR=C:\tmp"
171-
set "TMPDIR=C:\tmp"
172-
set "TEMP=C:\tmp"
173-
set "TMP=C:\tmp"
174-
bash --version
175-
git --version
176-
cl
177-
call mvn -version
178-
echo ^<settings^>^<servers^>^<server^>^<id^>ossrh^</id^>^<username^>${{ secrets.CI_DEPLOY_USERNAME }}^</username^>^<password^>${{ secrets.CI_DEPLOY_PASSWORD }}^</password^>^</server^>^</servers^>^</settings^> > %USERPROFILE%\.m2\settings.xml
179-
set "SKIP_EXPORT=true"
180-
call mvn clean install -pl "!tensorflow-framework" -B -U -e -Djavacpp.platform=${{ github.job }} -Djavacpp.platform.extension=${{ matrix.ext }}
181-
if ERRORLEVEL 1 exit /b
182-
- name: Deploy native artifact
183-
if: env.DEPLOY_RELEASE == 'true' || env.DEPLOY_SNAPSHOT == 'true'
184-
shell: cmd
185-
run: |
186-
call mvn -f tensorflow-core/tensorflow-core-native/pom.xml deploy:deploy-file@native-only -B -e -Djavacpp.platform=${{ github.job }} -Djavacpp.platform.extension=${{ matrix.ext }} -Durl=${{ needs.prepare.outputs.repositoryUrl }}
187-
if ERRORLEVEL 1 exit /b
188142
deploy:
189143
if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/staging') }} # DEPLOY_SNAPSHOT (releases should be signed and deployed manually from local machine)
190-
needs: [linux-x86_64, windows-x86_64, macosx-arm64, linux-arm64]
144+
needs: [linux-x86_64, macosx-arm64, linux-arm64]
191145
runs-on: ubuntu-22.04
192146
steps:
193147
- name: Configure Java

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ only binaries for the following are being **supported and distributed** by this
6060
- `linux-x86_64-gpu`: Linux platforms on Intel/AMD chips with Cuda GPU support
6161
- `linux-arm64`: Linux platforms on Arm chips
6262
- `macosx-arm64`: MacOS X platforms on Apple Silicon chips
63-
- `windows-x86_64`: Windows platforms on Intel/AMD chips
63+
- `windows-x86_64`: Windows platforms on Intel/AMD chips (v1.1.0 and earlier)
6464

6565
Binaries for `macosx-x86_64` are available for TF-Java 1.0 series releases and earlier, they were dropped from
6666
TF-Java 1.1 and newer as they are no longer supported or released by Google.
@@ -215,7 +215,7 @@ This table shows the mapping between TensorFlow, TensorFlow Java and minimum sup
215215
| 1.0.0-rc.2 | 2.16.2 | 11 |
216216
| 1.0.0 | 2.16.2 | 11 |
217217
| 1.1.0 | 2.18.0 | 11 |
218-
| 1.2.0-SNAPSHOT | 2.18.0 | 11 |
218+
| 1.2.0-SNAPSHOT | 2.20.0 | 11 |
219219

220220
## How to Contribute?
221221

‎tensorflow-core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
https://github.com/tensorflow/tensorflow/blob/master/tensorflow/workspace2.bzl
4343
(but for the currently used release, not master)
4444
-->
45-
<protobuf.version>3.21.9</protobuf.version>
45+
<protobuf.version>4.28.3</protobuf.version>
4646

4747
<native.classifier>${javacpp.platform}${javacpp.platform.extension}</native.classifier>
4848
<javacpp.platform.extension></javacpp.platform.extension>

‎tensorflow-core/tensorflow-core-api/scripts/test_download.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ DOWNLOAD_FOLDER="$1"
55

66
case ${PLATFORM:-} in
77
'linux-x86_64')
8-
TEXT_WHEEL_URL='https://files.pythonhosted.org/packages/f3/73/3a906feb0d71d9353c6fb2363d4052856cc6eff5a78a097b1a6002d4e908/tensorflow_text-2.18.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl'
8+
TEXT_WHEEL_URL='https://files.pythonhosted.org/packages/c3/e6/cfd784298ffb759a4235721cac2ac20f7ff758bf687069cfbaebb06c5804/tensorflow_text-2.20.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl'
99
;;
1010
'linux-arm64')
11-
TEXT_WHEEL_URL='https://files.pythonhosted.org/packages/8a/9a/ebba9f6274f8b51e5fe1ac2411b8b6bf680a32d10bd6e9c54be1faeec062/tensorflow_text-2.18.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl'
11+
TEXT_WHEEL_URL='https://files.pythonhosted.org/packages/f5/ca/796cfd97ae6693d3c84c37575a6d481be5f1ef36c920d1a73c884f31797b/tensorflow_text-2.20.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl'
1212
;;
1313
'macosx-arm64')
14-
TEXT_WHEEL_URL='https://files.pythonhosted.org/packages/18/b6/8ad233edb0732847db1da538cea941dcccc42f59304ff6fb449676e6dd5a/tensorflow_text-2.18.1-cp311-cp311-macosx_11_0_arm64.whl'
14+
TEXT_WHEEL_URL='https://files.pythonhosted.org/packages/98/e4/e3c72d0a73caeba90cf5b31e69d44e9a08d614e0e829484d813f3b63e037/tensorflow_text-2.20.0-cp312-cp312-macosx_11_0_arm64.whl'
1515
;;
1616
*)
1717
echo "TensorFlow Text distribution for ${PLATFORM} is not supported for download"

‎tensorflow-core/tensorflow-core-api/src/api/api_def_DecodeWebP.pbtxt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
op {
2+
graph_op_name: "DecodeWebP"
3+
endpoint {
4+
name: "image.DecodeWebP"
5+
}
6+
}

‎tensorflow-core/tensorflow-core-api/src/api/api_def_TPUDummyInput.pbtxt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
op {
2+
graph_op_name: "TPUDummyInput"
3+
visibility: HIDDEN
4+
endpoint {
5+
name: "tpu.TPUDummyInput"
6+
}
7+
}

‎tensorflow-core/tensorflow-core-api/src/api/api_def_XlaSparseActivationsUnstack.pbtxt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
op {
2+
graph_op_name: "XlaSparseActivationsUnstack"
3+
visibility: VISIBLE
4+
endpoint {
5+
name: "xla.XlaSparseActivationsUnstack"
6+
}
7+
}

‎tensorflow-core/tensorflow-core-api/src/api/api_def_XlaSparseDenseMatmulCustomCombinerOnTcGradWithAdagradAndCsrInput.pbtxt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
op {
2+
graph_op_name: "XlaSparseDenseMatmulCustomCombinerOnTcGradWithAdagradAndCsrInput"
3+
visibility: VISIBLE
4+
endpoint {
5+
name: "xla.XlaSparseDenseMatmulCustomCombinerOnTcGradWithAdagradAndCsrInput"
6+
}
7+
}

‎tensorflow-core/tensorflow-core-api/src/api/api_def_XlaSparseDenseMatmulCustomCombinerOnTcGradWithAdagradMomentumAndCsrInput.pbtxt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
op {
2+
graph_op_name: "XlaSparseDenseMatmulCustomCombinerOnTcGradWithAdagradMomentumAndCsrInput"
3+
visibility: VISIBLE
4+
endpoint {
5+
name: "xla.XlaSparseDenseMatmulCustomCombinerOnTcGradWithAdagradMomentumAndCsrInput"
6+
}
7+
}

‎tensorflow-core/tensorflow-core-api/src/api/api_def_XlaSparseDenseMatmulCustomCombinerOnTcGradWithAdamAndCsrInput.pbtxt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
op {
2+
graph_op_name: "XlaSparseDenseMatmulCustomCombinerOnTcGradWithAdamAndCsrInput"
3+
visibility: VISIBLE
4+
endpoint {
5+
name: "xla.XlaSparseDenseMatmulCustomCombinerOnTcGradWithAdamAndCsrInput"
6+
}
7+
}

0 commit comments

Comments
 (0)