From 166ec9273bed0a66428f96ef712468ce6f1f15a0 Mon Sep 17 00:00:00 2001
From: Adam Pocock <adam.pocock@oracle.com>
Date: Tue, 6 Apr 2021 11:00:21 -0400
Subject: [PATCH 1/3] Fixing SavedModelBundleTest.pythonTfFunction.

---
 .../org/tensorflow/SavedModelBundleTest.java  |  15 ++++++++++-----
 .../model/saved_model.pb                      | Bin 19119 -> 19241 bytes
 .../saved_model_using_python/source_model.py  |  12 ++++++++----
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/SavedModelBundleTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/SavedModelBundleTest.java
index ff93e317805..032c835c0cc 100644
--- a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/SavedModelBundleTest.java
+++ b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/SavedModelBundleTest.java
@@ -290,7 +290,7 @@ public void pythonTfFunction() {
        *   Signature name used for saving 'add', argument names 'a' and 'b'
        */
       ConcreteFunction add = bundle.function("add");
-      Map<String, Tensor> args = new HashMap();
+      Map<String, Tensor> args = new HashMap<>();
       try (TFloat32 a = TFloat32.scalarOf(10.0f);
           TFloat32 b = TFloat32.scalarOf(15.5f)) {
         args.put("a", a);
@@ -301,14 +301,19 @@ public void pythonTfFunction() {
           assertEquals(25.5f, c.getFloat());
         }
       }
+      args.clear();
 
       // variable unwrapping happens in Session, which is used by ConcreteFunction.call
       ConcreteFunction getVariable = bundle.function("get_variable");
-      try (TFloat32 v = (TFloat32) getVariable.call(new HashMap<>())
-          .get(getVariable.signature().outputNames().iterator().next())) {
-        assertEquals(2f, v.getFloat());
+      try (TFloat32 dummy = TFloat32.scalarOf(1.0f)) {
+        args.put("dummy",dummy);
+        // TF functions always require an input, so we supply a dummy one here
+        // This test actually checks that resource variables can be loaded correctly.
+        try (TFloat32 v = (TFloat32) getVariable.call(args)
+                    .get(getVariable.signature().outputNames().iterator().next())) {
+          assertEquals(2f, v.getFloat());
+        }
       }
-
     }
   }
 
diff --git a/tensorflow-core/tensorflow-core-api/src/test/resources/saved_model_using_python/model/saved_model.pb b/tensorflow-core/tensorflow-core-api/src/test/resources/saved_model_using_python/model/saved_model.pb
index d9498dd4b74db0225ba8436f188f8076b614fc46..5b030a151cdf34c9947ed3baeed06a1063a356ff 100644
GIT binary patch
literal 19241
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
M$I)(gUQzh}A5=y&g#Z8m

literal 19119
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
SC*ML!f-fq8CZFvwBL59q!Y`))

diff --git a/tensorflow-core/tensorflow-core-api/src/test/resources/saved_model_using_python/source_model.py b/tensorflow-core/tensorflow-core-api/src/test/resources/saved_model_using_python/source_model.py
index c8dfc5a15bf..67177fe999d 100644
--- a/tensorflow-core/tensorflow-core-api/src/test/resources/saved_model_using_python/source_model.py
+++ b/tensorflow-core/tensorflow-core-api/src/test/resources/saved_model_using_python/source_model.py
@@ -22,6 +22,7 @@
 
 import tensorflow as tf
 
+
 class MyModel(tf.keras.Model):
   def __init__(self):
     super(MyModel, self).__init__()
@@ -42,8 +43,7 @@ def get_scalar(self, x):
   def get_vector(self, x):
     return self.const_vector + x
 
-  @tf.function(input_signature=[
-    tf.TensorSpec(shape=None, dtype=tf.float32, name='input')])
+  @tf.function(input_signature=[tf.TensorSpec(shape=None, dtype=tf.float32, name='input')])
   def get_matrix(self, x):
     return self.const_matrix + x
 
@@ -53,10 +53,14 @@ def get_matrix(self, x):
   def add(self, a, b):
     return a + b
 
-  @tf.function(input_signature=[])
-  def get_variable(self):
+  #TF functions always require an input
+  @tf.function(input_signature=[
+    tf.TensorSpec(shape=None, dtype=tf.float32, name='dummy')
+  ])
+  def get_variable(self, dummy):
     return self.variable
 
+
 model = MyModel()
 
 signatures = {

From 6312fd4cfc24a8e0fede7abf3b50a0ffeba3e27d Mon Sep 17 00:00:00 2001
From: Adam Pocock <adam.pocock@oracle.com>
Date: Tue, 6 Apr 2021 11:08:28 -0400
Subject: [PATCH 2/3] Fixed 3 javadoc errors in tensorflow-core-api's hand
 written code.

---
 .../src/main/java/org/tensorflow/TensorMapper.java            | 2 +-
 .../src/main/java/org/tensorflow/op/core/Zeros.java           | 4 ++--
 .../src/main/java/org/tensorflow/types/family/TType.java      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/TensorMapper.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/TensorMapper.java
index 2c67fcac807..9896f55b55b 100644
--- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/TensorMapper.java
+++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/TensorMapper.java
@@ -26,7 +26,7 @@
  * <p>Usage of this class is reserved for internal purposes only.
  *
  * @param <T> tensor type mapped by this object
- * @see {@link TType}
+ * @see TType
  */
 public abstract class TensorMapper<T extends TType> {
 
diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/op/core/Zeros.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/op/core/Zeros.java
index 5fdfc948381..bb6f693a9c6 100644
--- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/op/core/Zeros.java
+++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/op/core/Zeros.java
@@ -30,9 +30,9 @@
  * An operator creating a constant initialized with zeros of the shape given by `dims`.
  * 
  * <p>For example, the following expression
- * <pre>{@code tf.zeros(tf.constant(shape), TFloat32.class)</pre>
+ * <pre>{@code tf.zeros(tf.constant(shape), TFloat32.class)}</pre>
  * is the equivalent of
- * <pre>{@code tf.fill(tf.constant(shape), tf.constant(0.0f))</pre>
+ * <pre>{@code tf.fill(tf.constant(shape), tf.constant(0.0f))}</pre>
  *
  * @param <T> constant type
  */
diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/family/TType.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/family/TType.java
index 2fc423b914e..9349fbb59ea 100644
--- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/family/TType.java
+++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/family/TType.java
@@ -28,7 +28,7 @@
  *
  * <p>Subinterfaces of {@code TType} are propagated as a generic parameter to various entities of
  * TensorFlow to identify the type of the tensor they carry. For example, a
- * {@link org.tensorflow.Operand Operand<TFloat32>} is an operand which outputs a 32-bit floating
+ * {@link org.tensorflow.Operand Operand&lt;TFloat32&gt;} is an operand which outputs a 32-bit floating
  * point tensor. This parameter ensure type-compatibility between operands of a computation at
  * compile-time. For example:
  *

From f3fb5cc4fa3142a1022086c504397c73b4e12bfe Mon Sep 17 00:00:00 2001
From: Adam Pocock <adam.pocock@oracle.com>
Date: Tue, 6 Apr 2021 12:58:50 -0400
Subject: [PATCH 3/3] Changing the surefire parameters for tensorflow-core-api.

---
 tensorflow-core/tensorflow-core-api/pom.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tensorflow-core/tensorflow-core-api/pom.xml b/tensorflow-core/tensorflow-core-api/pom.xml
index 5941659a2af..e2c8e06725a 100644
--- a/tensorflow-core/tensorflow-core-api/pom.xml
+++ b/tensorflow-core/tensorflow-core-api/pom.xml
@@ -388,8 +388,10 @@
           </execution>
         </executions>
         <configuration>
-          <!-- Activate the use of TCP to transmit events to the plugin -->
-          <forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"/>
+            <!-- Activate the use of TCP to transmit events to the plugin -->
+            <!-- disabled as it appears to cause intermittent test failures in GitHub Actions
+            <forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"/>
+            -->
           <additionalClasspathElements>
             <additionalClasspathElement>${project.build.directory}/${project.artifactId}-${project.version}-${native.classifier}.jar</additionalClasspathElement>
             <!-- Note: the following path is not accessible in deploying profile, so other libraries like