NodeBuilder fix

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

Author: rnett

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

@@ -0,0 +1,17 @@
+// 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.*;
+
+@Namespace("tensorflow") @Opaque @Properties(inherit = org.tensorflow.internal.c_api.presets.tensorflow.class)
+public class NodeBuilder extends Pointer {
+    /** Empty constructor. Calls {@code super((Pointer)null)}. */
+    public NodeBuilder() { super((Pointer)null); }
+    /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
+    public NodeBuilder(Pointer p) { super(p); }
+}

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

@@ -8,12 +8,24 @@
 
 import static org.tensorflow.internal.c_api.global.tensorflow.*;
 
+// Parsed from tensorflow/c/c_api_internal.h
 
-// Operation being built. The underlying graph must outlive this.
-@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_OperationDescription extends Pointer {
-    /** Empty constructor. Calls {@code super((Pointer)null)}. */
-    public TF_OperationDescription() { super((Pointer)null); }
+    static { Loader.load(); }
     /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
     public TF_OperationDescription(Pointer p) { super(p); }
+
+  public TF_OperationDescription(TF_Graph g, @Cast("const char*") BytePointer op_type,
+                            @Cast("const char*") BytePointer node_name) { super((Pointer)null); allocate(g, op_type, node_name); }
+  private native void allocate(TF_Graph g, @Cast("const char*") BytePointer op_type,
+                            @Cast("const char*") BytePointer node_name);
+  public TF_OperationDescription(TF_Graph g, String op_type,
+                            String node_name) { super((Pointer)null); allocate(g, op_type, node_name); }
+  private native void allocate(TF_Graph g, String op_type,
+                            String node_name);
+
+  public native @ByRef NodeBuilder node_builder(); public native TF_OperationDescription node_builder(NodeBuilder setter);
+  public native TF_Graph graph(); public native TF_OperationDescription graph(TF_Graph setter);
+  
 }

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

@@ -161,7 +161,7 @@ public class TF_Scope extends Pointer {
   /** Update the builder with properties accumulated in this scope. Does not set
    *  status(). */
   // TODO(skyewm): NodeBuilder is not part of public API
-  public native void UpdateBuilder(TF_OperationDescription builder);
+  public native void UpdateBuilder(NodeBuilder builder);
   // END_SKIP_DOXYGEN
 
   public native @Cast("bool") boolean ok();

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

@@ -943,9 +943,8 @@ public static native void TF_SetConfig(TF_SessionOptions options,
 // Destroy an options object.  Graph will be deleted once no more
 // TFSession's are referencing it.
 public static native void TF_DeleteGraph(TF_Graph arg0);
-// Targeting ../TF_OperationDescription.java
-
 
+// Operation being built. The underlying graph must outlive this.
 // Targeting ../TF_Operation.java
 
 
@@ -3044,6 +3043,11 @@ public static native void TF_RegisterFilesystemPlugin(
 // #endif  // TENSORFLOW_C_C_API_H_
 
 
+// Targeting ../TF_OperationDescription.java
+
+
+
+
 // Parsed from tensorflow/c/kernels.h
 
 /* Copyright 2018 The TensorFlow Authors. All Rights Reserved.
@@ -4410,6 +4414,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 ../NodeBuilder.java
+
+
 // Targeting ../TF_Scope.java
 
 

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

@@ -48,12 +48,16 @@
                                 "tensorflow/c/tf_tensor.h",
                                 "tensorflow/c/tf_tstring.h",
                                 "tensorflow/c/c_api.h",
+                                "tensorflow/c/c_api_internal.h",
 //                "tensorflow/c/env.h",
                                 "tensorflow/c/kernels.h",
                                 "tensorflow/c/ops.h",
                                 "tensorflow/c/eager/c_api.h",
                                 "tensorflow/cc/framework/scope.h"
                         },
+                        exclude = {
+                                "tensorflow/c/c_api_internal.h"
+                        },
                         link = "tensorflow_cc@.2",
                         preload = {"iomp5", "mklml", "mklml_intel", "tensorflow_framework@.2"},
                         preloadresource = "/org/bytedeco/mkldnn/",
@@ -198,7 +202,11 @@ public void init(ClassProperties properties) {
     }
 
     public void map(InfoMap infoMap) {
-        infoMap.put(new Info("TF_CAPI_EXPORT", "TF_Bool").cppTypes().annotations())
+        infoMap
+                .put(new Info("c_api_internal.h")
+                        .linePatterns("struct TF_OperationDescription \\{", "\\};"))
+                .put(new Info("TF_CAPI_EXPORT", "TF_Bool").cppTypes().annotations())
+                .put(new Info("tensorflow::string", "string").cppTypes("std::string"))
                 .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"))
@@ -230,14 +238,13 @@ public void map(InfoMap infoMap) {
                 .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("tensorflow::Scope").javaNames("TF_Scope").pointerTypes("TF_Scope"))
-                .put(new Info("tensorflow::NodeBuilder").cppTypes("TF_OperationDescription"))
+                .put(new Info("TF_OperationDescription").pointerTypes("TF_OperationDescription"))
+                .put(new Info("tensorflow::NodeBuilder").pointerTypes("NodeBuilder"))
                 .put(new Info("tensorflow::Status").cppTypes("TF_Status"))
-                .put(new Info("tensorflow::Graph").cppTypes("TF_Graph"))
-                .put(new Info("string").cppTypes("std::string"))
                 .put(new Info("gtl::ArraySlice<TF_Operation>").cppTypes("std::vector<TF_Operation>"))
                 .put(new Info("Output").cppTypes("TF_Output"))
                 .put(new Info("Operation").cppTypes("TF_Operation"))
-                .put(new Info("tensorflow::CompositeOpScopes", "tensorflow::GraphDef", "tensorflow::Scope::graph",
+                .put(new Info("tensorflow::CompositeOpScopes", "tensorflow::Graph", "tensorflow::GraphDef", "tensorflow::Scope::graph",
                         "tensorflow::Scope::graph_as_shared_ptr",
                         "tensorflow::Scope::ToGraphDef",
                         "tensorflow::Scope::ToGraph",
@@ -250,7 +257,8 @@ public void map(InfoMap infoMap) {
                         "tensorflow::Scope::ColocateWith",
                         "tensorflow::Scope::WithXlaCluster",
                         "tensorflow::Scope::WithAssignedDevice",
-                        "tensorflow::CreateOutputWithScope"
+                        "tensorflow::CreateOutputWithScope",
+                        "TF_OperationDescription::colocation_constraints"
                 ).skip());
     }
 }