Move Shape to upper level

Author: karllessard

tensorflow-core/tensorflow-core-api/src/bazel/op_generator/op_specs.cc

@@ -148,7 +148,7 @@ std::pair<Type, Type> TypeResolver::TypesOf(const OpDef_AttrDef& attr_def,
     types = MakeTypePair(Type::Class("Boolean"), Type::Boolean());
 
   } else if (attr_type == "shape") {
-    types = MakeTypePair(Type::Class("Shape", "org.tensorflow.util.ndarray"));
+    types = MakeTypePair(Type::Class("Shape", "org.tensorflow.util"));
 
   } else if (attr_type == "tensor") {
     types = MakeTypePair(Type::Class("Tensor", "org.tensorflow")

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

@@ -19,7 +19,7 @@
 import org.tensorflow.types.TBool;
 import org.tensorflow.types.TInt64;
 import org.tensorflow.types.TString;
-import org.tensorflow.util.ndarray.Shape;
+import org.tensorflow.util.Shape;
 
 /**
  * An API for building {@code data} operations as {@link Op Op}s
@@ -34,17 +34,30 @@ public final class DataOps {
   }
 
   /**
-   * Builds an {@link OptionalGetValue} operation
+   * Builds an {@link IteratorGetNext} operation
    *
-   * @param optional 
+   * @param iterator 
    * @param outputTypes 
    * @param outputShapes 
-   * @return a new instance of OptionalGetValue
-   * @see org.tensorflow.op.data.OptionalGetValue
+   * @return a new instance of IteratorGetNext
+   * @see org.tensorflow.op.data.IteratorGetNext
    */
-  public OptionalGetValue optionalGetValue(Operand<?> optional, List<DataType<?>> outputTypes,
+  public IteratorGetNext iteratorGetNext(Operand<?> iterator, List<DataType<?>> outputTypes,
       List<Shape> outputShapes) {
-    return OptionalGetValue.create(scope, optional, outputTypes, outputShapes);
+    return IteratorGetNext.create(scope, iterator, outputTypes, outputShapes);
+  }
+
+  /**
+   * Builds an {@link AnonymousIterator} operation
+   *
+   * @param outputTypes 
+   * @param outputShapes 
+   * @return a new instance of AnonymousIterator
+   * @see org.tensorflow.op.data.AnonymousIterator
+   */
+  public AnonymousIterator anonymousIterator(List<DataType<?>> outputTypes,
+      List<Shape> outputShapes) {
+    return AnonymousIterator.create(scope, outputTypes, outputShapes);
   }
 
   /**
@@ -78,6 +91,16 @@ public DeserializeIterator deserializeIterator(Operand<?> resourceHandle, Operan
     return DeserializeIterator.create(scope, resourceHandle, serialized);
   }
 
+  /**
+   * Builds an {@link OptionalNone} operation
+   *
+   * @return a new instance of OptionalNone
+   * @see org.tensorflow.op.data.OptionalNone
+   */
+  public OptionalNone optionalNone() {
+    return OptionalNone.create(scope);
+  }
+
   /**
    * Builds an {@link IteratorGetNextAsOptional} operation
    *
@@ -92,16 +115,6 @@ public IteratorGetNextAsOptional iteratorGetNextAsOptional(Operand<?> iterator,
     return IteratorGetNextAsOptional.create(scope, iterator, outputTypes, outputShapes);
   }
 
-  /**
-   * Builds an {@link OptionalNone} operation
-   *
-   * @return a new instance of OptionalNone
-   * @see org.tensorflow.op.data.OptionalNone
-   */
-  public OptionalNone optionalNone() {
-    return OptionalNone.create(scope);
-  }
-
   /**
    * Builds an {@link OptionalFromValue} operation
    *
@@ -113,6 +126,20 @@ public OptionalFromValue optionalFromValue(Iterable<Operand<?>> components) {
     return OptionalFromValue.create(scope, components);
   }
 
+  /**
+   * Builds an {@link IteratorGetNextSync} operation
+   *
+   * @param iterator 
+   * @param outputTypes 
+   * @param outputShapes 
+   * @return a new instance of IteratorGetNextSync
+   * @see org.tensorflow.op.data.IteratorGetNextSync
+   */
+  public IteratorGetNextSync iteratorGetNextSync(Operand<?> iterator, List<DataType<?>> outputTypes,
+      List<Shape> outputShapes) {
+    return IteratorGetNextSync.create(scope, iterator, outputTypes, outputShapes);
+  }
+
   /**
    * Builds an {@link IteratorToStringHandle} operation
    *
@@ -124,19 +151,6 @@ public IteratorToStringHandle iteratorToStringHandle(Operand<?> resourceHandle)
     return IteratorToStringHandle.create(scope, resourceHandle);
   }
 
-  /**
-   * Builds an {@link AnonymousIterator} operation
-   *
-   * @param outputTypes 
-   * @param outputShapes 
-   * @return a new instance of AnonymousIterator
-   * @see org.tensorflow.op.data.AnonymousIterator
-   */
-  public AnonymousIterator anonymousIterator(List<DataType<?>> outputTypes,
-      List<Shape> outputShapes) {
-    return AnonymousIterator.create(scope, outputTypes, outputShapes);
-  }
-
   /**
    * Builds an {@link OptionalHasValue} operation
    *
@@ -148,20 +162,6 @@ public OptionalHasValue optionalHasValue(Operand<?> optional) {
     return OptionalHasValue.create(scope, optional);
   }
 
-  /**
-   * Builds an {@link IteratorGetNextSync} operation
-   *
-   * @param iterator 
-   * @param outputTypes 
-   * @param outputShapes 
-   * @return a new instance of IteratorGetNextSync
-   * @see org.tensorflow.op.data.IteratorGetNextSync
-   */
-  public IteratorGetNextSync iteratorGetNextSync(Operand<?> iterator, List<DataType<?>> outputTypes,
-      List<Shape> outputShapes) {
-    return IteratorGetNextSync.create(scope, iterator, outputTypes, outputShapes);
-  }
-
   /**
    * Builds an {@link SerializeIterator} operation
    *
@@ -186,16 +186,16 @@ public MakeIterator makeIterator(Operand<?> dataset, Operand<?> iterator) {
   }
 
   /**
-   * Builds an {@link IteratorGetNext} operation
+   * Builds an {@link OptionalGetValue} operation
    *
-   * @param iterator 
+   * @param optional 
    * @param outputTypes 
    * @param outputShapes 
-   * @return a new instance of IteratorGetNext
-   * @see org.tensorflow.op.data.IteratorGetNext
+   * @return a new instance of OptionalGetValue
+   * @see org.tensorflow.op.data.OptionalGetValue
    */
-  public IteratorGetNext iteratorGetNext(Operand<?> iterator, List<DataType<?>> outputTypes,
+  public OptionalGetValue optionalGetValue(Operand<?> optional, List<DataType<?>> outputTypes,
       List<Shape> outputShapes) {
-    return IteratorGetNext.create(scope, iterator, outputTypes, outputShapes);
+    return OptionalGetValue.create(scope, optional, outputTypes, outputShapes);
   }
 }

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

@@ -51,7 +51,7 @@
 import org.tensorflow.types.TInt32;
 import org.tensorflow.types.TInt64;
 import org.tensorflow.types.TString;
-import org.tensorflow.util.ndarray.Shape;
+import org.tensorflow.util.Shape;
 
 /**
  * An API for building {@code io} operations as {@link Op Op}s
@@ -65,6 +65,20 @@ public final class IoOps {
     this.scope = scope;
   }
 
+  /**
+   * Builds an {@link PriorityQueue} operation
+   *
+   * @param componentTypes The type of each component in a value.
+   * @param shapes The shape of each component in a value. The length of this attr must
+   * @param options carries optional attributes values
+   * @return a new instance of PriorityQueue
+   * @see org.tensorflow.op.io.PriorityQueue
+   */
+  public PriorityQueue priorityQueue(List<DataType<?>> componentTypes, List<Shape> shapes,
+      PriorityQueue.Options... options) {
+    return PriorityQueue.create(scope, componentTypes, shapes, options);
+  }
+
   /**
    * Builds an {@link QueueEnqueueMany} operation
    *
@@ -155,25 +169,6 @@ public <T> DecodeRaw<T> decodeRaw(Operand<TString> bytes, DataType<T> outType,
     return DecodeRaw.create(scope, bytes, outType, options);
   }
 
-  /**
-   * Builds an {@link ParseExample} operation
-   *
-   * @param serialized A vector containing a batch of binary serialized Example protos.
-   * @param names A vector containing the names of the serialized protos.
-   * @param sparseKeys A list of Nsparse string Tensors (scalars).
-   * @param denseKeys A list of Ndense string Tensors (scalars).
-   * @param denseDefaults A list of Ndense Tensors (some may be empty).
-   * @param sparseTypes A list of Nsparse types; the data types of data in each Feature
-   * @param denseShapes A list of Ndense shapes; the shapes of data in each Feature
-   * @return a new instance of ParseExample
-   * @see org.tensorflow.op.io.ParseExample
-   */
-  public ParseExample parseExample(Operand<TString> serialized, Operand<TString> names,
-      Iterable<Operand<TString>> sparseKeys, Iterable<Operand<TString>> denseKeys,
-      Iterable<Operand<?>> denseDefaults, List<DataType<?>> sparseTypes, List<Shape> denseShapes) {
-    return ParseExample.create(scope, serialized, names, sparseKeys, denseKeys, denseDefaults, sparseTypes, denseShapes);
-  }
-
   /**
    * Builds an {@link DecodeBase64} operation
    *
@@ -207,6 +202,25 @@ public WholeFileReader wholeFileReader(WholeFileReader.Options... options) {
     return WholeFileReader.create(scope, options);
   }
 
+  /**
+   * Builds an {@link ParseSingleExample} operation
+   *
+   * @param serialized A vector containing a batch of binary serialized Example protos.
+   * @param denseDefaults A list of Tensors (some may be empty), whose length matches
+   * @param numSparse The number of sparse features to be parsed from the example. This
+   * @param sparseKeys A list of `num_sparse` strings.
+   * @param denseKeys The keys expected in the Examples' features associated with dense
+   * @param sparseTypes A list of `num_sparse` types; the data types of data in each
+   * @param denseShapes The shapes of data in each Feature given in dense_keys.
+   * @return a new instance of ParseSingleExample
+   * @see org.tensorflow.op.io.ParseSingleExample
+   */
+  public ParseSingleExample parseSingleExample(Operand<TString> serialized,
+      Iterable<Operand<?>> denseDefaults, Long numSparse, List<String> sparseKeys,
+      List<String> denseKeys, List<DataType<?>> sparseTypes, List<Shape> denseShapes) {
+    return ParseSingleExample.create(scope, serialized, denseDefaults, numSparse, sparseKeys, denseKeys, sparseTypes, denseShapes);
+  }
+
   /**
    * Builds an {@link SerializeManySparse} operation
    *
@@ -409,25 +423,6 @@ public EncodeBase64 encodeBase64(Operand<TString> input, EncodeBase64.Options...
     return EncodeBase64.create(scope, input, options);
   }
 
-  /**
-   * Builds an {@link ParseSingleExample} operation
-   *
-   * @param serialized A vector containing a batch of binary serialized Example protos.
-   * @param denseDefaults A list of Tensors (some may be empty), whose length matches
-   * @param numSparse The number of sparse features to be parsed from the example. This
-   * @param sparseKeys A list of `num_sparse` strings.
-   * @param denseKeys The keys expected in the Examples' features associated with dense
-   * @param sparseTypes A list of `num_sparse` types; the data types of data in each
-   * @param denseShapes The shapes of data in each Feature given in dense_keys.
-   * @return a new instance of ParseSingleExample
-   * @see org.tensorflow.op.io.ParseSingleExample
-   */
-  public ParseSingleExample parseSingleExample(Operand<TString> serialized,
-      Iterable<Operand<?>> denseDefaults, Long numSparse, List<String> sparseKeys,
-      List<String> denseKeys, List<DataType<?>> sparseTypes, List<Shape> denseShapes) {
-    return ParseSingleExample.create(scope, serialized, denseDefaults, numSparse, sparseKeys, denseKeys, sparseTypes, denseShapes);
-  }
-
   /**
    * Builds an {@link SerializeSparse} operation
    *
@@ -494,6 +489,25 @@ public ReaderNumWorkUnitsCompleted readerNumWorkUnitsCompleted(Operand<?> reader
     return ReaderNumWorkUnitsCompleted.create(scope, readerHandle);
   }
 
+  /**
+   * Builds an {@link ParseExample} operation
+   *
+   * @param serialized A vector containing a batch of binary serialized Example protos.
+   * @param names A vector containing the names of the serialized protos.
+   * @param sparseKeys A list of Nsparse string Tensors (scalars).
+   * @param denseKeys A list of Ndense string Tensors (scalars).
+   * @param denseDefaults A list of Ndense Tensors (some may be empty).
+   * @param sparseTypes A list of Nsparse types; the data types of data in each Feature
+   * @param denseShapes A list of Ndense shapes; the shapes of data in each Feature
+   * @return a new instance of ParseExample
+   * @see org.tensorflow.op.io.ParseExample
+   */
+  public ParseExample parseExample(Operand<TString> serialized, Operand<TString> names,
+      Iterable<Operand<TString>> sparseKeys, Iterable<Operand<TString>> denseKeys,
+      Iterable<Operand<?>> denseDefaults, List<DataType<?>> sparseTypes, List<Shape> denseShapes) {
+    return ParseExample.create(scope, serialized, names, sparseKeys, denseKeys, denseDefaults, sparseTypes, denseShapes);
+  }
+
   /**
    * Builds an {@link ReaderRead} operation
    *
@@ -545,20 +559,6 @@ public <T> SerializeTensor serializeTensor(Operand<T> tensor) {
     return SerializeTensor.create(scope, tensor);
   }
 
-  /**
-   * Builds an {@link PriorityQueue} operation
-   *
-   * @param componentTypes The type of each component in a value.
-   * @param shapes The shape of each component in a value. The length of this attr must
-   * @param options carries optional attributes values
-   * @return a new instance of PriorityQueue
-   * @see org.tensorflow.op.io.PriorityQueue
-   */
-  public PriorityQueue priorityQueue(List<DataType<?>> componentTypes, List<Shape> shapes,
-      PriorityQueue.Options... options) {
-    return PriorityQueue.create(scope, componentTypes, shapes, options);
-  }
-
   /**
    * Builds an {@link QueueIsClosed} operation
    *

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

@@ -107,7 +107,7 @@
 import org.tensorflow.types.TInt32;
 import org.tensorflow.types.TInt64;
 import org.tensorflow.types.family.TNumber;
-import org.tensorflow.util.ndarray.Shape;
+import org.tensorflow.util.Shape;
 
 /**
  * An API for building {@code math} operations as {@link Op Op}s
@@ -558,18 +558,6 @@ public <T> RealDiv<T> realDiv(Operand<T> x, Operand<T> y) {
     return RealDiv.create(scope, x, y);
   }
 
-  /**
-   * Builds an {@link AccumulateN} operation
-   *
-   * @param inputs A list of `Tensor` objects, each with same shape and type.
-   * @param shape Shape of elements of `inputs`.
-   * @return a new instance of AccumulateN
-   * @see org.tensorflow.op.math.AccumulateN
-   */
-  public <T> AccumulateN<T> accumulateN(Iterable<Operand<T>> inputs, Shape shape) {
-    return AccumulateN.create(scope, inputs, shape);
-  }
-
   /**
    * Builds an {@link Digamma} operation
    *
@@ -1307,6 +1295,18 @@ public <U extends TNumber, T> Real<U> real(Operand<T> input, DataType<U> Tout) {
     return Real.create(scope, input, Tout);
   }
 
+  /**
+   * Builds an {@link AccumulateN} operation
+   *
+   * @param inputs A list of `Tensor` objects, each with same shape and type.
+   * @param shape Shape of elements of `inputs`.
+   * @return a new instance of AccumulateN
+   * @see org.tensorflow.op.math.AccumulateN
+   */
+  public <T> AccumulateN<T> accumulateN(Iterable<Operand<T>> inputs, Shape shape) {
+    return AccumulateN.create(scope, inputs, shape);
+  }
+
   /**
    * Builds an {@link QuantizedAdd} operation
    *