tensorflow · karllessard · Oct 15, 2019 · Oct 10, 2019
diff --git a/tensorflow-core/tensorflow-core-api/BUILD b/tensorflow-core/tensorflow-core-api/BUILD
@@ -1 +1,59 @@
-load("@org_tensorflow//tensorflow:tensorflow.bzl", "tf_copts")
+load("@org_tensorflow//tensorflow:tensorflow.bzl", "tf_copts", "tf_cc_binary")
+load(":tensorflow-java.bzl", "tf_java_op_gen_srcjar")
+
+tf_java_op_gen_srcjar(
+    name = "java_op_gen_sources",
+    api_def_srcs = [
+        "@org_tensorflow//tensorflow/core/api_def:base_api_def",
+        ":java_api_def",
+    ],
+    base_package = "org.tensorflow.op",
+    gen_tool = ":java_op_gen_tool",
+)
+
+tf_cc_binary(
+    name = "java_op_gen_tool",
+    srcs = [
+        "src/bazel/op_generator/op_gen_main.cc",
+    ],
+    copts = tf_copts(),
+    linkopts = select({
+        "@org_tensorflow//tensorflow:windows": [],
+        "//conditions:default": ["-lm"],
+    }),
+    linkstatic = 1,
+    deps = [
+        ":java_op_gen_lib",
+        "@org_tensorflow//tensorflow/core:framework",
+        "@org_tensorflow//tensorflow/core:lib",
+        "@org_tensorflow//tensorflow/core:ops",
+    ],
+)
+
+cc_library(
+    name = "java_op_gen_lib",
+    srcs = [
+        "src/bazel/op_generator/op_generator.cc",
+        "src/bazel/op_generator/op_specs.cc",
+        "src/bazel/op_generator/source_writer.cc",
+    ],
+    hdrs = [
+        "src/bazel/op_generator/java_defs.h",
+        "src/bazel/op_generator/op_generator.h",
+        "src/bazel/op_generator/op_specs.h",
+        "src/bazel/op_generator/source_writer.h",
+    ],
+    copts = tf_copts(),
+    deps = [
+        "@org_tensorflow//tensorflow/core:framework",
+        "@org_tensorflow//tensorflow/core:lib",
+        "@org_tensorflow//tensorflow/core:op_gen_lib",
+        "@org_tensorflow//tensorflow/core:protos_all_cc",
+        "@com_googlesource_code_re2//:re2",
+    ],
+)
+
+filegroup(
+    name = "java_api_def",
+    srcs = glob(["src/bazel/api_def/*"])
+)
diff --git a/tensorflow-core/tensorflow-core-api/WORKSPACE b/tensorflow-core/tensorflow-core-api/WORKSPACE
@@ -9,8 +9,10 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "org_tensorflow",
-    # https://github.com/tensorflow/tensorflow/issues/25213
-    patches = [":tensorflow-windows.patch"],
+    patches = [
+        ":tensorflow-windows.patch", # https://github.com/tensorflow/tensorflow/issues/25213
+        ":tensorflow-api-def.patch"
+    ],
     patch_args = ["-p1"],
     urls = [
        "https://mirror.bazel.build/github.com/tensorflow/tensorflow/archive/v2.0.0.tar.gz",

diff --git a/tensorflow-core/tensorflow-core-api/build.sh b/tensorflow-core/tensorflow-core-api/build.sh
@@ -18,7 +18,7 @@ else
 fi
 
 # Build C API of TensorFlow itself including a target to generate ops for Java
-bazel build $BUILD_FLAGS --python_path="$PYTHON_BIN_PATH" --config=monolithic --config=mkl --output_filter=DONT_MATCH_ANYTHING --verbose_failures @org_tensorflow//tensorflow:tensorflow @org_tensorflow//tensorflow/java:tensorflow
+bazel build $BUILD_FLAGS --python_path="$PYTHON_BIN_PATH" --config=monolithic --config=mkl --output_filter=DONT_MATCH_ANYTHING --verbose_failures @org_tensorflow//tensorflow:tensorflow :java_op_gen_sources
 
 # Normalize some paths with symbolic links
 TENSORFLOW_SO=(bazel-bin/external/org_tensorflow/tensorflow/libtensorflow.so.?.?.?)
@@ -38,4 +38,4 @@ fi
 
 # Copy only main generated Java source files for ops
 mkdir -p src/gen/java/
-cp -r bazel-genfiles/external/org_tensorflow/tensorflow/java/ops/src/main/java/* src/gen/java/
+cp -r bazel-genfiles/ops/src/* src/gen/java/
diff --git a/tensorflow-core/tensorflow-core-api/external/tensorflow-api-def.patch b/tensorflow-core/tensorflow-core-api/external/tensorflow-api-def.patch
@@ -0,0 +1,13 @@
+diff --git a/tensorflow/core/api_def/BUILD b/tensorflow/core/api_def/BUILD
+index f96645ad9f..63f94d3b87 100644
+--- a/tensorflow/core/api_def/BUILD
++++ b/tensorflow/core/api_def/BUILD
+@@ -28,7 +28,7 @@ package(
+ filegroup(
+     name = "base_api_def",
+     srcs = glob(["base_api/*"]),
+-    visibility = ["//tensorflow:internal"],
++    visibility = ["//visibility:public"],
+ )
+
+ filegroup(
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_Abort.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_Abort.pbtxt
@@ -0,0 +1,3 @@
+op {
+  graph_op_name: "Abort"
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_Abs.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_Abs.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "Abs"
+  endpoint {
+    name: "math.Abs"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AccumulateNV2.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AccumulateNV2.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "AccumulateNV2"
+  endpoint {
+    name: "math.AccumulateN"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AccumulatorApplyGradient.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AccumulatorApplyGradient.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "AccumulatorApplyGradient"
+  endpoint {
+    name: "train.AccumulatorApplyGradient"
+  }
+}
diff --git a/...orflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AccumulatorNumAccumulated.pbtxt b/...orflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AccumulatorNumAccumulated.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "AccumulatorNumAccumulated"
+  endpoint {
+    name: "train.AccumulatorNumAccumulated"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AccumulatorSetGlobalStep.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AccumulatorSetGlobalStep.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "AccumulatorSetGlobalStep"
+  endpoint {
+    name: "train.AccumulatorSetGlobalStep"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AccumulatorTakeGradient.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AccumulatorTakeGradient.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "AccumulatorTakeGradient"
+  endpoint {
+    name: "train.AccumulatorTakeGradient"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_Acos.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_Acos.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "Acos"
+  endpoint {
+    name: "math.Acos"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_Acosh.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_Acosh.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "Acosh"
+  endpoint {
+    name: "math.Acosh"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_Add.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_Add.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "Add"
+  endpoint {
+    name: "math.Add"
+  }
+}
diff --git a/...orflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AddManySparseToTensorsMap.pbtxt b/...orflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AddManySparseToTensorsMap.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "AddManySparseToTensorsMap"
+  endpoint {
+    name: "sparse.AddManySparseToTensorsMap"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AddN.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AddN.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "AddN"
+  endpoint {
+    name: "math.AddN"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AddSparseToTensorsMap.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AddSparseToTensorsMap.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "AddSparseToTensorsMap"
+  endpoint {
+    name: "sparse.AddSparseToTensorsMap"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AddV2.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AddV2.pbtxt
@@ -0,0 +1,4 @@
+op {
+  graph_op_name: "AddV2"
+  visibility: SKIP
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AdjustContrast.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AdjustContrast.pbtxt
@@ -0,0 +1,4 @@
+op {
+  graph_op_name: "AdjustContrast"
+  visibility: SKIP
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AdjustContrastv2.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AdjustContrastv2.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "AdjustContrastv2"
+  endpoint {
+    name: "image.AdjustContrast"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AdjustHue.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AdjustHue.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "AdjustHue"
+  endpoint {
+    name: "image.AdjustHue"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AdjustSaturation.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AdjustSaturation.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "AdjustSaturation"
+  endpoint {
+    name: "image.AdjustSaturation"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_All.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_All.pbtxt
@@ -0,0 +1,3 @@
+op {
+  graph_op_name: "All"
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AllCandidateSampler.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AllCandidateSampler.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "AllCandidateSampler"
+  endpoint {
+    name: "random.AllCandidateSampler"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_Angle.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_Angle.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "Angle"
+  endpoint {
+    name: "math.Angle"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AnonymousIterator.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AnonymousIterator.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "AnonymousIterator"
+  endpoint {
+    name: "data.AnonymousIterator"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_Any.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_Any.pbtxt
@@ -0,0 +1,3 @@
+op {
+  graph_op_name: "Any"
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ApplyAdaMax.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ApplyAdaMax.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "ApplyAdaMax"
+  endpoint {
+    name: "train.ApplyAdaMax"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ApplyAdadelta.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ApplyAdadelta.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "ApplyAdadelta"
+  endpoint {
+    name: "train.ApplyAdadelta"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ApplyAdagrad.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ApplyAdagrad.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "ApplyAdagrad"
+  endpoint {
+    name: "train.ApplyAdagrad"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ApplyAdagradDA.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ApplyAdagradDA.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "ApplyAdagradDA"
+  endpoint {
+    name: "train.ApplyAdagradDa"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ApplyAdam.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ApplyAdam.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "ApplyAdam"
+  endpoint {
+    name: "train.ApplyAdam"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ApplyAddSign.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ApplyAddSign.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "ApplyAddSign"
+  endpoint {
+    name: "train.ApplyAddSign"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ApplyCenteredRMSProp.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ApplyCenteredRMSProp.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "ApplyCenteredRMSProp"
+  endpoint {
+    name: "train.ApplyCenteredRmsProp"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ApplyFtrl.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ApplyFtrl.pbtxt
@@ -0,0 +1,4 @@
+op {
+  graph_op_name: "ApplyFtrl"
+  visibility: SKIP
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ApplyFtrlV2.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ApplyFtrlV2.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "ApplyFtrlV2"
+  endpoint {
+    name: "train.ApplyFtrl"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ApplyGradientDescent.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ApplyGradientDescent.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "ApplyGradientDescent"
+  endpoint {
+    name: "train.ApplyGradientDescent"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ApplyMomentum.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ApplyMomentum.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "ApplyMomentum"
+  endpoint {
+    name: "train.ApplyMomentum"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ApplyPowerSign.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ApplyPowerSign.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "ApplyPowerSign"
+  endpoint {
+    name: "train.ApplyPowerSign"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ApplyProximalAdagrad.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ApplyProximalAdagrad.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "ApplyProximalAdagrad"
+  endpoint {
+    name: "train.ApplyProximalAdagrad"
+  }
+}
diff --git a/...low-core/tensorflow-core-api/src/bazel/api_def/api_def_ApplyProximalGradientDescent.pbtxt b/...low-core/tensorflow-core-api/src/bazel/api_def/api_def_ApplyProximalGradientDescent.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "ApplyProximalGradientDescent"
+  endpoint {
+    name: "train.ApplyProximalGradientDescent"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ApplyRMSProp.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ApplyRMSProp.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "ApplyRMSProp"
+  endpoint {
+    name: "train.ApplyRmsProp"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ApproximateEqual.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ApproximateEqual.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "ApproximateEqual"
+  endpoint {
+    name: "math.ApproximateEqual"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ArgMax.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ArgMax.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "ArgMax"
+  endpoint {
+    name: "math.ArgMax"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ArgMin.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_ArgMin.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "ArgMin"
+  endpoint {
+    name: "math.ArgMin"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AsString.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AsString.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "AsString"
+  endpoint {
+    name: "dtypes.AsString"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_Asin.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_Asin.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "Asin"
+  endpoint {
+    name: "math.Asin"
+  }
+}
diff --git a/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_Asinh.pbtxt b/tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_Asinh.pbtxt
@@ -0,0 +1,6 @@
+op {
+  graph_op_name: "Asinh"
+  endpoint {
+    name: "math.Asinh"
+  }
+}