Skip to content

Commit 1cc2efa

Browse files
karllessardmanojava98snadampalCraigacp
authored
Releasing 1.0.0 RC2 (#560)
* Graph is changed to public in Session.java (#535) * Merge doc changes from r1.0 * Fix unknown shapes in signature proto * Update NdArray dependency * Fix spotless check * Fix broadcastMask/Update Accept partially unknown shaped mask * linux-arm64: add build artifact item for linux-arm64 platform TensorFlow v2.16.1 wheel artifacts and the jar build support are added * linux-arm64 fixes to package the right dependencies into tensorflow native jar * Fix javadoc Co-authored-by: Adam Pocock <[email protected]> * Add instructions for new module names (#554) * CI: add CI support for linux-arm64 platform (#548) * Fix/javadoc script (#555) * Update macos x86 runner * Don’t deploy missing linux-arm64 build * Cleanup missing Linux-arm64 dependencies * Use org large runners for Linux arm64 * Using setup-java for linux-arm64 * Switch to zulu * Add back Linux arm64 artifacts (#556) * Upgrade to TF2.16.2 (#557) * Link to libomp full name (#558) * Releasing 1.0.0 RC2 --------- Co-authored-by: manojava98 <[email protected]> Co-authored-by: Sunita Nadampalli <[email protected]> Co-authored-by: Adam Pocock <[email protected]> Co-authored-by: snadampal <[email protected]>
1 parent 8f5f7e9 commit 1cc2efa

File tree

285 files changed

+1221
-914
lines changed

Some content is hidden

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

285 files changed

+1221
-914
lines changed

‎.github/workflows/build.yml

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,34 @@ jobs:
6262
fi
6363
echo "Repository URL: $REPOSITORY_URL"
6464
echo "::set-output name=repositoryUrl::$REPOSITORY_URL"
65+
linux-arm64:
66+
runs-on: ubuntu-2204-arm64-2c
67+
needs: prepare
68+
strategy:
69+
matrix:
70+
ext: [""]
71+
steps:
72+
- name: Install environment
73+
run: |
74+
sudo apt update
75+
sudo apt install -y curl wget unzip tar git gcc g++
76+
- name: Configure Java
77+
uses: actions/setup-java@v2
78+
with:
79+
distribution: 'zulu'
80+
java-version: '17'
81+
architecture: 'aarch64'
82+
- name: Checkout repository
83+
uses: actions/checkout@v1
84+
- name: Build project
85+
run: |
86+
gcc --version
87+
mvn -version
88+
echo "<settings><servers><server><id>ossrh</id><username>${{ secrets.CI_DEPLOY_USERNAME }}</username><password>${{ secrets.CI_DEPLOY_PASSWORD }}</password></server></servers></settings>" > $HOME/.m2/settings.xml
89+
mvn clean install -pl '!tensorflow-framework' -B -U -e -Djavacpp.platform=${{ github.job }} -Djavacpp.platform.extension=${{ matrix.ext }}
90+
- name: Deploy native artifact
91+
if: env.DEPLOY_RELEASE == 'true' || env.DEPLOY_SNAPSHOT == 'true'
92+
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 }}
6593
linux-x86_64:
6694
runs-on: ubuntu-20.04
6795
needs: prepare
@@ -110,7 +138,7 @@ jobs:
110138
if: env.DEPLOY_RELEASE == 'true' || env.DEPLOY_SNAPSHOT == 'true'
111139
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 }}
112140
macosx-x86_64:
113-
runs-on: macos-11
141+
runs-on: macos-12
114142
needs: prepare
115143
strategy:
116144
matrix:
@@ -178,10 +206,9 @@ jobs:
178206
run: |
179207
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 }}
180208
if ERRORLEVEL 1 exit /b
181-
182209
deploy:
183210
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)
184-
needs: [linux-x86_64, macosx-x86_64, windows-x86_64, macosx-arm64]
211+
needs: [linux-x86_64, macosx-x86_64, windows-x86_64, macosx-arm64, linux-arm64]
185212
runs-on: ubuntu-20.04
186213
steps:
187214
- name: Configure Java

‎CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ To upgrade the version of TensorFlow that is embedded within TensorFlow Java, pl
7979
### Upgrading TensorFlow Native Library
8080

8181
1. Download locally the archive of the tensorflow release at https://github.com/tensorflow/tensorflow/archive/refs/tags/vX.X.X.tar.gz
82-
2. Compute the SHA sum using the shell command `sha256sum <tensorflow-x.x.x.tar.gz>`
82+
2. Compute the SHA sum using the shell command `shasum -a 256 <tensorflow-x.x.x.tar.gz>`
8383
3. Update `urls`, `sha256` and `strip_prefix` fields of the `org_tensorflow` archive rule in Bazel [workspace](https://github.com/tensorflow/java/blob/master/tensorflow-core/tensorflow-core-native/WORKSPACE#L19)
8484
4. Extract the archive in a temporary folder
8585
5. Copy the content of `tensorflow-x.x.x/.bazelrc` file to `tensorflow-core/tensorflow-core-native/tensorflow.bazelrc` under TensorFlow Java source tree

‎MIGRATING.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,14 @@ will now be
4141
<classifier>linux-x86_64</classifier>
4242
</dependency>
4343
```
44+
### Java Module Renaming
45+
46+
The Java Module (jigsaw) names has been updated to drop the leading `org.`, as follow:
47+
- `tensorflow-core-api` : `tensorflow` (was `org.tensorflow` before)
48+
- `tensorflow-core-generator` : `tensorflow.generator` (was `org.tensorflow-generator` before)
49+
- `tensorflow-core-native` : `tensorflow.nativelib`
50+
- `tensorflow-framework` : `tensorflow.framework` (was `org.tensorflow.framework` before)
51+
4452
### Session Run Result
4553

4654
In versions before 0.4.0 `Session.Runner.run` and `TensorFunction.call` returned a `List<Tensor>`. In newer versions

‎README.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ only binaries for the followings are being **supported and distributed** by this
5858

5959
- `linux-x86_64`: Linux platforms on Intel/AMD chips
6060
- `linux-x86_64-gpu`: Linux platforms on Intel/AMD chips with Cuda GPU support
61+
- `linux-arm64`: Linux platforms on Arm chips
6162
- `macosx-x86_64`: MacOS X platforms on Intel/AMD chips
6263
- `macosx-arm64`: MacOS X platforms on Apple Silicon chips
6364
- `windows-x86_64`: Windows platforms on Intel/AMD chips
@@ -68,12 +69,12 @@ systems with no GPU support, you should add the following dependencies:
6869
<dependency>
6970
<groupId>org.tensorflow</groupId>
7071
<artifactId>tensorflow-core-api</artifactId>
71-
<version>1.0.0-rc.1</version>
72+
<version>1.0.0-rc.2</version>
7273
</dependency>
7374
<dependency>
7475
<groupId>org.tensorflow</groupId>
7576
<artifactId>tensorflow-core-native</artifactId>
76-
<version>1.0.0-rc.1</version>
77+
<version>1.0.0-rc.2</version>
7778
<classifier>linux-x86_64</classifier>
7879
</dependency>
7980
```
@@ -84,24 +85,24 @@ native dependencies as follows:
8485
<dependency>
8586
<groupId>org.tensorflow</groupId>
8687
<artifactId>tensorflow-core-api</artifactId>
87-
<version>1.0.0-rc.1</version>
88+
<version>1.0.0-rc.2</version>
8889
</dependency>
8990
<dependency>
9091
<groupId>org.tensorflow</groupId>
9192
<artifactId>tensorflow-core-native</artifactId>
92-
<version>1.0.0-rc.1</version>
93+
<version>1.0.0-rc.2</version>
9394
<classifier>linux-x86_64-gpu</classifier>
9495
</dependency>
9596
<dependency>
9697
<groupId>org.tensorflow</groupId>
9798
<artifactId>tensorflow-core-native</artifactId>
98-
<version>1.0.0-rc.1</version>
99+
<version>1.0.0-rc.2</version>
99100
<classifier>macosx-arm64</classifier>
100101
</dependency>
101102
<dependency>
102103
<groupId>org.tensorflow</groupId>
103104
<artifactId>tensorflow-core-native</artifactId>
104-
<version>1.0.0-rc.1</version>
105+
<version>1.0.0-rc.2</version>
105106
<classifier>windows-x86_64</classifier>
106107
</dependency>
107108
```
@@ -122,7 +123,7 @@ simply add this dependency to your application:
122123
<dependency>
123124
<groupId>org.tensorflow</groupId>
124125
<artifactId>tensorflow-core-platform</artifactId>
125-
<version>1.0.0-rc.1</version>
126+
<version>1.0.0-rc.2</version>
126127
</dependency>
127128
```
128129

@@ -172,8 +173,9 @@ This table shows the mapping between TensorFlow, TensorFlow Java and minimum sup
172173
| 0.4.1 | 2.7.1 | 8 |
173174
| 0.4.2 | 2.7.4 | 8 |
174175
| 0.5.0 | 2.10.1 | 11 |
175-
| 1.0.0-rc.1 | 2.16.1 | 11 |
176-
| 1.0.0-SNAPSHOT | 2.16.1 | 11 |
176+
| 1.0.0-rc.1 | 2.16.1 | 11 |
177+
| 1.0.0-rc.2 | 2.16.2 | 11 |
178+
| 1.0.0-SNAPSHOT | 2.16.2 | 11 |
177179

178180
## How to Contribute?
179181

‎docs/install.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ For example,
5858
<dependency>
5959
<groupId>org.tensorflow</groupId>
6060
<artifactId>tensorflow-core-platform</artifactId>
61-
<version>1.0.0-rc.1</version>
61+
<version>1.0.0-rc.2</version>
6262
</dependency>
6363
```
6464

@@ -164,7 +164,7 @@ add the TensorFlow dependency to the project's `pom.xml` file:
164164
<dependency>
165165
<groupId>org.tensorflow</groupId>
166166
<artifactId>tensorflow-core-platform</artifactId>
167-
<version>1.0.0-rc.1</version>
167+
<version>1.0.0-rc.2</version>
168168
</dependency>
169169
</dependencies>
170170
</project>

‎pom.xml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<groupId>org.tensorflow</groupId>
99
<artifactId>tensorflow-java</artifactId>
10-
<version>1.0.0-rc.1</version>
10+
<version>1.0.0-rc.2</version>
1111
<packaging>pom</packaging>
1212

1313
<name>TensorFlow Java Parent</name>
@@ -26,7 +26,7 @@
2626

2727
<scm>
2828
<url>https://github.com/tensorflow/java.git</url>
29-
<connection>[email protected]:tensorflow/java.git</connection>
29+
<connection>scm:[email protected]:tensorflow/java.git</connection>
3030
<developerConnection>scm:git:https://github.com/tensorflow/java.git</developerConnection>
3131
</scm>
3232

@@ -329,6 +329,18 @@
329329
</property>
330330
</activation>
331331
</profile>
332+
<profile>
333+
<id>linux-arm64</id>
334+
<activation>
335+
<os>
336+
<name>linux</name>
337+
<arch>aarch64</arch>
338+
</os>
339+
<property>
340+
<name>!javacpp.platform.extension</name>
341+
</property>
342+
</activation>
343+
</profile>
332344
<profile>
333345
<id>macosx</id>
334346
<activation>

‎tensorflow-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.tensorflow</groupId>
2424
<artifactId>tensorflow-java</artifactId>
25-
<version>1.0.0-rc.1</version>
25+
<version>1.0.0-rc.2</version>
2626
</parent>
2727
<artifactId>tensorflow-core</artifactId>
2828
<packaging>pom</packaging>

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.tensorflow</groupId>
88
<artifactId>tensorflow-core</artifactId>
9-
<version>1.0.0-rc.1</version>
9+
<version>1.0.0-rc.2</version>
1010
</parent>
1111
<artifactId>tensorflow-core-api</artifactId>
1212
<packaging>jar</packaging>
@@ -15,7 +15,7 @@
1515
<description>Platform-dependent native code and pure-Java code for the TensorFlow machine intelligence library.</description>
1616

1717
<properties>
18-
<ndarray.version>1.0.0-rc.1</ndarray.version>
18+
<ndarray.version>1.0.0</ndarray.version>
1919
<truth.version>1.1.5</truth.version>
2020
<test.download.skip>false</test.download.skip>
2121
<test.download.folder>${project.build.directory}/tf-text-download/</test.download.folder>
@@ -230,6 +230,12 @@
230230
<goal>jar</goal>
231231
</goals>
232232
<configuration>
233+
<additionalJOptions>
234+
<additionalJOption>-Xmaxerrs</additionalJOption>
235+
<additionalJOption>65536</additionalJOption>
236+
<additionalJOption>-Xmaxwarns</additionalJOption>
237+
<additionalJOption>65536</additionalJOption>
238+
</additionalJOptions>
233239
<failOnError>false</failOnError>
234240
<minmemory>256m</minmemory>
235241
<maxmemory>2048m</maxmemory>

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

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

66
case ${PLATFORM:-} in
77
'linux-x86_64')
8-
TEXT_WHEEL_URL='https://files.pythonhosted.org/packages/c5/ef/5b8270e5665923bda4222f56382d9fbcb7fd6efd5fb8557ad0776848cdff/tensorflow_text-2.16.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl'
8+
TEXT_WHEEL_URL='https://files.pythonhosted.org/packages/43/dd/8f03331107b76e63313d2089ddfbd13f15e51fb8ed73517cdd0ab3341928/tensorflow-2.16.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl'
99
;;
1010
'macosx-x86_64')
11-
TEXT_WHEEL_URL='https://files.pythonhosted.org/packages/ed/5d/b55f48cdf98a164d293f660748c2501ea828e148250a4cadbb5b0d988735/tensorflow_text-2.16.1-cp311-cp311-macosx_10_9_x86_64.whl'
11+
TEXT_WHEEL_URL='https://files.pythonhosted.org/packages/6d/69/9999c2d9e8a3b08dfcfc7e9259a05fb1da5f700936091d2eb4a7985c2776/tensorflow-2.16.2-cp311-cp311-macosx_10_15_x86_64.whl'
1212
;;
1313
*)
1414
echo "TensorFlow Text distribution for ${PLATFORM} is not supported for download"

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,18 @@ op {
44
endpoint {
55
name: "math.SegmentSum"
66
}
7+
description: <<END
8+
Read
9+
[the section on segmentation](https://tensorflow.org/api_docs/python/tf/math#Segmentation)
10+
for an explanation of segments.
11+
12+
Computes a tensor such that
13+
\\(output_i = \sum_j data_j\\) where sum is over `j` such
14+
that `segment_ids[j] == i`.
15+
16+
If the sum is empty for a given segment ID `i`, `output[i] = 0`.
17+
18+
Note that this op is currently only supported with jit_compile=True.
19+
20+
END
721
}

‎tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/AudioOps.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
/**
3030
* An API for building {@code audio} operations as {@link Op Op}s
3131
*
32-
* @see {@link Ops}
32+
* @see Ops
3333
*/
3434
public final class AudioOps {
3535
private final Scope scope;

‎tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/BitwiseOps.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
/**
3030
* An API for building {@code bitwise} operations as {@link Op Op}s
3131
*
32-
* @see {@link Ops}
32+
* @see Ops
3333
*/
3434
public final class BitwiseOps {
3535
private final Scope scope;

‎tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/ClusterOps.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
/**
2727
* An API for building {@code cluster} operations as {@link Op Op}s
2828
*
29-
* @see {@link Ops}
29+
* @see Ops
3030
*/
3131
public final class ClusterOps {
3232
private final Scope scope;

‎tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/CollectiveOps.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
/**
3535
* An API for building {@code collective} operations as {@link Op Op}s
3636
*
37-
* @see {@link Ops}
37+
* @see Ops
3838
*/
3939
public final class CollectiveOps {
4040
private final Scope scope;

‎tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/DataExperimentalOps.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
/**
6767
* An API for building {@code data.experimental} operations as {@link Op Op}s
6868
*
69-
* @see {@link Ops}
69+
* @see Ops
7070
*/
7171
public final class DataExperimentalOps {
7272
private final Scope scope;

‎tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/DataOps.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
/**
156156
* An API for building {@code data} operations as {@link Op Op}s
157157
*
158-
* @see {@link Ops}
158+
* @see Ops
159159
*/
160160
public final class DataOps {
161161
public final DataExperimentalOps experimental;

‎tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/DebuggingOps.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
/**
2525
* An API for building {@code debugging} operations as {@link Op Op}s
2626
*
27-
* @see {@link Ops}
27+
* @see Ops
2828
*/
2929
public final class DebuggingOps {
3030
private final Scope scope;

‎tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/DistributeOps.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
/**
2828
* An API for building {@code distribute} operations as {@link Op Op}s
2929
*
30-
* @see {@link Ops}
30+
* @see Ops
3131
*/
3232
public final class DistributeOps {
3333
private final Scope scope;

‎tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/DtypesOps.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
/**
2929
* An API for building {@code dtypes} operations as {@link Op Op}s
3030
*
31-
* @see {@link Ops}
31+
* @see Ops
3232
*/
3333
public final class DtypesOps {
3434
private final Scope scope;

‎tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/ImageOps.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
/**
7272
* An API for building {@code image} operations as {@link Op Op}s
7373
*
74-
* @see {@link Ops}
74+
* @see Ops
7575
*/
7676
public final class ImageOps {
7777
private final Scope scope;

‎tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/IoOps.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
/**
7979
* An API for building {@code io} operations as {@link Op Op}s
8080
*
81-
* @see {@link Ops}
81+
* @see Ops
8282
*/
8383
public final class IoOps {
8484
private final Scope scope;

‎tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/LinalgOps.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
/**
8181
* An API for building {@code linalg} operations as {@link Op Op}s
8282
*
83-
* @see {@link Ops}
83+
* @see Ops
8484
*/
8585
public final class LinalgOps {
8686
public final LinalgSparseOps sparse;

‎tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/LinalgSparseOps.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
/**
4343
* An API for building {@code linalg.sparse} operations as {@link Op Op}s
4444
*
45-
* @see {@link Ops}
45+
* @see Ops
4646
*/
4747
public final class LinalgSparseOps {
4848
private final Scope scope;

0 commit comments

Comments
 (0)