From ed03222db0698b052a9b531189d0dee2f11a01fb Mon Sep 17 00:00:00 2001 From: Ryan Nett Date: Fri, 15 Oct 2021 13:53:36 -0700 Subject: [PATCH 1/3] Properly skip some generation Signed-off-by: Ryan Nett --- .../internal/c_api/presets/tensorflow.java | 68 +++++++------------ 1 file changed, 25 insertions(+), 43 deletions(-) diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/c_api/presets/tensorflow.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/c_api/presets/tensorflow.java index 20bf7e89832..c12d901dbaa 100644 --- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/c_api/presets/tensorflow.java +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/c_api/presets/tensorflow.java @@ -315,49 +315,10 @@ public void map(InfoMap infoMap) { 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", - "TFE_MonitoringIntGaugeCell", - "TFE_MonitoringStringGaugeCell", - "TFE_MonitoringBoolGaugeCell", - "TFE_MonitoringIntGauge0", - "TFE_MonitoringIntGauge1", - "TFE_MonitoringIntGauge2", - "TFE_MonitoringStringGauge0", - "TFE_MonitoringStringGauge1", - "TFE_MonitoringStringGauge2", - "TFE_MonitoringBoolGauge0", - "TFE_MonitoringBoolGauge1", - "TFE_MonitoringBoolGauge2", - "TFE_MonitoringSampler0", - "TFE_MonitoringSampler1", - "TFE_MonitoringSampler2") - .purify()) + .put(new Info("TF_Operation", "TF_WhileParams").purify()) .put( new Info("TF_Operation::node") .javaText("public native @MemberGetter @ByRef Node node();")) - .put( - new Info("TFE_MonitoringCounterCell::cell") - .javaText("public native @MemberGetter @ByRef CounterCell cell();")) - .put( - new Info("TFE_MonitoringSamplerCell::cell") - .javaText("public native @MemberGetter @ByRef SamplerCell cell();")) - .put( - new Info("TFE_MonitoringIntGaugeCell::cell") - .javaText("public native @MemberGetter @ByRef IntGaugeCell cell();")) - .put( - new Info("TFE_MonitoringStringGaugeCell::cell") - .javaText("public native @MemberGetter @ByRef StringGaugeCell cell();")) - .put( - new Info("TFE_MonitoringBoolGaugeCell::cell") - .javaText("public native @MemberGetter @ByRef BoolGaugeCell cell();")) .put( new Info("TFE_Context") .pointerTypes("TFE_Context") @@ -385,8 +346,29 @@ public void map(InfoMap infoMap) { new Info( "TF_ShapeInferenceContextDimValueKnown", "TFE_NewTensorHandle(const tensorflow::Tensor&, TF_Status*)", - "TF_InitKernel") - .skip()) - .put(new Info("TFE_CustomDeviceTensorHandle", "TFE_CustomDevice").skip()); + "TF_InitKernel", + "TFE_MonitoringCounterCell", + "TFE_MonitoringSamplerCell", + "TFE_MonitoringCounter0", + "TFE_MonitoringCounter1", + "TFE_MonitoringCounter2", + "TFE_MonitoringIntGaugeCell", + "TFE_MonitoringStringGaugeCell", + "TFE_MonitoringBoolGaugeCell", + "TFE_MonitoringIntGauge0", + "TFE_MonitoringIntGauge1", + "TFE_MonitoringIntGauge2", + "TFE_MonitoringStringGauge0", + "TFE_MonitoringStringGauge1", + "TFE_MonitoringStringGauge2", + "TFE_MonitoringBoolGauge0", + "TFE_MonitoringBoolGauge1", + "TFE_MonitoringBoolGauge2", + "TFE_MonitoringSampler0", + "TFE_MonitoringSampler1", + "TFE_MonitoringSampler2", + "TFE_CustomDeviceTensorHandle", + "TFE_CustomDevice") + .skip()); } } From 60fa499e93572e293bdbd3fa3cb406f8e680ddea Mon Sep 17 00:00:00 2001 From: Ryan Nett Date: Fri, 15 Oct 2021 14:02:44 -0700 Subject: [PATCH 2/3] Skip the experimental stuff we don't need Signed-off-by: Ryan Nett --- .../internal/c_api/presets/tensorflow.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/c_api/presets/tensorflow.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/c_api/presets/tensorflow.java index c12d901dbaa..2adccacaf7d 100644 --- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/c_api/presets/tensorflow.java +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/c_api/presets/tensorflow.java @@ -272,6 +272,8 @@ public void init(ClassProperties properties) { @Override public void map(InfoMap infoMap) { infoMap + .put(new Info("c_api_experimental.h") + .linePatterns("typedef struct TFE_OpAttrs TFE_OpAttrs;", "#define TFE_CUSTOM_DEVICE_VERSION 4")) .put(new Info("TF_CAPI_EXPORT", "TF_Bool").cppTypes().annotations()) .put( new Info("TF_Buffer::data") @@ -348,27 +350,27 @@ public void map(InfoMap infoMap) { "TFE_NewTensorHandle(const tensorflow::Tensor&, TF_Status*)", "TF_InitKernel", "TFE_MonitoringCounterCell", - "TFE_MonitoringSamplerCell", "TFE_MonitoringCounter0", "TFE_MonitoringCounter1", "TFE_MonitoringCounter2", "TFE_MonitoringIntGaugeCell", - "TFE_MonitoringStringGaugeCell", - "TFE_MonitoringBoolGaugeCell", "TFE_MonitoringIntGauge0", "TFE_MonitoringIntGauge1", "TFE_MonitoringIntGauge2", + "TFE_MonitoringStringGaugeCell", "TFE_MonitoringStringGauge0", "TFE_MonitoringStringGauge1", "TFE_MonitoringStringGauge2", + "TFE_MonitoringBoolGaugeCell", "TFE_MonitoringBoolGauge0", "TFE_MonitoringBoolGauge1", "TFE_MonitoringBoolGauge2", + "TFE_MonitoringSamplerCell", "TFE_MonitoringSampler0", "TFE_MonitoringSampler1", "TFE_MonitoringSampler2", - "TFE_CustomDeviceTensorHandle", - "TFE_CustomDevice") + "TFE_CustomDeviceTensorHandle", + "TFE_CustomDevice") .skip()); } } From ab3d51fff936159bbe9231003b8fe2d5e2ce7861 Mon Sep 17 00:00:00 2001 From: Ryan Nett Date: Fri, 15 Oct 2021 14:27:56 -0700 Subject: [PATCH 3/3] Fix format Signed-off-by: Ryan Nett --- .../org/tensorflow/internal/c_api/presets/tensorflow.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/c_api/presets/tensorflow.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/c_api/presets/tensorflow.java index 2adccacaf7d..369ccabce43 100644 --- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/c_api/presets/tensorflow.java +++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/c_api/presets/tensorflow.java @@ -272,8 +272,11 @@ public void init(ClassProperties properties) { @Override public void map(InfoMap infoMap) { infoMap - .put(new Info("c_api_experimental.h") - .linePatterns("typedef struct TFE_OpAttrs TFE_OpAttrs;", "#define TFE_CUSTOM_DEVICE_VERSION 4")) + .put( + new Info("c_api_experimental.h") + .linePatterns( + "typedef struct TFE_OpAttrs TFE_OpAttrs;", + "#define TFE_CUSTOM_DEVICE_VERSION 4")) .put(new Info("TF_CAPI_EXPORT", "TF_Bool").cppTypes().annotations()) .put( new Info("TF_Buffer::data")