Merge branch 'r0.3'

# Conflicts:
#	README.md
#	ndarray/README.md
#	ndarray/pom.xml
#	pom.xml
#	tensorflow-core/pom.xml
#	tensorflow-core/tensorflow-core-api/pom.xml
#	tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/Graph.java
#	tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/SavedModelBundle.java
#	tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/Signature.java
#	tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/SavedModelBundleTest.java
#	tensorflow-core/tensorflow-core-generator/pom.xml
#	tensorflow-core/tensorflow-core-platform-gpu/pom.xml
#	tensorflow-core/tensorflow-core-platform-mkl-gpu/pom.xml
#	tensorflow-core/tensorflow-core-platform-mkl/pom.xml
#	tensorflow-core/tensorflow-core-platform/pom.xml
#	tensorflow-framework/pom.xml

Author: karllessard

README.md

@@ -56,12 +56,12 @@ systems, you should add the following dependencies:
 <dependency>
   <groupId>org.tensorflow</groupId>
   <artifactId>tensorflow-core-api</artifactId>
-  <version>0.3.1</version>
+  <version>0.3.3</version>
 </dependency>
 <dependency>
   <groupId>org.tensorflow</groupId>
   <artifactId>tensorflow-core-api</artifactId>
-  <version>0.3.1</version>
+  <version>0.3.3</version>
   <classifier>linux-x86_64${javacpp.platform.extension}</classifier>
 </dependency>
 ```
@@ -72,24 +72,24 @@ native dependencies as follows:
 <dependency>
   <groupId>org.tensorflow</groupId>
   <artifactId>tensorflow-core-api</artifactId>
-  <version>0.3.1</version>
+  <version>0.3.3</version>
 </dependency>
 <dependency>
   <groupId>org.tensorflow</groupId>
   <artifactId>tensorflow-core-api</artifactId>
-  <version>0.3.1</version>
+  <version>0.3.3</version>
   <classifier>linux-x86_64${javacpp.platform.extension}</classifier>
 </dependency>
 <dependency>
   <groupId>org.tensorflow</groupId>
   <artifactId>tensorflow-core-api</artifactId>
-  <version>0.3.1</version>
+  <version>0.3.3</version>
   <classifier>macosx-x86_64${javacpp.platform.extension}</classifier>
 </dependency>
 <dependency>
   <groupId>org.tensorflow</groupId>
   <artifactId>tensorflow-core-api</artifactId>
-  <version>0.3.1</version>
+  <version>0.3.3</version>
   <classifier>windows-x86_64${javacpp.platform.extension}</classifier>
 </dependency>
 ```
@@ -102,7 +102,7 @@ artifact includes transitively all the artifacts above as a single dependency:
 <dependency>
   <groupId>org.tensorflow</groupId>
   <artifactId>tensorflow-core-platform${javacpp.platform.extension}</artifactId>
-  <version>0.3.1</version>
+  <version>0.3.3</version>
 </dependency>
 ```
 
@@ -146,6 +146,8 @@ This table shows the mapping between different version of TensorFlow for Java an
 | 0.2.0  | 2.3.1  |
 | 0.3.0  | 2.4.1  |
 | 0.3.1  | 2.4.1  |
+| 0.3.2  | 2.4.1  |
+| 0.3.3  | 2.4.1  |
 | 0.4.0-SNAPSHOT | 2.5.0
 
 ## How to Contribute?

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

@@ -20,7 +20,7 @@
     <javacpp.parser.skip>${native.build.skip}</javacpp.parser.skip>
     <javacpp.compiler.skip>${native.build.skip}</javacpp.compiler.skip>
     <java.module.name>org.tensorflow.core.api</java.module.name>
-    <ndarray.version>0.3.1</ndarray.version>
+    <ndarray.version>0.3.3</ndarray.version>
     <truth.version>1.0.1</truth.version>
   </properties>
 

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

@@ -381,10 +381,10 @@ public final class Ops {
 
   public final SignalOps signal;
 
-  public final TrainOps train;
-
   public final QuantizationOps quantization;
 
+  public final TrainOps train;
+
   private final Scope scope;
 
   private Ops(Scope scope) {
@@ -407,8 +407,8 @@ private Ops(Scope scope) {
     math = new MathOps(this);
     audio = new AudioOps(this);
     signal = new SignalOps(this);
-    train = new TrainOps(this);
     quantization = new QuantizationOps(this);
+    train = new TrainOps(this);
   }
 
   /**

tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/Graph.java

@@ -858,19 +858,17 @@ public Output<?>[] whileLoop(
   synchronized SaverDef saverDef() {
     if (saverDef == null) {
       // Check to see if this graph has a restore operation
-      if (operation("save/restore_all") == null) {
+      if (operation(SAVER_DEF_SCOPE + "/" + SAVER_DEF_RESTORE_OP) == null) {
         // No saver, create one by mutating the graph
         saverDef = addVariableSaver(this);
       } else {
         // This graph already has saving/restoring operations,
-        // regenerate SaverDef without mutating. The names mirror
-        // the python implementation for compatibility.
-        // https://github.com/tensorflow/tensorflow/blob/master/tensorflow/python/training/saver.py
+        // regenerate SaverDef without mutating.
         saverDef =
             SaverDef.newBuilder()
-                .setFilenameTensorName("save/filename")
-                .setSaveTensorName("save/control_dependency")
-                .setRestoreOpName("save/restore_all")
+                .setFilenameTensorName(SAVER_DEF_SCOPE + "/" + SAVER_DEF_FILENAME_OP + ":0")
+                .setSaveTensorName(SAVER_DEF_SCOPE + "/" + SAVER_DEF_SAVE_OP)
+                .setRestoreOpName(SAVER_DEF_SCOPE + "/" + SAVER_DEF_RESTORE_OP)
                 .build();
       }
     }
@@ -981,6 +979,13 @@ public void remove() {
     private int position;
   }
 
+  // These names mirror the python implementation, to reduce the risk of incompatibility.
+  // https://github.com/tensorflow/tensorflow/blob/master/tensorflow/python/training/saver.py
+  private static final String SAVER_DEF_SCOPE = "save";
+  private static final String SAVER_DEF_FILENAME_OP = "filename";
+  private static final String SAVER_DEF_SAVE_OP = "control_dependency";
+  private static final String SAVER_DEF_RESTORE_OP = "restore_all";
+
   private static TF_Graph allocate() {
     return TF_NewGraph();
   }
@@ -1232,7 +1237,7 @@ private static Object[] whileLoop(
   }
 
   private static SaverDef addVariableSaver(Graph graph) {
-    Ops tf = Ops.create(graph).withSubScope("save");
+    Ops tf = Ops.create(graph).withSubScope(SAVER_DEF_SCOPE);
 
     List<String> varNames = new ArrayList<>();
     List<Operand<?>> varOutputs = new ArrayList<>();
@@ -1247,36 +1252,35 @@ private static SaverDef addVariableSaver(Graph graph) {
       }
     }
 
-    Placeholder<TString> saveFilename = tf.withName("filename").placeholder(TString.class);
+    Placeholder<TString> filename = tf.withName(SAVER_DEF_FILENAME_OP).placeholder(TString.class);
+    Identity<TString> save = null;
+    NoOp restore = null;
 
     if (varNames.isEmpty()) {
-      return SaverDef.newBuilder()
-          .setFilenameTensorName(saveFilename.op().name())
-          .setSaveTensorName(tf.withName("empty_save").identity(saveFilename).op().name())
-          .setRestoreOpName(tf.withName("restore_all").noOp().op().name())
-          .build();
-    }
-
-    // FIXME Need an easier way to initialize an NdArray from a list
-    String[] tmp = new String[varNames.size()];
-    Constant<TString> varNamesTensor = tf.constant(StdArrays.ndCopyOf(varNames.toArray(tmp)));
-    Operand<TString> varSlices = tf.zerosLike(varNamesTensor);
-    Save saveVariables = tf.train.save(saveFilename, varNamesTensor, varSlices, varOutputs);
-    Identity<TString> id =
-        tf.withControlDependencies(Arrays.asList(saveFilename, saveVariables))
-            .withName("control_dependency")
-            .identity(saveFilename);
-    Restore restoreVariables = tf.train.restore(saveFilename, varNamesTensor, varSlices, varTypes);
-    List<Op> restoreOps = new ArrayList<>(varOutputs.size());
-    for (int i = 0; i < varOutputs.size(); ++i) {
-      restoreOps.add(tf.assign(varOutputs.get(i), (Operand) restoreVariables.tensors().get(i)));
+      save = tf.withName(SAVER_DEF_SAVE_OP).identity(filename);
+      restore = tf.withName(SAVER_DEF_RESTORE_OP).noOp();
+    } else {
+      String[] tmp = new String[varNames.size()];
+      Constant<TString> varNamesTensor = tf.constant(StdArrays.ndCopyOf(varNames.toArray(tmp)));
+      Operand<TString> varSlices = tf.zerosLike(varNamesTensor);
+      Save saveVars = tf.train.save(filename, varNamesTensor, varSlices, varOutputs);
+      List<Op> saveDeps = Arrays.asList(filename, saveVars);
+      Restore restoreVars = tf.train.restore(filename, varNamesTensor, varSlices, varTypes);
+      List<Op> restoreDeps = new ArrayList<>(varOutputs.size());
+      for (int i = 0; i < varOutputs.size(); ++i) {
+        restoreDeps.add(tf.assign(varOutputs.get(i), (Operand) restoreVars.tensors().get(i)));
+      }
+      save = tf.withControlDependencies(saveDeps).withName(SAVER_DEF_SAVE_OP).identity(filename);
+      restore = tf.withControlDependencies(restoreDeps).withName(SAVER_DEF_RESTORE_OP).noOp();
     }
-    NoOp restoreAll = tf.withControlDependencies(restoreOps).withName("restore_all").noOp();
 
+    // 'Filename' must be the name of a tensor (i.e. with output index)
+    // 'Save' must be an operation name, even if the field name is confusing (see SaverDef doc)
+    // 'Restore' must be an operation name
     return SaverDef.newBuilder()
-        .setFilenameTensorName(saveFilename.op().name())
-        .setSaveTensorName(id.op().name())
-        .setRestoreOpName(restoreAll.op().name())
+        .setFilenameTensorName(filename.output().name())
+        .setSaveTensorName(save.op().name())
+        .setRestoreOpName(restore.op().name())
         .build();
   }
 

tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/Output.java

@@ -38,6 +38,11 @@ public int index() {
     return index;
   }
 
+  /** Returns the full name of this Output (a.k.a. tensor name) */
+  public String name() {
+    return op().name() + ":" + index;
+  }
+
   /** Returns the DataType of the tensor referred to by this Output. */
   @SuppressWarnings("unchecked")
   public DataType dataType() {
@@ -48,7 +53,7 @@ public DataType dataType() {
   @SuppressWarnings("unchecked")
   @Override
   public Class<T> type() {
-    return (Class<T>)TensorTypeRegistry.find(dataType()).type();
+    return (Class<T>) TensorTypeRegistry.find(dataType()).type();
   }
 
   /**
@@ -63,7 +68,10 @@ public Class<T> type() {
   public <U extends TType> Output<U> expect(Class<U> type) {
     if (type != type()) {
       throw new IllegalArgumentException(
-          "Cannot cast from output of " + this.type().getSimpleName() + " to output of " + type.getSimpleName());
+          "Cannot cast from output of "
+              + this.type().getSimpleName()
+              + " to output of "
+              + type.getSimpleName());
     }
     return ((Output<U>) this);
   }
@@ -80,17 +88,16 @@ public <U extends TType> Output<U> expect(Class<U> type) {
    *
    * @return tensor
    * @throws IllegalStateException if this output results from a graph
-   * @throws ClassCastException if the type of the tensor and this output are unexpectedly incompatible
+   * @throws ClassCastException if the type of the tensor and this output are unexpectedly
+   *     incompatible
    * @see EagerSession
    */
   @SuppressWarnings("unchecked")
   public T asTensor() {
-    return (T)operation.tensor(index);
+    return (T) operation.tensor(index);
   }
 
-  /**
-   * Returns the (possibly partially known) shape of the tensor referred to by this output.
-   */
+  /** Returns the (possibly partially known) shape of the tensor referred to by this output. */
   @Override
   public Shape shape() {
     return operation.shape(index);

tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/SavedModelBundle.java

@@ -31,6 +31,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.stream.Collectors;
 import org.bytedeco.javacpp.BytePointer;
 import org.bytedeco.javacpp.PointerScope;
@@ -529,7 +530,7 @@ private static SavedModelBundle load(
   }
 
   private static void validateTags(String[] tags) {
-    if (tags == null || Arrays.stream(tags).anyMatch(t -> t == null || t.isEmpty())) {
+    if (tags == null || Arrays.stream(tags).anyMatch(Objects::isNull)) {
       throw new IllegalArgumentException("Invalid tags: " + Arrays.toString(tags));
     }
   }

tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/Signature.java

@@ -208,7 +208,7 @@ public Set<String> outputNames() {
 
   @Override
   public String toString() {
-    StringBuilder strBuilder = new StringBuilder("Signature for \"" + key +"\":\n");
+    StringBuilder strBuilder = new StringBuilder("Signature for \"" + key + "\":\n");
     String methodName = methodName();
     if (methodName != null && !methodName.isEmpty()) {
       strBuilder.append("\tMethod: \"").append(methodName).append("\"\n");

tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/SavedModelBundleTest.java

@@ -43,6 +43,7 @@
 import org.tensorflow.proto.framework.RunOptions;
 import org.tensorflow.proto.framework.SignatureDef;
 import org.tensorflow.proto.framework.TensorInfo;
+import org.tensorflow.proto.util.SaverDef;
 import org.tensorflow.types.TFloat32;
 
 /** Unit tests for {@link org.tensorflow.SavedModelBundle}. */
@@ -171,7 +172,13 @@ public void exportFunctionWithVariables() throws IOException {
     try (SavedModelBundle savedModel =
         SavedModelBundle.load(testFolder.toString(), SavedModelBundle.DEFAULT_TAG)) {
       assertNotNull(savedModel.metaGraphDef());
-      assertNotNull(savedModel.metaGraphDef().getSaverDef());
+
+      SaverDef saverDef = savedModel.metaGraphDef().getSaverDef();
+      assertNotNull(saverDef);
+      assertEquals("save/filename:0", saverDef.getFilenameTensorName());
+      assertEquals("save/control_dependency", saverDef.getSaveTensorName());
+      assertEquals("save/restore_all", saverDef.getRestoreOpName());
+
       assertEquals(1, savedModel.metaGraphDef().getSignatureDefCount());
       assertEquals(
           Signature.DEFAULT_KEY,
@@ -262,21 +269,18 @@ public void cannotExportMultipleFunctionsWithSameSignatureKey() throws IOExcepti
 
   @Test
   public void cannotExportOrImportInvalidTags() {
-    assertThrows(IllegalArgumentException.class, () -> SavedModelBundle.loader("/").withTags(null));
-    assertThrows(
-        IllegalArgumentException.class,
-        () -> SavedModelBundle.loader("/").withTags(new String[] {"tag", null}));
-    assertThrows(
-        IllegalArgumentException.class,
-        () -> SavedModelBundle.loader("/").withTags(new String[] {"tag", ""}));
-    assertThrows(
-        IllegalArgumentException.class, () -> SavedModelBundle.exporter("/").withTags(null));
-    assertThrows(
-        IllegalArgumentException.class,
-        () -> SavedModelBundle.exporter("/").withTags(new String[] {"tag", null}));
-    assertThrows(
-        IllegalArgumentException.class,
-        () -> SavedModelBundle.exporter("/").withTags(new String[] {"tag", ""}));
+    assertThrows(IllegalArgumentException.class, () ->
+        SavedModelBundle.loader("/").withTags(null)
+    );
+    assertThrows(IllegalArgumentException.class, () ->
+        SavedModelBundle.loader("/").withTags(new String[]{"tag", null})
+    );
+    assertThrows(IllegalArgumentException.class, () ->
+        SavedModelBundle.exporter("/").withTags(null)
+    );
+    assertThrows(IllegalArgumentException.class, () ->
+        SavedModelBundle.exporter("/").withTags(new String[]{"tag", null})
+    );
   }
 
   @Test