Commit Graph

476 Commits

Author SHA1 Message Date
Liam Miller-Cushon
2e02ff669a Explicitly disable javac -parameters metadata for Java 7 compilations
PiperOrigin-RevId: 314185291
Change-Id: I8688c8dfd65680bfeffd5832d3826f013af96d9d
2020-06-01 12:56:57 -07:00
TensorFlower Gardener
93a30c941c Merge pull request from yongtang:39381-protobuf-java
PiperOrigin-RevId: 311649749
Change-Id: I690d1353dfed2f3e29de53c78749fd038008192f
2020-05-14 18:54:55 -07:00
A. Unique TensorFlower
5d3c548620 Resolve trivial aliases for portable TensorFlow targets.
PiperOrigin-RevId: 311548335
Change-Id: I837aa5a62500682783607841f0c993c2b6c238ed
2020-05-14 09:39:36 -07:00
Yong Tang
85fcfd9191 Update protobuf-java to 3.9.2
This PR updates protobuf-java to 3.9.2, to match C++ version
in tensorflow/workspace.bzl (3.9.2), and to fix the issue raised
in 39381.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2020-05-10 18:52:18 +00:00
Mihai Maruseac
4ab3aeead7 Increase Apache Spark version to 2.4.5 to handle GitHub Security Alert
Handles CVE-2019-10099, CVE-2018-17190, CVE-2018-11770.

To be cherrypicked on r1.15, r2.0, r2.1 and r2.2 branches

PiperOrigin-RevId: 309955549
Change-Id: I5ee68fdd3270534066487be67232c1abc687f968
2020-05-05 09:01:09 -07:00
A. Unique TensorFlower
630c5b8820 Remove usage of @Test(expected = ...) in ZerosTest.
PiperOrigin-RevId: 302995001
Change-Id: Ide4358742b784131a3b22a21db399760493ad287
2020-03-25 16:26:51 -07:00
Mark Daoust
79cf502129 Remove references to github.com/tensorflow/models/blob/master/samples
It's been deleted by [](https://github.com/tensorflow/models/pull/8234)

PiperOrigin-RevId: 300614979
Change-Id: Ie37d9bb8001072a6f7ff3c6f4a7b0bcee5c08b51
2020-03-12 13:49:33 -07:00
Kazuaki Ishizaki
27643b326c minor spelling tweaks 2020-01-16 14:36:52 +09:00
TensorFlower Gardener
bf9263072c Merge pull request from sharkdtu:master
PiperOrigin-RevId: 289924831
Change-Id: Ia1383ec4a192da8283fe6c59742fc44442634de9
2020-01-15 13:32:26 -08:00
sharkdtu
deb4d14153 Avoid hard coding in NativeLibrary.getMajorVersionNumber 2020-01-09 20:05:26 +08:00
Adrian Kuegel
78844fa978 internal BUILD file cleanup
PiperOrigin-RevId: 278833682
Change-Id: I43390b8edf4596477b6231a8462c06e9199fc0bc
2019-11-06 05:05:40 -08:00
Adrian Kuegel
35f8f8abab Let cc_proto_library create proto libraries with _protogen instead of _cc_protogen suffix.
This is motivated by making this more similar to the internal build system.

PiperOrigin-RevId: 278584449
Change-Id: I0545dbb8c0b03af44eac7dc0f90acba8eb036710
2019-11-05 03:09:35 -08:00
James Ring
b0ec3f9b4c Release TF Java 1.15 2019-10-23 14:58:06 -07:00
TensorFlower Gardener
9cd59e4549 Merge pull request from handong0123:master
PiperOrigin-RevId: 272227386
2019-10-01 10:21:47 -07:00
韩董
f4a49de004
Update NativeLibrary.java
delete unversioned lib judge
2019-09-28 01:08:37 +08:00
韩董
ffd9edffeb
Temporarily fixed version number is 1
I think we can temporarily fix the version number to 1, and then tf2.x declares the Implementation-Version.
2019-09-27 11:34:41 +08:00
韩董
2df4c12ac0
Update NativeLibrary.java 2019-09-26 16:23:25 +08:00
handong
4a5470691e fix .so file name error on linux and macos 2019-09-26 13:08:44 +08:00
Gunhan Gulsoy
ffc25308ce [2.0] rm -rf tensorflow/contrib
PiperOrigin-RevId: 269816906
2019-09-18 09:05:58 -07:00
Mark Daoust
63f1dd2414 replace "tensorflow/contrib/android => tensorflow/tools/android/inference_interface"
PiperOrigin-RevId: 269659438
2019-09-17 14:54:35 -07:00
Mark Daoust
b4d110caee Copy Android Inference Interface out of contrib.
Point tensorflow/examples/android at the copy.

PiperOrigin-RevId: 269423640
2019-09-16 16:01:26 -07:00
Yifei Feng
4f099b4ff5 Test build file fixes for new buildifier version.
PiperOrigin-RevId: 268269286
2019-09-10 12:04:44 -07:00
Gunhan Gulsoy
b9fce50271 Remove reference to contrib in tensorflow/java/README
PiperOrigin-RevId: 267192372
2019-09-04 11:42:43 -07:00
Christian Sigg
ed9dc39b0b Remove # -*- Python -*- from Starlark files.
PiperOrigin-RevId: 266444401
2019-08-30 14:10:07 -07:00
James Ring
a1e4ab848a Fix some javadoc warnings
PiperOrigin-RevId: 262063250
2019-08-06 22:04:13 -07:00
James Ring
d8655c90d9 Fix packaging for Tensorflow JNI GPU package.
The equivalent fix for the CPU JNI package was submitted as
aa6702aa1c.

PiperOrigin-RevId: 262023368
2019-08-06 16:57:29 -07:00
James Ring
aa6702aa1c Place native libraries in the location expected by TF Java
The Java loader now expects libtensorflow_framework.so to be named
libtensorflow_framework.so.<majorVersion>. This change alters the Maven
release process to honor that expectation.

PiperOrigin-RevId: 260783375
2019-07-30 14:53:18 -07:00
James Ring
a4a4057748 Attempt to load versioned shared objects in Java
Since TensorFlow 1.14.0, libtensorflow_framework.so has been packaged as
a versioned shared object. This change attempts to support that naming
scheme in the Java NativeLibrary loader.

If libtensorflow_framework.so is not present and a major version number
can be determined, the loader will attempt to find
libtensorflow_framework.so.<majorVersion>, where <majorVersion> is
determined from the manifest of the JAR from which the NativeLibrary
class was loaded. On darwin, the loader will look for
libtensorflow_framework.<majorVersion>.so.

PiperOrigin-RevId: 260749010
2019-07-30 11:33:00 -07:00
James Ring
fb3096ff31 Put TF Java version information in published POM files.
Version information can be retrieved with

```
org.tensorflow.TensorFlow.class.getPackage().getImplementationVersion()
```

For TensorFlow 1.14.0, for example, this would return the string
"1.14.0".

This version string reflects the TF Java API version, not necessarily
the underlying TensorFlow runtime version that may be retrieved via
org.tensorflow.TensorFlow.version().

PiperOrigin-RevId: 260584561
2019-07-29 16:02:36 -07:00
James Ring
1fefe05424 remove tensorflow-android deployment from java release script
tensorflow-android is deprecated in favor of TF Lite and will not see any new
releases.

This change also adds the ability to deploy tensorflow artifacts to the local
maven repository for testing. To use this:

DEPLOY_OSSRH=false DEPLOY_BINTRAY=false DEPLOY_LOCAL=true ./release.sh <version>
PiperOrigin-RevId: 259552290
2019-07-23 09:39:29 -07:00
James Ring
52b8190e14 release TF Java 1.14.0 (except tensorflow-android)
There are some changes to how tensorflow-android is released, I'm still
working out what to do with that artifact.

Fixes .
2019-07-11 08:00:02 -07:00
TensorFlower Gardener
a1501b002e Merge pull request from karllessard:unit-test-fix
PiperOrigin-RevId: 257595934
2019-07-11 06:30:41 -07:00
TensorFlower Gardener
413d93bc0a Merge pull request from robertbrignull:java_init_logging
PiperOrigin-RevId: 257039697
2019-07-08 17:02:23 -07:00
Karl Lessard
22e53cc8c4 Fix eager session testing with GC 2019-07-07 22:40:36 -04:00
Jonathan Hseu
155207e65f Disable flaky test.
PiperOrigin-RevId: 254310218
2019-06-20 18:09:10 -07:00
frreiss
7beef362fd Run build files through buildifier 2019-06-12 18:10:15 -07:00
A. Unique TensorFlower
a9d52b709c Adjust structure of all BUILD files to recommended style (https://docs.bazel.build/versions/master/skylark/build-style.html#file-structure), moving loads to top.
PiperOrigin-RevId: 252571477
2019-06-11 01:33:08 -07:00
A. Unique TensorFlower
3e0a311fa0 Apply 'buildozer fix moveLicensesAndDistribs movePackageToTop' to all BUILD files.
PiperOrigin-RevId: 251836013
2019-06-06 06:06:34 -07:00
TensorFlower Gardener
270305c6d5 Merge pull request from karllessard:java-eager-default-session
PiperOrigin-RevId: 251058736
2019-06-01 11:58:23 -07:00
A. Unique TensorFlower
4469ed4ed8 Apply 'buildozer fix moveLicensesAndDistribs movePackageToTop' to all BUILD files.
PiperOrigin-RevId: 249807024
2019-05-24 03:53:05 -07:00
Gaurav Jain
4213d5c1bd Use absl instead of deprecated str_util
PiperOrigin-RevId: 249248716
2019-05-21 08:10:10 -07:00
Amit Patankar
3144fbe49a Buildifier fixes.
PiperOrigin-RevId: 249038542
2019-05-20 06:56:52 -07:00
Karl Lessard
06668ca549 Add default eager session 2019-05-16 19:31:44 -04:00
TensorFlower Gardener
ddb2db1da2 Merge pull request from karllessard:java-eager-tensor
PiperOrigin-RevId: 247998495
2019-05-13 14:45:56 -07:00
Karl Lessard
4384648a78
Merge branch 'master' into java-eager-tensor 2019-05-12 00:34:00 -04:00
Karl Lessard
fceea7d090 Add eager tensor support 2019-05-12 00:21:20 -04:00
TensorFlower Gardener
b422174124 Merge pull request from karllessard:java-eager-operation
PiperOrigin-RevId: 247638740
2019-05-10 14:04:52 -07:00
Karl Lessard
4678439926 Fix internal lint errors 2019-05-09 22:23:54 -04:00
Karl Lessard
bf05237063 Eager operations implementation 2019-05-07 09:00:30 -04:00
TensorFlower Gardener
cba813e758 Merge pull request from karllessard:java-eager-operation-builder
PiperOrigin-RevId: 246208940
2019-05-01 17:51:35 -07:00