Rebase on master

Author: karllessard

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

@@ -53,9 +53,9 @@ public void withDeviceMethod() {
               .abs(aOps)
               .asOutput();
 
-      try (AutoCloseableList<Tensor<?>> t =
+      try (AutoCloseableList<Tensor> t =
                    new AutoCloseableList<>(session.runner().fetch(absOps).run())) {
-        assertEquals(1, t.get(0).rawData().asInts().getObject(0));
+        assertEquals(1, ((TInt32)t.get(0)).getInt());
       }
     }
   }
@@ -85,9 +85,9 @@ public void withEmptyDeviceSpec() {
               .abs(aOps)
               .asOutput();
 
-      try (AutoCloseableList<Tensor<?>> t =
+      try (AutoCloseableList<Tensor> t =
                    new AutoCloseableList<>(session.runner().fetch(absOps).run())) {
-        assertEquals(1, t.get(0).rawData().asInts().getObject(0));
+        assertEquals(1, ((TInt32)t.get(0)).getInt());
       }
     }
   }
@@ -131,9 +131,9 @@ public void withTwoScopes() {
               .mul(absOps, bOps)
               .asOutput();
 
-      try (AutoCloseableList<Tensor<?>> t =
+      try (AutoCloseableList<Tensor> t =
                    new AutoCloseableList<>(session.runner().fetch(mulOps).run())) {
-        assertEquals(10, t.get(0).rawData().asInts().getObject(0));
+        assertEquals(10, ((TInt32)t.get(0)).getInt());
       }
     }
   }
@@ -179,7 +179,7 @@ public void withIncorrectDeviceSpec() {
               .mul(absOps, bOps)
               .asOutput();
 
-      try (AutoCloseableList<Tensor<?>> t =
+      try (AutoCloseableList<Tensor> t =
                    new AutoCloseableList<>(session.runner().fetch(mulOps).run())) {
         fail();
       } catch (TFInvalidArgumentException e) {
@@ -212,9 +212,9 @@ public void withDeviceSpecInScope() {
               .abs(aOps)
               .asOutput();
 
-      try (AutoCloseableList<Tensor<?>> t =
+      try (AutoCloseableList<Tensor> t =
                    new AutoCloseableList<>(session.runner().fetch(absOps).run())) {
-        assertEquals(1, t.get(0).rawData().asInts().getObject(0));
+        assertEquals(1, ((TInt32)t.get(0)).getInt());
       }
     }
   }