rebase fixes

Signed-off-by: Ryan Nett <rnett@calpoly.edu>

Author: rnett

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

@@ -65,7 +65,18 @@ public RawTensor asRawTensor() {
 
   @Override
   public void close() {
+    if(closed) {
+      throw new IllegalStateException("Tensor has already been closed");
+    }
     tensorScope.close();
+    closed = true;
+  }
+
+  /**
+   * @return {@code true} if this tensor has been closed;
+   */
+  public boolean isClosed() {
+    return closed;
   }
 
   /**
@@ -212,6 +223,7 @@ private static long[] shape(TF_Tensor handle) {
   }
 
   private PointerScope tensorScope;
+  private boolean closed = false;
   private TF_Tensor tensorHandle;
   private final TensorTypeInfo<? extends TType> typeInfo;
   private final Shape shape;

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

@@ -150,10 +150,10 @@ public void close() {
    * <p>
    * Closing a {@code Result} object will close all of the tensors contained by it.
    */
-  public final class Result implements AutoCloseable, Iterable<Tensor<?>>{
-    private final List<Tensor<?>> results;
+  public final class Result implements AutoCloseable, Iterable<Tensor>{
+    private final List<Tensor> results;
     private final List<Output<?>> fetches;
-    private final LinkedHashMap<Output<?>, Tensor<?>> outputMap;
+    private final LinkedHashMap<Output<?>, Tensor> outputMap;
 
     /**
      * Metadata about the run.
@@ -166,7 +166,7 @@ public final class Result implements AutoCloseable, Iterable<Tensor<?>>{
 
     private boolean closed = false;
 
-    private Result(List<Tensor<?>> results, List<Output<?>> fetches, RunMetadata metadata) {
+    private Result(List<Tensor> results, List<Output<?>> fetches, RunMetadata metadata) {
 
       if(results.size() != fetches.size()){
         throw new IllegalArgumentException("Expected the same number of fetches and values, got " + fetches.size()
@@ -191,7 +191,7 @@ private void requireOpen(){
     /**
      * Get the result tensors.
      */
-    public List<Tensor<?>> getResults() {
+    public List<Tensor> getResults() {
       requireOpen();
       return Collections.unmodifiableList(results);
     }
@@ -206,7 +206,7 @@ public List<Output<?>> getFetches() {
     /**
      * Get a map of the fetched outputs to their results.
      */
-    public Map<Output<?>, Tensor<?>> getOutputMap(){
+    public Map<Output<?>, Tensor> getOutputMap(){
       return Collections.unmodifiableMap(outputMap);
     }
 
@@ -227,7 +227,7 @@ public boolean isClosed() {
     /**
      * Get the result at {@code index}.
      */
-    public Tensor<?> get(int index){
+    public Tensor get(int index){
       requireOpen();
       return results.get(index);
     }
@@ -236,25 +236,25 @@ public Tensor<?> get(int index){
      * Get the result for {@code output} or throw an {@code IllegalArgumentException} if it wasn't fetched.
      */
     @SuppressWarnings("unchecked")
-    public <T extends TType> Tensor<T> get(Output<T> output){
+    public <T extends TType> T get(Output<T> output){
       requireOpen();
       if(!outputMap.containsKey(output))
         throw new IllegalArgumentException("Did not fetch an output for " + output);
-      return (Tensor<T>) outputMap.get(output);
+      return (T) outputMap.get(output);
     }
 
     /**
      * Get the result for {@code operand} or throw an {@code IllegalArgumentException} if it wasn't fetched.
      */
-    public <T extends TType> Tensor<T> get(Operand<T> operand){
+    public <T extends TType> T get(Operand<T> operand){
       requireOpen();
       return get(operand.asOutput());
     }
 
     /**
      * Get the result for the {@code index}-th output of {@code operation} or throw an {@code IllegalArgumentException} if it wasn't fetched.
      */
-    public Tensor<?> get(String operation, int index){
+    public Tensor get(String operation, int index){
       requireOpen();
       return get(graph.getOutput(operation, index));
     }
@@ -263,7 +263,7 @@ public Tensor<?> get(String operation, int index){
     /**
      * Get the result for the output specified by {@code output} or throw an {@code IllegalArgumentException} if it wasn't fetched.
      */
-    public Tensor<?> get(String output){
+    public Tensor get(String output){
       requireOpen();
       return get(graph.getOutput(output));
     }
@@ -307,7 +307,7 @@ public boolean contains(String output){
     @Override
     public void close() {
       requireOpen();
-      for(Tensor<?> t : this){
+      for(Tensor t : this){
         if(!t.isClosed()) {
           t.close();
         }
@@ -316,19 +316,19 @@ public void close() {
     }
 
     @Override
-    public Iterator<Tensor<?>> iterator() {
+    public Iterator<Tensor> iterator() {
       requireOpen();
       return results.iterator();
     }
 
     @Override
-    public void forEach(Consumer<? super Tensor<?>> action) {
+    public void forEach(Consumer<? super Tensor> action) {
       requireOpen();
       results.forEach(action);
     }
 
     @Override
-    public Spliterator<Tensor<?>> spliterator() {
+    public Spliterator<Tensor> spliterator() {
       requireOpen();
       return results.spliterator();
     }

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

@@ -193,4 +193,9 @@ static <T extends TType> T of(Class<T> type, Shape shape, ByteDataBuffer rawData
    */
   @Override
   void close();
+
+  /**
+   * @return {@code true} if this tensor has been closed.
+   */
+  boolean isClosed();
 }

tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/types/family/TType.java

@@ -77,4 +77,9 @@ default long numBytes() {
   default void close() {
     asRawTensor().close();
   }
+
+  @Override
+  default boolean isClosed(){
+    return asRawTensor().isClosed();
+  }
 }

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

@@ -160,8 +160,8 @@ public void addGradientsToGraph() {
       assertEquals(DataType.DT_FLOAT, grads1[0].dataType());
       assertEquals(DataType.DT_FLOAT, grads1[1].dataType());
 
-      try (Tensor<TFloat32> c1 = TFloat32.scalarOf(3.0f);
-          Tensor<TFloat32> c2 = TFloat32.scalarOf(2.0f);
+      try (TFloat32 c1 = TFloat32.scalarOf(3.0f);
+          TFloat32 c2 = TFloat32.scalarOf(2.0f);
           Session.Result outputs = s.runner()
               .feed(x1, c1)
               .feed(x2, c2)

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

@@ -113,7 +113,7 @@ public void runWithMetadata() {
                 .runAndFetchMetadata();
         // Sanity check on outputs.
         assertEquals(1, result.size());
-        assertEquals(31, ((TInt32)outputs.get(0)).getInt(0, 0));
+        assertEquals(31, ((TInt32)result.get(0)).getInt(0, 0));
         // Sanity check on metadata
         assertNotNull(result.getMetadata());
         assertTrue(result.getMetadata().hasStepStats(), result.getMetadata().toString());

tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/GradientsTest.java

@@ -72,7 +72,7 @@ public void createGradientsWithSum() {
       assertNotNull(grads.dy());
       assertEquals(1, grads.dy().size());
 
-      try (Tensor<TFloat32> c = TFloat32.scalarOf(3.0f);
+      try (TFloat32 c = TFloat32.scalarOf(3.0f);
           Session.Result outputs = sess.runner().feed(x, c).fetch(grads.dy(0)).run()) {
 
         assertEquals(114.0f, ((TFloat32)outputs.get(0)).getFloat(), 0.0f);
@@ -97,7 +97,7 @@ public void createGradientsWithInitialValues() {
       assertNotNull(grads1.dy());
       assertEquals(1, grads1.dy().size());
 
-      try (Tensor<TFloat32> c = TFloat32.scalarOf(3.0f);
+      try (TFloat32 c = TFloat32.scalarOf(3.0f);
           Session.Result outputs =
               sess.runner().feed(x, c).fetch(grads1.dy(0)).run()) {
 

tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/ZerosTest.java

@@ -131,7 +131,7 @@ public void operationsComposingZerosAreCorrectlyNamed() {
         Session sess = new Session(g)) {
       Scope scope = new Scope(g);
       long[] shape = {2, 2};
-      Zeros<TFloat32> zeros = Zeros.create(scope.withSubScope("test"), Constant.vectorOf(scope, shape), TFloat32.DTYPE);
+      Zeros<TFloat32> zeros = Zeros.create(scope.withSubScope("test"), Constant.vectorOf(scope, shape), TFloat32.class);
       Session.Result results = sess.runner().addTarget("test/Zeros/Zero").addTarget("test/Zeros/Fill").run();
     }
   }