Generate name_map

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

Author: rnett

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

@@ -0,0 +1,89 @@
+// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE
+
+package org.tensorflow.internal.c_api;
+
+import org.bytedeco.javacpp.BytePointer;
+import org.bytedeco.javacpp.Loader;
+import org.bytedeco.javacpp.Pointer;
+import org.bytedeco.javacpp.annotation.ByRef;
+import org.bytedeco.javacpp.annotation.ByVal;
+import org.bytedeco.javacpp.annotation.Const;
+import org.bytedeco.javacpp.annotation.Index;
+import org.bytedeco.javacpp.annotation.MemberGetter;
+import org.bytedeco.javacpp.annotation.Name;
+import org.bytedeco.javacpp.annotation.NoOffset;
+import org.bytedeco.javacpp.annotation.Properties;
+import org.bytedeco.javacpp.annotation.StdString;
+
+@Name("std::unordered_map<tensorflow::string,tensorflow::Node*>")
+@Properties(inherit = org.tensorflow.internal.c_api.presets.tensorflow.class)
+public class NameMap extends Pointer {
+
+    static {
+        Loader.load();
+    }
+
+    /**
+     * Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}.
+     */
+    public NameMap(Pointer p) {
+        super(p);
+    }
+
+    public NameMap() {
+        allocate();
+    }
+
+    private native void allocate();
+
+    public native @Name("operator =")
+    @ByRef
+    NameMap put(@ByRef NameMap x);
+
+    public boolean empty() {
+        return size() == 0;
+    }
+
+    public native long size();
+
+    @Index
+    public native Node get(@StdString BytePointer i);
+
+    public native NameMap put(@StdString BytePointer i, Node value);
+
+    public native @ByVal
+    Iterator begin();
+
+    public native @ByVal
+    Iterator end();
+
+    @NoOffset
+    @Name("iterator")
+    public static class Iterator extends Pointer {
+
+        public Iterator(Pointer p) {
+            super(p);
+        }
+
+        public Iterator() {
+        }
+
+        public native @Name("operator ++")
+        @ByRef
+        Iterator increment();
+
+        public native @Name("operator ==")
+        boolean equals(@ByRef Iterator it);
+
+        public native @Name("operator *().first")
+        @MemberGetter
+        @StdString
+        BytePointer first();
+
+        public native @Name("operator *().second")
+        @MemberGetter
+        @Const
+        Node second();
+    }
+}
+

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

@@ -2,29 +2,43 @@
 
 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.*;
+import org.bytedeco.javacpp.Loader;
+import org.bytedeco.javacpp.Pointer;
+import org.bytedeco.javacpp.annotation.ByRef;
+import org.bytedeco.javacpp.annotation.MemberGetter;
+import org.bytedeco.javacpp.annotation.NoOffset;
+import org.bytedeco.javacpp.annotation.Properties;
 
 // Parsed from tensorflow/c/c_api_internal.h
 
-@NoOffset @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 {
-    static { Loader.load(); }
-    /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
-    public TF_Graph(Pointer p) { super(p); }
+
+  static {
+    Loader.load();
+  }
+
+  /**
+   * Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}.
+   */
+  public TF_Graph(Pointer p) {
+    super(p);
+  }
 
 
-  
-  public native @MemberGetter @ByRef NativeGraphPointer graph();
+  public native @MemberGetter
+  @ByRef
+  NativeGraphPointer graph();
 
   // Runs shape inference.
-  
+
 
   // Maps from name of an operation to the Node* in 'graph'.
-  
+  public native @ByRef
+  NameMap name_map();
+
+  public native TF_Graph name_map(NameMap setter);
 
   // 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
@@ -39,11 +53,16 @@ public class TF_Graph extends org.tensorflow.internal.c_api.AbstractTF_Graph {
   //
   // TODO(b/74949947): mutations currently trigger a warning instead of a bad
   // status, this should be reverted when possible.
-  
-    // set true by TF_DeleteGraph
+
+  // 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);
+  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/global/tensorflow.java

@@ -78,6 +78,8 @@ public class tensorflow extends org.tensorflow.internal.c_api.presets.tensorflow
 
 // Targeting ../NativeOutputVector.java
 
+// Targeting ../NameMap.java
+
 // Parsed from tensorflow/core/platform/ctstring_internal.h
 
 /* Copyright 2019 The TensorFlow Authors. All Rights Reserved.

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

@@ -78,6 +78,6 @@ public static GraphOperation getGraphOp(Graph g, Node node) {
   }
 
   public static void useDangerousLockedBuilders(Graph g, boolean dangerous) {
-    g.setDangerousOpBuilder(dangerous);
+    g.setDangerousGradientBuilder(dangerous);
   }
 }

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

@@ -380,7 +380,7 @@ public GraphOperationBuilder opBuilder(String type, String name) {
     if (!isOpEnabled(type)) {
       throw new IllegalArgumentException("Op " + type + " is not valid in graph mode.");
     }
-    return new GraphOperationBuilder(this, type, name, dangerousOpBuilder);
+    return new GraphOperationBuilder(this, type, name, dangerousGradientBuilder);
   }
 
   @Override
@@ -711,12 +711,12 @@ synchronized SaverDef saverDef() {
   private int refcount = 0;
   private SaverDef saverDef;
 
-  private boolean dangerousOpBuilder;
+  private boolean dangerousGradientBuilder;
 
   private final List<Op> initializers = new ArrayList<>();
 
-  synchronized void setDangerousOpBuilder(boolean dangerous) {
-    dangerousOpBuilder = dangerous;
+  synchronized void setDangerousGradientBuilder(boolean dangerous) {
+    dangerousGradientBuilder = dangerous;
   }
 
   // Related native objects (such as the TF_Operation object backing an Operation instance)

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

@@ -61,13 +61,13 @@
  */
 public final class GraphOperationBuilder implements OperationBuilder {
 
-  GraphOperationBuilder(Graph graph, String type, String name, boolean dangerousBuilder) {
+  GraphOperationBuilder(Graph graph, String type, String name, boolean dangerousGradientBuilder) {
     this.graph = graph;
-    this.dangerousBuilder = dangerousBuilder;
+    this.dangerousGradientBuilder = dangerousGradientBuilder;
     Graph.Reference r = graph.ref();
     try {
-      if (dangerousBuilder) {
-        this.unsafeNativeHandle = allocateDangerous(r.nativeHandle(), type, name);
+      if (dangerousGradientBuilder) {
+        this.unsafeNativeHandle = allocateDangerousGradient(r.nativeHandle(), type, name);
       } else {
         this.unsafeNativeHandle = allocate(r.nativeHandle(), type, name);
       }
@@ -83,19 +83,16 @@ public final class GraphOperationBuilder implements OperationBuilder {
    */
   @Override
   public GraphOperation build() {
-    Graph.Reference r = graph.ref();
-    try {
+    try (Graph.Reference r = graph.ref()) {
       TF_Operation built;
-      if (dangerousBuilder) {
-        built = finishDangerous(unsafeNativeHandle);
+      if (dangerousGradientBuilder) {
+        built = finishDangerousGradient(r.nativeHandle(), unsafeNativeHandle);
       } else {
         built = finish(unsafeNativeHandle);
       }
       GraphOperation op = new GraphOperation(graph, built);
       unsafeNativeHandle = null;
       return op;
-    } finally {
-      r.close();
     }
   }
 
@@ -360,7 +357,7 @@ public GraphOperationBuilder setAttr(String name, String[] value) {
 
   private TF_OperationDescription unsafeNativeHandle;
   private final Graph graph;
-  private final boolean dangerousBuilder;
+  private final boolean dangerousGradientBuilder;
 
   private static void requireHandle(Pointer handle) {
     if (handle == null || handle.isNull()) {
@@ -389,7 +386,8 @@ private static TF_OperationDescription allocate(TF_Graph graphHandle, String typ
     return TF_NewOperation(graphHandle, type, name);
   }
 
-  private static TF_OperationDescription allocateDangerous(TF_Graph graphHandle, String type,
+  private static TF_OperationDescription allocateDangerousGradient(TF_Graph graphHandle,
+      String type,
       String name) {
     if (graphHandle == null || graphHandle.isNull()) {
       throw new IllegalStateException("close() has been called on the Graph");
@@ -408,13 +406,14 @@ private static TF_Operation finish(TF_OperationDescription handle) {
     }
   }
 
-  private static TF_Operation finishDangerous(TF_OperationDescription handle) {
+  private static TF_Operation finishDangerousGradient(TF_Graph g, TF_OperationDescription handle) {
     requireHandle(handle);
 
     try (PointerScope scope = new PointerScope()) {
       TF_Status status = TF_Status.newStatus();
       TF_Operation op = TF_FinishOperationLocked(handle, status);
       status.throwExceptionIfNotOK();
+//      g.name_map().put(TF_OperationName(op), null);
       return op;
     }
   }

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

@@ -282,8 +282,10 @@ public void map(InfoMap infoMap) {
         .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",
+        .put(new Info("TF_Graph::refiner", "TF_Graph::mu",
             "TF_Graph::sessions", "TF_Graph::delete_requested").skip())
+        .put(new Info("std::unordered_map<tensorflow::string,tensorflow::Node*>")
+            .pointerTypes("NameMap").define())
         .put(new Info("TF_ImportGraphDefOptions").pointerTypes("TF_ImportGraphDefOptions")
             .base("org.tensorflow.internal.c_api.AbstractTF_ImportGraphDefOptions"))
         .put(new Info("TF_WhileParams", "TFE_MonitoringCounterCell", "TFE_MonitoringSamplerCell",