Make Ops classes accessible from sub-Ops classes (#150)

* Adjust sub-Ops classes to take Ops in their constructor instead of Scope, and get the scope from that.  Save Ops parameter to field and add accessor for it.

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

* remove unlinked LinalgSparseOps

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

Author: rnett

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

@@ -34,8 +34,11 @@
 public final class AudioOps {
   private final Scope scope;
 
-  AudioOps(Scope scope) {
-    this.scope = scope;
+  private final Ops ops;
+
+  AudioOps(Ops ops) {
+    this.scope = ops.scope();
+    this.ops = ops;
   }
 
   /**
@@ -144,4 +147,11 @@ public Mfcc mfcc(Operand<TFloat32> spectrogram, Operand<TInt32> sampleRate,
       Mfcc.Options... options) {
     return Mfcc.create(scope, spectrogram, sampleRate, options);
   }
+
+  /**
+   * Get the parent {@link Ops} object.
+   */
+  public final Ops ops() {
+    return ops;
+  }
 }

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

@@ -34,8 +34,11 @@
 public final class BitwiseOps {
   private final Scope scope;
 
-  BitwiseOps(Scope scope) {
-    this.scope = scope;
+  private final Ops ops;
+
+  BitwiseOps(Ops ops) {
+    this.scope = ops.scope();
+    this.ops = ops;
   }
 
   /**
@@ -268,4 +271,11 @@ public <T extends TNumber> LeftShift<T> leftShift(Operand<T> x, Operand<T> y) {
   public <T extends TNumber> RightShift<T> rightShift(Operand<T> x, Operand<T> y) {
     return RightShift.create(scope, x, y);
   }
+
+  /**
+   * Get the parent {@link Ops} object.
+   */
+  public final Ops ops() {
+    return ops;
+  }
 }

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

@@ -33,8 +33,11 @@
 public final class DataExperimentalOps {
   private final Scope scope;
 
-  DataExperimentalOps(Scope scope) {
-    this.scope = scope;
+  private final Ops ops;
+
+  DataExperimentalOps(Ops ops) {
+    this.scope = ops.scope();
+    this.ops = ops;
   }
 
   /**
@@ -58,4 +61,11 @@ public DataServiceDataset dataServiceDataset(Operand<TInt64> datasetId,
       DataServiceDataset.Options... options) {
     return DataServiceDataset.create(scope, datasetId, processingMode, address, protocol, jobName, maxOutstandingRequests, iterationCounter, outputTypes, outputShapes, options);
   }
+
+  /**
+   * Get the parent {@link Ops} object.
+   */
+  public final Ops ops() {
+    return ops;
+  }
 }

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

@@ -60,9 +60,12 @@ public final class DataOps {
 
   private final Scope scope;
 
-  DataOps(Scope scope) {
-    this.scope = scope;
-    experimental = new DataExperimentalOps(scope);
+  private final Ops ops;
+
+  DataOps(Ops ops) {
+    this.scope = ops.scope();
+    this.ops = ops;
+    experimental = new DataExperimentalOps(ops);
   }
 
   /**
@@ -410,4 +413,11 @@ public ZipDataset zipDataset(Iterable<Operand<?>> inputDatasets, List<DataType<?
       List<Shape> outputShapes) {
     return ZipDataset.create(scope, inputDatasets, outputTypes, outputShapes);
   }
+
+  /**
+   * Get the parent {@link Ops} object.
+   */
+  public final Ops ops() {
+    return ops;
+  }
 }

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

@@ -33,8 +33,11 @@
 public final class DtypesOps {
   private final Scope scope;
 
-  DtypesOps(Scope scope) {
-    this.scope = scope;
+  private final Ops ops;
+
+  DtypesOps(Ops ops) {
+    this.scope = ops.scope();
+    this.ops = ops;
   }
 
   /**
@@ -102,4 +105,11 @@ public <U extends TType, T extends TNumber> Complex<U> complex(Operand<T> real,
       DataType<U> Tout) {
     return Complex.create(scope, real, imag, Tout);
   }
+
+  /**
+   * Get the parent {@link Ops} object.
+   */
+  public final Ops ops() {
+    return ops;
+  }
 }

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

@@ -66,8 +66,11 @@
 public final class ImageOps {
   private final Scope scope;
 
-  ImageOps(Scope scope) {
-    this.scope = scope;
+  private final Ops ops;
+
+  ImageOps(Ops ops) {
+    this.scope = ops.scope();
+    this.ops = ops;
   }
 
   /**
@@ -942,4 +945,11 @@ public <T extends TNumber> ScaleAndTranslate scaleAndTranslate(Operand<T> images
       ScaleAndTranslate.Options... options) {
     return ScaleAndTranslate.create(scope, images, size, scale, translation, options);
   }
+
+  /**
+   * Get the parent {@link Ops} object.
+   */
+  public final Ops ops() {
+    return ops;
+  }
 }

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

@@ -82,8 +82,11 @@
 public final class IoOps {
   private final Scope scope;
 
-  IoOps(Scope scope) {
-    this.scope = scope;
+  private final Ops ops;
+
+  IoOps(Ops ops) {
+    this.scope = ops.scope();
+    this.ops = ops;
   }
 
   /**
@@ -1030,4 +1033,11 @@ public WholeFileReader wholeFileReader(WholeFileReader.Options... options) {
   public WriteFile writeFile(Operand<TString> filename, Operand<TString> contents) {
     return WriteFile.create(scope, filename, contents);
   }
+
+  /**
+   * Get the parent {@link Ops} object.
+   */
+  public final Ops ops() {
+    return ops;
+  }
 }

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

@@ -78,8 +78,11 @@
 public final class LinalgOps {
   private final Scope scope;
 
-  LinalgOps(Scope scope) {
-    this.scope = scope;
+  private final Ops ops;
+
+  LinalgOps(Ops ops) {
+    this.scope = ops.scope();
+    this.ops = ops;
   }
 
   /**
@@ -1606,4 +1609,11 @@ public <T extends TType> TriangularSolve<T> triangularSolve(Operand<T> matrix, O
       TriangularSolve.Options... options) {
     return TriangularSolve.create(scope, matrix, rhs, options);
   }
+
+  /**
+   * Get the parent {@link Ops} object.
+   */
+  public final Ops ops() {
+    return ops;
+  }
 }