Formatting, comments, and output bounds checking (and the codegen I apparently forgot)

Signed-off-by: Ryan Nett <[email protected]>

Author: rnett

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

@@ -1072,64 +1072,99 @@ public Bucketize bucketize(Operand<? extends TNumber> input, List<Float> boundar
   }
 
   /**
-   * empty
+   * Call {@code function}, adding it to the execution environment if it isn't already present. The inputs and outputs
+   *  are keyed by the names set in the {@code ConcreteFunction}'s {@code Signature}.
+   *
+   * @param function the function to call
+   * @param inputs the inputs to the function
+   * @return the outputs of the function
    */
   public Map<String, Operand<?>> callConcreteFunction(ConcreteFunction function,
-      List<Operand<?>> inputs) {
+      Operand<?>... inputs) {
     return Function.callConcreteFunction(scope, function, inputs);
   }
 
   /**
-   * empty
+   * Call {@code function}, adding it to the execution environment if it isn't already present. The inputs and outputs
+   *  are keyed by the names set in the {@code ConcreteFunction}'s {@code Signature}.
+   *
+   * @param function the function to call
+   * @param inputs the inputs to the function
+   * @return the outputs of the function
    */
   public Map<String, Operand<?>> callConcreteFunction(ConcreteFunction function,
-      Map<String, Operand<?>> inputs) {
+      List<Operand<?>> inputs) {
     return Function.callConcreteFunction(scope, function, inputs);
   }
 
   /**
-   * empty
+   * Call {@code function}, adding it to the execution environment if it isn't already present. The inputs and outputs
+   *  are keyed by the names set in the {@code ConcreteFunction}'s {@code Signature}.
+   *
+   * @param function the function to call
+   * @param inputs the inputs to the function
+   * @return the outputs of the function
    */
   public Map<String, Operand<?>> callConcreteFunction(ConcreteFunction function,
-      Operand<?>... inputs) {
+      Map<String, Operand<?>> inputs) {
     return Function.callConcreteFunction(scope, function, inputs);
   }
 
   /**
-   * empty
+   * Call {@code function}, adding it to the execution environment if it isn't already present.
+   *
+   * @param function the function to call
+   * @param inputs the inputs to the function
+   * @return the outputs of the function
    */
   public List<Operand<?>> callFunction(GraphFunction function, List<Operand<?>> inputs) {
     return Function.callFunction(scope, function, inputs);
   }
 
   /**
-   * empty
+   * Call {@code function}, adding it to the execution environment if it isn't already present.
+   *
+   * @param function the function to call
+   * @param inputs the inputs to the function
+   * @return the outputs of the function
    */
   public List<Operand<?>> callFunction(GraphFunction function, Operand<?>... inputs) {
     return Function.callFunction(scope, function, inputs);
   }
 
   /**
-   * empty
+   * Call {@code function}, adding it to the execution environment if it isn't already present.
+   *
+   * @param function the function to call
+   * @param inputs the inputs to the function
+   * @return the outputs of the function
    */
   public Map<String, Operand<?>> callNamedFunction(NamedGraphFunction function,
-      List<Operand<?>> inputs) {
+      Map<String, Operand<?>> inputs) {
     return Function.callNamedFunction(scope, function, inputs);
   }
 
   /**
-   * empty
+   * Call {@code function}, adding it to the execution environment if it isn't already present.
+   *
+   * @param function the function to call
+   * @param inputs the inputs to the function
+   * @return the outputs of the function
    */
   public Map<String, Operand<?>> callNamedFunction(NamedGraphFunction function,
-      Map<String, Operand<?>> inputs) {
+      Operand<?>... inputs) {
     return Function.callNamedFunction(scope, function, inputs);
   }
 
   /**
-   * empty
+   * Call {@code function}, adding it to the execution environment if it isn't already present.
+   *
+   * @param function the function to call
+   * @param inputs the inputs to the function
+   * @return the outputs of the function
    */
   public Map<String, Operand<?>> callNamedFunction(NamedGraphFunction function,
-      Operand<?>... inputs) {
+      List<Operand<?>> inputs) {
     return Function.callNamedFunction(scope, function, inputs);
   }
 

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

@@ -63,8 +63,8 @@ public class GraphFunction implements AutoCloseable {
   }
 
   /**
-   * This causes native errors when I use it (Linux GPU, 6.1 CC), but I'm leaving it because how to enable XLA JIT is
-   * extremely non-obvious.
+   * FIXME: This causes native errors when I use it (Linux GPU, 6.1 CC), but I'm leaving it because how to enable XLA
+   * JIT is extremely non-obvious.
    *
    * Causes {@code OP_REQUIRES failed at xla_ops.cc:363 : Not found: could not find registered platform with id:
    * 0x7f75af03e6e8} (it's a warning, but the resulting TF_Status fails).

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

@@ -33,31 +33,36 @@
  */
 public final class Output<T extends TType> implements Operand<T> {
 
-  /** Returns the index into the outputs of the Operation. */
+  /**
+   * Returns the index into the outputs of the Operation.
+   */
   public int index() {
     return index;
   }
 
-  /** Returns the DataType of the tensor referred to by this Output. */
+  /**
+   * Returns the DataType of the tensor referred to by this Output.
+   */
   @SuppressWarnings("unchecked")
   public DataType dataType() {
     return operation.dtype(index);
   }
 
-  /** Returns the type of the tensor referred to by this Output. */
+  /**
+   * Returns the type of the tensor referred to by this Output.
+   */
   @SuppressWarnings("unchecked")
   @Override
   public Class<T> type() {
-    return (Class<T>)TensorTypeRegistry.find(dataType()).type();
+    return (Class<T>) TensorTypeRegistry.find(dataType()).type();
   }
 
   /**
-   * Returns this Output object with the type {@code Output<U>}. This method is useful when given a
-   * value of type {@code Output<?>}.
+   * Returns this Output object with the type {@code Output<U>}. This method is useful when given a value of type {@code
+   * Output<?>}.
    *
    * @param type any supported tensor type
-   * @throws IllegalArgumentException if the actual data type of this object does not match the type
-   *     {@code U}.
+   * @throws IllegalArgumentException if the actual data type of this object does not match the type {@code U}.
    */
   @SuppressWarnings("unchecked")
   public <U extends TType> Output<U> expect(Class<U> type) {
@@ -72,8 +77,7 @@ public <U extends TType> Output<U> expect(Class<U> type) {
    * Returns the tensor at this output.
    *
    * <p>This operation is only supported on the outputs of an operation executed eagerly. For graph
-   * environments, output tensors must be fetched by running a session, using {@link
-   * Session.Runner#fetch(Output)}.
+   * environments, output tensors must be fetched by running a session, using {@link Session.Runner#fetch(Output)}.
    *
    * <p>It is recommended to close explicitly the returned tensor as soon as possible, since the
    * garbage collector is not aware of the amount of memory it consumes, which can be significant.
@@ -85,7 +89,7 @@ public <U extends TType> Output<U> expect(Class<U> type) {
    */
   @SuppressWarnings("unchecked")
   public T asTensor() {
-    return (T)operation.tensor(index);
+    return (T) operation.tensor(index);
   }
 
   /**
@@ -130,8 +134,20 @@ public String toString() {
         operation.type(), operation.name(), index, shape().toString(), dataType());
   }
 
-  /** Handle to the idx-th output of the Operation {@code op}. */
+  /**
+   * Handle to the idx-th output of the Operation {@code op}.
+   */
   Output(AbstractOperation op, int idx) {
+    int numOutputs = op.numOutputs();
+    if (idx >= numOutputs) {
+      throw new IndexOutOfBoundsException(
+          "Can't get output with index " + idx + ", this op only has " + numOutputs + " outputs.");
+    }
+
+    if (idx < 0) {
+      throw new IndexOutOfBoundsException("Can't get output with index < 0.");
+    }
+
     operation = op;
     index = idx;
   }