Fix the tests.

Craigacp · Craigacp · commit 5f89ee184e9b · 2022-01-30T16:59:19.000-05:00
diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/AutoCloseableList.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/AutoCloseableList.java
diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/ConcreteFunctionTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/ConcreteFunctionTest.java
@@ -205,15 +205,13 @@ public void testGradientsGraph() {
 
       try (TFloat32 c1 = TFloat32.scalarOf(3.0f);
           TFloat32 c2 = TFloat32.scalarOf(2.0f);
-          AutoCloseableList<Tensor> outputs =
-              new AutoCloseableList<>(
-                  s.runner()
+          Session.Result outputs = s.runner()
                       .feed(x1, c1)
                       .feed(x2, c2)
                       .fetch(grads0[0])
                       .fetch(grads1[0])
                       .fetch(grads1[1])
-                      .run())) {
+                      .run()) {
 
         assertEquals(3, outputs.size());
         assertEquals(108.0f, ((TFloat32) outputs.get(0)).getFloat(), 0.0f);
diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/CustomGradientTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/CustomGradientTest.java
@@ -66,8 +66,7 @@ public void testCustomGradient() {
       assertEquals(DataType.DT_FLOAT, grads0[0].dataType());
 
       try (TFloat32 c1 = TFloat32.vectorOf(3.0f, 2.0f, 1.0f, 0.0f);
-          AutoCloseableList<Tensor> outputs =
-              new AutoCloseableList<>(s.runner().feed(x, c1).fetch(grads0[0]).run())) {
+          Session.Result outputs = s.runner().feed(x, c1).fetch(grads0[0]).run()) {
 
         assertEquals(1, outputs.size());
         assertEquals(0.0f, ((TFloat32) outputs.get(0)).getFloat(), 0.0f);
diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/DeviceSpecTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/DeviceSpecTest.java
@@ -53,8 +53,7 @@ public void withDeviceMethod() {
               .abs(aOps)
               .asOutput();
 
-      try (AutoCloseableList<Tensor> t =
-                   new AutoCloseableList<>(session.runner().fetch(absOps).run())) {
+      try (Session.Result t = session.runner().fetch(absOps).run()) {
         assertEquals(1, ((TInt32)t.get(0)).getInt());
       }
     }
@@ -85,8 +84,7 @@ public void withEmptyDeviceSpec() {
               .abs(aOps)
               .asOutput();
 
-      try (AutoCloseableList<Tensor> t =
-                   new AutoCloseableList<>(session.runner().fetch(absOps).run())) {
+      try (Session.Result t = session.runner().fetch(absOps).run()) {
         assertEquals(1, ((TInt32)t.get(0)).getInt());
       }
     }
@@ -131,8 +129,7 @@ public void withTwoScopes() {
               .mul(absOps, bOps)
               .asOutput();
 
-      try (AutoCloseableList<Tensor> t =
-                   new AutoCloseableList<>(session.runner().fetch(mulOps).run())) {
+      try (Session.Result t = session.runner().fetch(mulOps).run()) {
         assertEquals(10, ((TInt32)t.get(0)).getInt());
       }
     }
@@ -179,8 +176,7 @@ public void withIncorrectDeviceSpec() {
               .mul(absOps, bOps)
               .asOutput();
 
-      try (AutoCloseableList<Tensor> t =
-                   new AutoCloseableList<>(session.runner().fetch(mulOps).run())) {
+      try (Session.Result t = session.runner().fetch(mulOps).run()) {
         fail();
       } catch (TFInvalidArgumentException e) {
         // ok
@@ -212,8 +208,7 @@ public void withDeviceSpecInScope() {
               .abs(aOps)
               .asOutput();
 
-      try (AutoCloseableList<Tensor> t =
-                   new AutoCloseableList<>(session.runner().fetch(absOps).run())) {
+      try (Session.Result t = session.runner().fetch(absOps).run()) {
         assertEquals(1, ((TInt32)t.get(0)).getInt());
       }
     }
diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/GraphTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/GraphTest.java
@@ -84,15 +84,13 @@ public void graphDefRoundTripWithInit() {
 
       Operand<TInt32> variable2 = init.withName("var2").variable(init.constant(4));
 
-      try (Session s = new Session(g, true)) {
-        List<Tensor> results = s.runner().fetch("result").fetch("var2").run();
+      try (Session s = new Session(g, true);
+        Session.Result results = s.runner().fetch("result").fetch("var2").run()) {
         TInt32 result = (TInt32) results.get(0);
         assertEquals(6, result.getInt());
 
         TInt32 var2Result = (TInt32) results.get(1);
         assertEquals(4, var2Result.getInt());
-
-        results.forEach(Tensor::close);
       }
     }
   }
@@ -266,15 +264,13 @@ public void addGradientsToGraph() {
 
       try (TFloat32 c1 = TFloat32.scalarOf(3.0f);
           TFloat32 c2 = TFloat32.scalarOf(2.0f);
-          AutoCloseableList<Tensor> outputs =
-              new AutoCloseableList<>(
-                  s.runner()
+          Session.Result outputs = s.runner()
                       .feed(x1, c1)
                       .feed(x2, c2)
                       .fetch(grads0[0])
                       .fetch(grads1[0])
                       .fetch(grads1[1])
-                      .run())) {
+                      .run()) {
         assertEquals(3, outputs.size());
         assertEquals(108.0f, ((TFloat32) outputs.get(0)).getFloat(), 0.0f);
         assertEquals(6.0f, ((TFloat32) outputs.get(1)).getFloat(), 0.0f);
@@ -418,14 +414,12 @@ public void buildWhileLoopMultipleInputs() {
 
       try (TInt32 c1 = TInt32.scalarOf(2);
           TInt32 c2 = TInt32.scalarOf(5);
-          AutoCloseableList<Tensor> outputs =
-              new AutoCloseableList<>(
-                  s.runner()
+          Session.Result outputs = s.runner()
                       .feed(input1, c1)
                       .feed(input2, c2)
                       .fetch(loopOutputs[0])
                       .fetch(loopOutputs[1])
-                      .run())) {
+                      .run()) {
         assertEquals(2, outputs.size());
         assertEquals(16, ((TInt32) outputs.get(0)).getInt()); // ((2^2)^2)
         assertEquals(625, ((TInt32) outputs.get(1)).getInt()); // ((5^2)^2)
diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/BooleanMaskUpdateTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/BooleanMaskUpdateTest.java
@@ -50,7 +50,7 @@ public void testBooleanMaskUpdateSlice() {
       Operand<TInt32> bcastOutput =
           BooleanMaskUpdate.create(scope, input, mask, Constant.scalarOf(scope, -1));
 
-      List<Tensor> results = sess.runner().fetch(output).fetch(bcastOutput).run();
+      Session.Result results = sess.runner().fetch(output).fetch(bcastOutput).run();
       try (TInt32 result = (TInt32) results.get(0);
           TInt32 bcastResult = (TInt32) results.get(1)) {
 
@@ -89,7 +89,7 @@ public void testBooleanMaskUpdateSliceWithBroadcast() {
       Operand<TInt32> bcastOutput =
           BooleanMaskUpdate.create(scope, input, mask, Constant.scalarOf(scope, -1));
 
-      List<Tensor> results = sess.runner().fetch(output).fetch(bcastOutput).run();
+      Session.Result results = sess.runner().fetch(output).fetch(bcastOutput).run();
       try (TInt32 result = (TInt32) results.get(0);
           TInt32 bcastResult = (TInt32) results.get(1)) {
 
@@ -131,7 +131,7 @@ public void testBooleanMaskUpdateAxis() {
           BooleanMaskUpdate.create(
               scope, input, mask, Constant.scalarOf(scope, -1), BooleanMaskUpdate.axis(2));
 
-      List<Tensor> results = sess.runner().fetch(output).fetch(bcastOutput).run();
+      Session.Result results = sess.runner().fetch(output).fetch(bcastOutput).run();
       try (TInt32 result = (TInt32) results.get(0);
           TInt32 bcastResult = (TInt32) results.get(1)) {
 
diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/ConstantTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/ConstantTest.java
@@ -19,12 +19,10 @@
 
 import java.io.IOException;
 import org.junit.jupiter.api.Test;
-import org.tensorflow.AutoCloseableList;
 import org.tensorflow.EagerSession;
 import org.tensorflow.Graph;
 import org.tensorflow.Operand;
 import org.tensorflow.Session;
-import org.tensorflow.Tensor;
 import org.tensorflow.ndarray.DoubleNdArray;
 import org.tensorflow.ndarray.FloatNdArray;
 import org.tensorflow.ndarray.IntNdArray;
@@ -66,8 +64,7 @@ public void createInts() {
       Scope scope = new OpScope(g);
       Constant<TInt32> op1 = Constant.tensorOf(scope, shape, buffer);
       Constant<TInt32> op2 = Constant.tensorOf(scope, array);
-      try (AutoCloseableList<Tensor> t =
-          new AutoCloseableList<>(sess.runner().fetch(op1).fetch(op2).run())) {
+      try (Session.Result t = sess.runner().fetch(op1).fetch(op2).run()) {
         assertEquals(array, t.get(0));
         assertEquals(array, t.get(1));
       }
@@ -85,8 +82,7 @@ public void createFloats() {
       Scope scope = new OpScope(g);
       Constant<TFloat32> op1 = Constant.tensorOf(scope, shape, buffer);
       Constant<TFloat32> op2 = Constant.tensorOf(scope, array);
-      try (AutoCloseableList<Tensor> t =
-          new AutoCloseableList<>(sess.runner().fetch(op1).fetch(op2).run())) {
+      try (Session.Result t = sess.runner().fetch(op1).fetch(op2).run()) {
         assertEquals(array, t.get(0));
         assertEquals(array, t.get(1));
       }
@@ -104,8 +100,7 @@ public void createDoubles() {
       Scope scope = new OpScope(g);
       Constant<TFloat64> op1 = Constant.tensorOf(scope, shape, buffer);
       Constant<TFloat64> op2 = Constant.tensorOf(scope, array);
-      try (AutoCloseableList<Tensor> t =
-          new AutoCloseableList<>(sess.runner().fetch(op1).fetch(op2).run())) {
+      try (Session.Result t = sess.runner().fetch(op1).fetch(op2).run()) {
         assertEquals(array, t.get(0));
         assertEquals(array, t.get(1));
       }
@@ -123,8 +118,7 @@ public void createLongs() {
       Scope scope = new OpScope(g);
       Constant<TInt64> op1 = Constant.tensorOf(scope, shape, buffer);
       Constant<TInt64> op2 = Constant.tensorOf(scope, array);
-      try (AutoCloseableList<Tensor> t =
-          new AutoCloseableList<>(sess.runner().fetch(op1).fetch(op2).run())) {
+      try (Session.Result t = sess.runner().fetch(op1).fetch(op2).run()) {
         assertEquals(array, t.get(0));
         assertEquals(array, t.get(1));
       }
@@ -142,8 +136,7 @@ public void createStrings() throws IOException {
       Scope scope = new OpScope(g);
       Constant<TString> op1 = Constant.tensorOf(scope, shape, buffer);
       Constant<TString> op2 = Constant.tensorOf(scope, array);
-      try (AutoCloseableList<Tensor> t =
-          new AutoCloseableList<>(sess.runner().fetch(op1).fetch(op2).run())) {
+      try (Session.Result t = sess.runner().fetch(op1).fetch(op2).run()) {
         assertEquals(array, t.get(0));
         assertEquals(array, t.get(1));
       }
diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/GradientsTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/GradientsTest.java
@@ -21,11 +21,9 @@
 
 import java.util.Arrays;
 import org.junit.jupiter.api.Test;
-import org.tensorflow.AutoCloseableList;
 import org.tensorflow.Graph;
 import org.tensorflow.Output;
 import org.tensorflow.Session;
-import org.tensorflow.Tensor;
 import org.tensorflow.op.Ops;
 import org.tensorflow.types.TFloat32;
 
@@ -48,9 +46,8 @@ public void createGradients() {
       assertEquals(2, grads.dy().size());
 
       try (TFloat32 c = TFloat32.scalarOf(3.0f);
-          AutoCloseableList<Tensor> outputs =
-              new AutoCloseableList<>(
-                  sess.runner().feed(x, c).fetch(grads.dy(0)).fetch(grads.dy(1)).run())) {
+          Session.Result outputs = sess.runner()
+                  .feed(x, c).fetch(grads.dy(0)).fetch(grads.dy(1)).run()) {
 
         assertEquals(108.0f, ((TFloat32)outputs.get(0)).getFloat(), 0.0f);
         assertEquals(18.0f, ((TFloat32)outputs.get(1)).getFloat(), 0.0f);
@@ -75,8 +72,7 @@ public void createGradientsWithSum() {
       assertEquals(1, grads.dy().size());
 
       try (TFloat32 c = TFloat32.scalarOf(3.0f);
-          AutoCloseableList<Tensor> outputs =
-              new AutoCloseableList<>(sess.runner().feed(x, c).fetch(grads.dy(0)).run())) {
+          Session.Result outputs = sess.runner().feed(x, c).fetch(grads.dy(0)).run()) {
 
         assertEquals(114.0f, ((TFloat32)outputs.get(0)).getFloat(), 0.0f);
       }
@@ -101,9 +97,8 @@ public void createGradientsWithInitialValues() {
       assertEquals(1, grads1.dy().size());
 
       try (TFloat32 c = TFloat32.scalarOf(3.0f);
-          AutoCloseableList<Tensor> outputs =
-              new AutoCloseableList<>(
-                  sess.runner().feed(x, c).fetch(grads1.dy(0)).run())) {
+          Session.Result outputs =
+                  sess.runner().feed(x, c).fetch(grads1.dy(0)).run()) {
 
         assertEquals(108.0f, ((TFloat32)outputs.get(0)).getFloat(), 0.0f);
       }
diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/ZerosTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/ZerosTest.java
@@ -134,7 +134,7 @@ public void operationsComposingZerosAreCorrectlyNamed() {
       long[] shape = {2, 2};
       Zeros<TFloat32> zeros =
           Zeros.create(scope.withSubScope("test"), Constant.vectorOf(scope, shape), TFloat32.class);
-      List<?> results =
+      Session.Result results =
           sess.runner().addTarget("test/Zeros/Zero").addTarget("test/Zeros/Fill").run();
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,7 @@ public void withDeviceMethod() {`
`53`	`53`	`.abs(aOps)`
`54`	`54`	`.asOutput();`
`55`	`55`
`56`		`- try (AutoCloseableList<Tensor> t =`
`57`		`- new AutoCloseableList<>(session.runner().fetch(absOps).run())) {`
	`56`	`+ try (Session.Result t = session.runner().fetch(absOps).run()) {`
`58`	`57`	`assertEquals(1, ((TInt32)t.get(0)).getInt());`
`59`	`58`	`}`
`60`	`59`	`}`
`@@ -85,8 +84,7 @@ public void withEmptyDeviceSpec() {`
`85`	`84`	`.abs(aOps)`
`86`	`85`	`.asOutput();`
`87`	`86`
`88`		`- try (AutoCloseableList<Tensor> t =`
`89`		`- new AutoCloseableList<>(session.runner().fetch(absOps).run())) {`
	`87`	`+ try (Session.Result t = session.runner().fetch(absOps).run()) {`
`90`	`88`	`assertEquals(1, ((TInt32)t.get(0)).getInt());`
`91`	`89`	`}`
`92`	`90`	`}`
`@@ -131,8 +129,7 @@ public void withTwoScopes() {`
`131`	`129`	`.mul(absOps, bOps)`
`132`	`130`	`.asOutput();`
`133`	`131`
`134`		`- try (AutoCloseableList<Tensor> t =`
`135`		`- new AutoCloseableList<>(session.runner().fetch(mulOps).run())) {`
	`132`	`+ try (Session.Result t = session.runner().fetch(mulOps).run()) {`
`136`	`133`	`assertEquals(10, ((TInt32)t.get(0)).getInt());`
`137`	`134`	`}`
`138`	`135`	`}`
`@@ -179,8 +176,7 @@ public void withIncorrectDeviceSpec() {`
`179`	`176`	`.mul(absOps, bOps)`
`180`	`177`	`.asOutput();`
`181`	`178`
`182`		`- try (AutoCloseableList<Tensor> t =`
`183`		`- new AutoCloseableList<>(session.runner().fetch(mulOps).run())) {`
	`179`	`+ try (Session.Result t = session.runner().fetch(mulOps).run()) {`
`184`	`180`	`fail();`
`185`	`181`	`} catch (TFInvalidArgumentException e) {`
`186`	`182`	`// ok`
`@@ -212,8 +208,7 @@ public void withDeviceSpecInScope() {`
`212`	`208`	`.abs(aOps)`
`213`	`209`	`.asOutput();`
`214`	`210`
`215`		`- try (AutoCloseableList<Tensor> t =`
`216`		`- new AutoCloseableList<>(session.runner().fetch(absOps).run())) {`
	`211`	`+ try (Session.Result t = session.runner().fetch(absOps).run()) {`
`217`	`212`	`assertEquals(1, ((TInt32)t.get(0)).getInt());`
`218`	`213`	`}`
`219`	`214`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ public void operationsComposingZerosAreCorrectlyNamed() {`
`134`	`134`	`long[] shape = {2, 2};`
`135`	`135`	`Zeros<TFloat32> zeros =`
`136`	`136`	`Zeros.create(scope.withSubScope("test"), Constant.vectorOf(scope, shape), TFloat32.class);`
`137`		`- List<?> results =`
	`137`	`+ Session.Result results =`
`138`	`138`	`sess.runner().addTarget("test/Zeros/Zero").addTarget("test/Zeros/Fill").run();`
`139`	`139`	`}`
`140`	`140`	`}`