Use the Java Op generator

tensorflow-core/pom.xml

@@ -37,7 +37,7 @@
 
  <properties>
  <!-- Match version used by TensorFlow, in tensorflow/workspace.bzl -->
- <protobuf.version>3.8.0</protobuf.version>
+ <protobuf.version>3.9.2</protobuf.version>
 
  <native.classifier>${javacpp.platform}${javacpp.platform.extension}</native.classifier>
  <javacpp.build.skip>false</javacpp.build.skip> <!-- To skip execution of build.sh: -Djavacpp.build.skip=true -->

tensorflow-core/tensorflow-core-api/BUILD

@@ -1,41 +1,6 @@
 load("@org_tensorflow//tensorflow:tensorflow.bzl", "tf_copts", "tf_cc_binary")
 load("@rules_java//java:defs.bzl", "java_proto_library")
 
-tf_cc_binary(
- name = "java_op_generator",
- linkopts = select({
- "@org_tensorflow//tensorflow:windows": [],
- "//conditions:default": ["-lm"],
- }),
- deps = [
- ":java_op_gen_lib",
- ],
-)
-
-cc_library(
- name = "java_op_gen_lib",
- srcs = [
- "src/bazel/op_generator/op_gen_main.cc",
- "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",
- ],
-)
-
 tf_cc_binary(
  name = "java_op_exporter",
  linkopts = select({

tensorflow-core/tensorflow-core-api/build.sh

@@ -37,7 +37,6 @@ bazel build $BUILD_FLAGS ${BUILD_USER_FLAGS:-} \
  @org_tensorflow//tensorflow:tensorflow_cc \
  @org_tensorflow//tensorflow/tools/lib_package:jnilicenses_generate \
  :java_proto_gen_sources \
- :java_op_generator \
  :java_op_exporter \
  :java_api_import \
  :custom_ops_test
@@ -80,12 +79,6 @@ fi
 GEN_SRCS_DIR=src/gen/java
 mkdir -p $GEN_SRCS_DIR
 
-# Generate Java operator wrappers
-$BAZEL_BIN/java_op_generator \
- --output_dir=$GEN_SRCS_DIR \
- --api_dirs=$BAZEL_SRCS/external/org_tensorflow/tensorflow/core/api_def/base_api,src/bazel/api_def \
- $TENSORFLOW_LIB
-
 GEN_RESOURCE_DIR=src/gen/resources/org/tensorflow/op
 mkdir -p $GEN_RESOURCE_DIR
 

tensorflow-core/tensorflow-core-api/pom.xml

@@ -343,7 +343,7 @@
  <goals>
  <goal>java</goal>
  </goals>
- <!-- <phase>generate-sources</phase>-->
+ <phase>generate-sources</phase>
  </execution>
  </executions>
  <dependencies>