Upgrade JavaCPP to 1.5.4-SNAPSHOT and TensorFlow to 2.3.0 (tensorflow#93)

Author: saudet

.github/workflows/ci.yml

@@ -31,7 +31,7 @@ jobs:
         run: |
           yum -y update
           yum -y install centos-release-scl-rh epel-release
-          yum -y install java-1.8.0-openjdk-devel devtoolset-7 rh-git218 patch python36-devel python36-pip python36-six
+          yum -y install java-1.8.0-openjdk-devel devtoolset-7 rh-git218 patch python36-devel python36-numpy python36-pip python36-six
           echo Downloading Maven
           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
           tar xzf $HOME/apache-maven-3.6.3-bin.tar.gz -C /opt/
@@ -66,7 +66,7 @@ jobs:
     steps:
       - name: Install environment
         run: |
-          python3 -m pip install six
+          python3 -m pip install numpy six
           echo Downloading Bazel
           curl -L https://github.com/bazelbuild/bazel/releases/download/2.0.0/bazel-2.0.0-installer-darwin-x86_64.sh -o bazel.sh --retry 10
           bash bazel.sh
@@ -98,7 +98,7 @@ jobs:
       - name: Install environment
         shell: cmd
         run: |
-          python -m pip install six
+          python -m pip install numpy six
           echo Removing broken version of Bash from WSL
           rm.exe "C:/WINDOWS/system32/bash.EXE"
           echo Removing some unused stuff to avoid running out of disk space

README.md

@@ -160,7 +160,7 @@ This table shows the mapping between different version of TensorFlow for Java an
 | TensorFlow Java Version  | TensorFlow Version |
 | ------------- | ------------- |
 | 0.1.0-SNAPSHOT  | 2.2.0  |
-| 0.2.0-SNAPSHOT  | 2.2.0  |
+| 0.2.0-SNAPSHOT  | 2.3.0  |
 
 ## How to Contribute?
 

tensorflow-core/pom.xml

@@ -59,8 +59,8 @@
     <javacpp.platform.macosx-x86_64.extension>macosx-x86_64${javacpp.platform.extension}</javacpp.platform.macosx-x86_64.extension>
     <javacpp.platform.windows-x86.extension>windows-x86${javacpp.platform.extension}</javacpp.platform.windows-x86.extension>
     <javacpp.platform.windows-x86_64.extension>windows-x86_64${javacpp.platform.extension}</javacpp.platform.windows-x86_64.extension>
-    <javacpp.version>1.5.3</javacpp.version>
-    <mkl-dnn.version>0.21.4-${javacpp.version}</mkl-dnn.version>
+    <javacpp.version>1.5.4-SNAPSHOT</javacpp.version>
+    <mkl-dnn.version>0.21.5-${javacpp.version}</mkl-dnn.version>
   </properties>
 
   <profiles>

tensorflow-core/tensorflow-core-api/WORKSPACE

@@ -16,10 +16,10 @@ http_archive(
     patch_args = ["-p1"],
     patch_cmds = ["grep -rl 'java_package' tensorflow/core | xargs sed -i.bak 's/^\(.* java_package = \"org\.tensorflow\.\)\(.*\"\)/\\1proto.\\2'/"],
     urls = [
-       "https://github.com/tensorflow/tensorflow/archive/v2.2.0.tar.gz",
+       "https://github.com/tensorflow/tensorflow/archive/v2.3.0.tar.gz",
     ],
-    sha256 = "69cd836f87b8c53506c4f706f655d423270f5a563b76dc1cfa60fbc3184185a3",
-    strip_prefix = "tensorflow-2.2.0"
+    sha256 = "2595a5c401521f20a2734c4e5d54120996f8391f00bb62a57267d930bce95350",
+    strip_prefix = "tensorflow-2.3.0"
 )
 
 # START: Upstream TensorFlow dependencies

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

@@ -98,7 +98,7 @@ public <T extends TNumber> AdjustContrast<T> adjustContrast(Operand<T> images,
    * Adjust the hue of one or more images.
    *  <p>
    *  `images` is a tensor of at least 3 dimensions.  The last dimension is
-   *  interpretted as channels, and must be three.
+   *  interpreted as channels, and must be three.
    *  <p>
    *  The input image is considered in the RGB colorspace. Conceptually, the RGB
    *  colors are first mapped into HSV. A delta is then applied all the hue values,
@@ -117,7 +117,7 @@ public <T extends TNumber> AdjustHue<T> adjustHue(Operand<T> images, Operand<TFl
    * Adjust the saturation of one or more images.
    *  <p>
    *  `images` is a tensor of at least 3 dimensions.  The last dimension is
-   *  interpretted as channels, and must be three.
+   *  interpreted as channels, and must be three.
    *  <p>
    *  The input image is considered in the RGB colorspace. Conceptually, the RGB
    *  colors are first mapped into HSV. A scale is then applied all the saturation
@@ -347,7 +347,7 @@ public DecodeBmp decodeBmp(Operand<TString> contents, DecodeBmp.Options... optio
    *      convert $src.gif -coalesce $dst.gif
    *  <p>
    *  This op also supports decoding JPEGs and PNGs, though it is cleaner to use
-   *  `tf.image.decode_image`.
+   *  `tf.io.decode_image`.
    *
    * @param contents 0-D.  The GIF-encoded image.
    * @return a new instance of DecodeGif
@@ -382,7 +382,7 @@ public DecodeGif decodeGif(Operand<TString> contents) {
    *  downscaling the image later.
    *  <p>
    *  This op also supports decoding PNGs and non-animated GIFs since the interface is
-   *  the same, though it is cleaner to use `tf.image.decode_image`.
+   *  the same, though it is cleaner to use `tf.io.decode_image`.
    *
    * @param contents 0-D.  The JPEG-encoded image.
    * @param options carries optional attributes values
@@ -417,7 +417,7 @@ public DecodeJpeg decodeJpeg(Operand<TString> contents, DecodeJpeg.Options... op
    *  of color channels.
    *  <p>
    *  This op also supports decoding JPEGs and non-animated GIFs since the interface
-   *  is the same, though it is cleaner to use `tf.image.decode_image`.
+   *  is the same, though it is cleaner to use `tf.io.decode_image`.
    *
    * @param <T> data type for {@code image()} output
    * @param contents 0-D.  The PNG-encoded image.
@@ -453,7 +453,7 @@ public DecodePng<TUint8> decodePng(Operand<TString> contents, DecodePng.Options.
    *  of color channels.
    *  <p>
    *  This op also supports decoding JPEGs and non-animated GIFs since the interface
-   *  is the same, though it is cleaner to use `tf.image.decode_image`.
+   *  is the same, though it is cleaner to use `tf.io.decode_image`.
    *
    * @param <T> data type for {@code image()} output
    * @param contents 0-D.  The PNG-encoded image.

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

@@ -419,7 +419,7 @@ public ParseExample parseExample(Operand<TString> serialized, Operand<TString> n
    * @param featureListDenseKeys The keys expected in the SequenceExamples' feature_lists associated
    *  with lists of dense values.
    * @param featureListRaggedKeys The keys expected in the FeatureLists associated with ragged values.
-   * @param featureListDenseMissingAssumedEmpty A vector corresponding 1:1 with featue_list_dense_keys, indicating which
+   * @param featureListDenseMissingAssumedEmpty A vector corresponding 1:1 with feature_list_dense_keys, indicating which
    *  features may be missing from the SequenceExamples.  If the associated
    *  FeatureList is missing, it is treated as empty.
    * @param contextDenseDefaults A list of Ncontext_dense Tensors (some may be empty).

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

@@ -83,9 +83,7 @@ public final class LinalgOps {
   }
 
   /**
-   * Copy a tensor setting everything outside a central band in each innermost matrix
-   *  <p>
-   *  to zero.
+   * Copy a tensor setting everything outside a central band in each innermost matrix to zero.
    *  <p>
    *  The `band` part is computed as follows:
    *  Assume `input` has `k` dimensions `[I, J, K, ..., M, N]`, then the output is a

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

@@ -35,8 +35,6 @@
 import org.tensorflow.op.math.Atan;
 import org.tensorflow.op.math.Atan2;
 import org.tensorflow.op.math.Atanh;
-import org.tensorflow.op.math.BesselI0e;
-import org.tensorflow.op.math.BesselI1e;
 import org.tensorflow.op.math.Betainc;
 import org.tensorflow.op.math.Bincount;
 import org.tensorflow.op.math.Ceil;
@@ -529,38 +527,6 @@ public <T extends TType> Atanh<T> atanh(Operand<T> x) {
     return Atanh.create(scope, x);
   }
 
-  /**
-   * Computes the Bessel i0e function of `x` element-wise.
-   *  <p>
-   *  Exponentially scaled modified Bessel function of order 0 defined as
-   *  `bessel_i0e(x) = exp(-abs(x)) bessel_i0(x)`.
-   *  <p>
-   *  This function is faster and numerically stabler than `bessel_i0(x)`.
-   *
-   * @param <T> data type for {@code y()} output
-   * @param x
-   * @return a new instance of BesselI0e
-   */
-  public <T extends TNumber> BesselI0e<T> besselI0e(Operand<T> x) {
-    return BesselI0e.create(scope, x);
-  }
-
-  /**
-   * Computes the Bessel i1e function of `x` element-wise.
-   *  <p>
-   *  Exponentially scaled modified Bessel function of order 0 defined as
-   *  `bessel_i1e(x) = exp(-abs(x)) bessel_i1(x)`.
-   *  <p>
-   *  This function is faster and numerically stabler than `bessel_i1(x)`.
-   *
-   * @param <T> data type for {@code y()} output
-   * @param x
-   * @return a new instance of BesselI1e
-   */
-  public <T extends TNumber> BesselI1e<T> besselI1e(Operand<T> x) {
-    return BesselI1e.create(scope, x);
-  }
-
   /**
    * Compute the regularized incomplete beta integral \\(I_x(a, b)\\).
    *  <p>

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

@@ -1328,7 +1328,7 @@ public <T extends TNumber> MaxPool3d<T> maxPool3d(Operand<T> input, List<Long> k
   }
 
   /**
-   * Computes gradients of max pooling function.
+   * Computes gradients of 3D max pooling function.
    *
    * @param <U> data type for {@code output()} output
    * @param origInput The original input tensor.