Graph native pointers

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

Author: rnett

tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/NativeGraphPointer.java

@@ -0,0 +1,18 @@
+// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+
+package org.tensorflow.internal.c_api;
+
+import java.nio.*;
+import org.bytedeco.javacpp.*;
+import org.bytedeco.javacpp.annotation.*;
+
+import static org.tensorflow.internal.c_api.global.tensorflow.*;
+
+
+@Name("tensorflow::Graph") @Opaque @Properties(inherit = org.tensorflow.internal.c_api.presets.tensorflow.class)
+public class NativeGraphPointer extends Pointer {
+    /** Empty constructor. Calls {@code super((Pointer)null)}. */
+    public NativeGraphPointer() { super((Pointer)null); }
+    /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
+    public NativeGraphPointer(Pointer p) { super(p); }
+}

tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Graph.java

@@ -8,19 +8,42 @@
 
 import static org.tensorflow.internal.c_api.global.tensorflow.*;
 
+// Parsed from tensorflow/c/c_api_internal.h
 
-// TODO(jeff,sanjay):
-// - export functions to set Config fields
-
-// --------------------------------------------------------------------------
-// The new graph construction API, still under development.
-
-// Represents a computation graph.  Graphs may be shared between sessions.
-// Graphs are thread-safe when used as directed below.
-@Opaque @Properties(inherit = org.tensorflow.internal.c_api.presets.tensorflow.class)
+@NoOffset @Properties(inherit = org.tensorflow.internal.c_api.presets.tensorflow.class)
 public class TF_Graph extends org.tensorflow.internal.c_api.AbstractTF_Graph {
-    /** Empty constructor. Calls {@code super((Pointer)null)}. */
-    public TF_Graph() { super((Pointer)null); }
+    static { Loader.load(); }
     /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
     public TF_Graph(Pointer p) { super(p); }
+
+
+  
+  public native @MemberGetter @ByRef NativeGraphPointer graph();
+
+  // Runs shape inference.
+  
+
+  // Maps from name of an operation to the Node* in 'graph'.
+  
+
+  // The keys of this map are all the active sessions using this graph. Each
+  // value records whether the graph has been mutated since the corresponding
+  // session has been run (this is detected in RecordMutation function). If the
+  // string is empty, no mutation has occurred. Otherwise the string is a
+  // description of the mutation suitable for returning to the user.
+  //
+  // Sessions are added to this map in TF_NewSession, and removed in
+  // TF_DeleteSession.
+  // TF_Graph may only / must be deleted when
+  //   sessions.size() == 0 && delete_requested == true
+  //
+  // TODO(b/74949947): mutations currently trigger a warning instead of a bad
+  // status, this should be reverted when possible.
+  
+    // set true by TF_DeleteGraph
+
+  // Used to link graphs contained in TF_WhileParams to the parent graph that
+  // will eventually contain the full while loop.
+  public native TF_Graph parent(); public native TF_Graph parent(TF_Graph setter);
+  public native TF_Output parent_inputs(); public native TF_Graph parent_inputs(TF_Output setter);
 }

tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_OperationDescription.java

@@ -8,8 +8,6 @@
 
 import static org.tensorflow.internal.c_api.global.tensorflow.*;
 
-// Parsed from tensorflow/c/c_api_internal.h
-
 @NoOffset @Properties(inherit = org.tensorflow.internal.c_api.presets.tensorflow.class)
 public class TF_OperationDescription extends Pointer {
     static { Loader.load(); }

tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Scope.java

@@ -167,7 +167,7 @@ public class TF_Scope extends Pointer {
   public native @Cast("bool") boolean ok();
 
   // TODO(skyewm): Graph is not part of public API
-  
+  public native NativeGraphPointer graph();
 
   // TODO(skyewm): Graph is not part of public API
 

tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/global/tensorflow.java

@@ -933,9 +933,15 @@ public static native void TF_SetConfig(TF_SessionOptions options,
 
 // Destroy an options object.
 public static native void TF_DeleteSessionOptions(TF_SessionOptions arg0);
-// Targeting ../TF_Graph.java
 
+// TODO(jeff,sanjay):
+// - export functions to set Config fields
+
+// --------------------------------------------------------------------------
+// The new graph construction API, still under development.
 
+// Represents a computation graph.  Graphs may be shared between sessions.
+// Graphs are thread-safe when used as directed below.
 
 // Return a new graph object.
 public static native TF_Graph TF_NewGraph();
@@ -4429,6 +4435,9 @@ public static native void TFE_ContextExportRunMetadata(TFE_Context ctx,
 // #include "tensorflow/core/common_runtime/graph_constructor.h"
 // #include "tensorflow/core/lib/core/status.h"
 // #include "tensorflow/core/lib/gtl/array_slice.h"
+// Targeting ../NativeGraphPointer.java
+
+
 // Targeting ../NodeBuilder.java
 
 
@@ -4450,6 +4459,9 @@ public static native void TFE_ContextExportRunMetadata(TFE_Context ctx,
 // #endif  // TENSORFLOW_CC_FRAMEWORK_SCOPE_H_
 
 
+// Targeting ../TF_Graph.java
+
+
 // Targeting ../TF_OperationDescription.java
 
 

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

@@ -27,28 +27,15 @@
 import static org.tensorflow.internal.c_api.global.tensorflow.TF_NewWhile;
 
 import com.google.protobuf.InvalidProtocolBufferException;
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Queue;
-import java.util.Set;
+
+import java.util.*;
 import java.util.stream.Collectors;
 import org.bytedeco.javacpp.BytePointer;
 import org.bytedeco.javacpp.Pointer;
 import org.bytedeco.javacpp.PointerScope;
 import org.bytedeco.javacpp.SizeTPointer;
 import org.tensorflow.exceptions.TensorFlowException;
-import org.tensorflow.internal.c_api.TF_Buffer;
-import org.tensorflow.internal.c_api.TF_Graph;
-import org.tensorflow.internal.c_api.TF_ImportGraphDefOptions;
-import org.tensorflow.internal.c_api.TF_Operation;
-import org.tensorflow.internal.c_api.TF_Output;
-import org.tensorflow.internal.c_api.TF_Status;
-import org.tensorflow.internal.c_api.TF_WhileParams;
+import org.tensorflow.internal.c_api.*;
 import org.tensorflow.ndarray.StdArrays;
 import org.tensorflow.op.Op;
 import org.tensorflow.op.Ops;
@@ -78,14 +65,15 @@ public final class Graph implements ExecutionEnvironment, AutoCloseable {
    * Create an empty Graph.
    */
   public Graph() {
-    nativeHandle = allocate();
+    this(allocate());
   }
 
   /**
    * Create a Graph from an existing handle (takes ownership).
    */
   Graph(TF_Graph nativeHandle) {
     this.nativeHandle = nativeHandle;
+    allGraphs.add(this);
   }
 
   Graph(TF_Graph nativeHandle, SaverDef saverDef) {
@@ -1069,6 +1057,21 @@ private static SaverDef addVariableSaver(Graph graph) {
         .build();
   }
 
+  private static Set<Graph> allGraphs = Collections.newSetFromMap(new WeakHashMap<>());
+
+  /**
+   * Find the graph with the matching underlying native pointer.
+   * @return the graph if there is one, else null.
+   */
+  Graph findGraphForPointer(NativeGraphPointer pointer){
+    for(Graph g : allGraphs){
+      if(g.nativeHandle.graph().equals(pointer)){
+        return g;
+      }
+    }
+    return null;
+  }
+
   static {
     TensorFlow.init();
   }

tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/c_api/presets/tensorflow.java

@@ -201,19 +201,20 @@ public void init(ClassProperties properties) {
 
     public void map(InfoMap infoMap) {
         infoMap
-                .put(new Info("TF_OperationDescription").pointerTypes("TF_OperationDescription").purify())
                 .put(new Info("c_api_internal.h")
-                        .linePatterns("struct TF_OperationDescription \\{", "\\};"))
-                .put(new Info("TF_CAPI_EXPORT", "TF_Bool").cppTypes().annotations())
+                        .linePatterns("struct TF_OperationDescription \\{", "\\};",
+                                "struct TF_Graph \\{", "\\};"))
+                .put(new Info("TF_CAPI_EXPORT", "TF_Bool", "TF_GUARDED_BY").cppTypes().annotations())
                 .put(new Info("TF_Buffer::data").javaText("public native @Const Pointer data(); public native TF_Buffer data(Pointer data);"))
                 .put(new Info("TF_Status").pointerTypes("TF_Status").base("org.tensorflow.internal.c_api.AbstractTF_Status"))
                 .put(new Info("TF_Buffer").pointerTypes("TF_Buffer").base("org.tensorflow.internal.c_api.AbstractTF_Buffer"))
                 .put(new Info("TF_Tensor").pointerTypes("TF_Tensor").base("org.tensorflow.internal.c_api.AbstractTF_Tensor"))
                 .put(new Info("TF_Session").pointerTypes("TF_Session").base("org.tensorflow.internal.c_api.AbstractTF_Session"))
                 .put(new Info("TF_SessionOptions").pointerTypes("TF_SessionOptions").base("org.tensorflow.internal.c_api.AbstractTF_SessionOptions"))
-                .put(new Info("TF_Graph").pointerTypes("TF_Graph").base("org.tensorflow.internal.c_api.AbstractTF_Graph"))
-                .put(new Info("TF_Graph::graph").javaText("public native @MemberGetter @ByRef Graph graph();"))
-                .put(new Info("TF_Graph::refiner").javaText("public native @MemberGetter @ByRef ShapeRefiner refiner();"))
+                .put(new Info("TF_Graph").pointerTypes("TF_Graph").base("org.tensorflow.internal.c_api.AbstractTF_Graph").purify())
+                .put(new Info("tensorflow::Graph").javaNames("NativeGraphPointer"))
+                .put(new Info("TF_Graph::graph").javaText("public native @MemberGetter @ByRef NativeGraphPointer graph();"))
+                .put(new Info("TF_Graph::refiner", "TF_Graph::mu", "TF_Graph::name_map", "TF_Graph::sessions", "TF_Graph::delete_requested").skip())
                 .put(new Info("TF_ImportGraphDefOptions").pointerTypes("TF_ImportGraphDefOptions").base("org.tensorflow.internal.c_api.AbstractTF_ImportGraphDefOptions"))
                 .put(new Info("TF_Operation", "TF_WhileParams", "TFE_MonitoringCounterCell", "TFE_MonitoringSamplerCell",
                         "TFE_MonitoringCounter0", "TFE_MonitoringCounter1", "TFE_MonitoringCounter2",
@@ -235,16 +236,15 @@ public void map(InfoMap infoMap) {
                 .put(new Info("TFE_Op::operation").javaText("@MemberGetter public native @ByRef EagerOperation operation();"))
                 .put(new Info("TFE_TensorHandle").pointerTypes("TFE_TensorHandle").base("org.tensorflow.internal.c_api.AbstractTFE_TensorHandle"))
                 .put(new Info("TF_ShapeInferenceContextDimValueKnown", "TFE_NewTensorHandle(const tensorflow::Tensor&, TF_Status*)").skip())
+                .put(new Info("TF_OperationDescription").pointerTypes("TF_OperationDescription").purify())
                 .put(new Info("tensorflow::Scope").javaNames("TF_Scope").pointerTypes("TF_Scope"))
                 .put(new Info("tensorflow::NodeBuilder").pointerTypes("NodeBuilder"))
                 .put(new Info("tensorflow::string", "absl::string_view", "tensorflow::StringPiece").annotations("@StdString").valueTypes("BytePointer", "String").pointerTypes("BytePointer"))
                 .put(new Info("absl::Span", "tensorflow::gtl::ArraySlice").annotations("@Span"))
                 .put(new Info("tensorflow::Output").javaNames("TF_Output").cast())
                 .put(new Info("tensorflow::Operation").javaNames("TF_Operation").cast())
                 .put(new Info("tensorflow::CompositeOpScopes",
-                        "tensorflow::Graph",
                         "tensorflow::GraphDef",
-                        "tensorflow::Scope::graph",
                         "tensorflow::Scope::graph_as_shared_ptr",
                         "tensorflow::Scope::ToGraphDef",
                         "tensorflow::Scope::ToGraph",