Sync with Metrics Phase 2

.github/workflows/ci.yml

@@ -17,18 +17,29 @@ jobs:
   quick-build:
     if: github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'CI build')
     runs-on: ubuntu-latest
+    container: centos:7
     steps:
       - name: Checkout repository
         uses: actions/checkout@v1
-      - name: Setup Java
-        uses: actions/setup-java@v1
-        with:
-          java-version: 8 
+      - name: Install environment
+        run: |
+          yum -y update
+          yum -y install centos-release-scl-rh epel-release
+          yum -y install java-11-openjdk-devel devtoolset-7
+          echo Downloading Maven
+          curl -L https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz -o $HOME/apache-maven-3.6.3-bin.tar.gz
+          tar xzf $HOME/apache-maven-3.6.3-bin.tar.gz -C /opt/
+          ln -sf /opt/apache-maven-3.6.3/bin/mvn /usr/bin/mvn
       - name: Build project
         run: |
-          git --version
+          source scl_source enable devtoolset-7 || true 
+          export JAVA_HOME=$(dirname $(dirname $(readlink $(readlink $(which javac)))))
+          echo $JAVA_HOME
           mvn -version
-          mvn clean install -Pdev -B -U -e
+          mvn clean install -Pdev,jdk11 -B -U -e -Dlint.skip=true
+      - name: Run lint checks
+        run: |
+          mvn compiler:compile -Pdev,jdk11 -B -U -e
   prepare:
     runs-on: ubuntu-latest
     outputs:
@@ -217,6 +228,7 @@ jobs:
           )          
           df -h
           wmic pagefile list /format:list
+          set "SKIP_EXPORT=true"
           echo Executing Maven %MAVEN_PHASE%
           call mvn clean %MAVEN_PHASE% -B -U -e -Djavacpp.platform=windows-x86_64 -Djavacpp.platform.extension=${{ matrix.ext }} -pl %NATIVE_BUILD_PROJECTS% -am -DstagingRepositoryId=${{ needs.prepare.outputs.stagingRepositoryId }} "-Dnative.build.flags=%BAZEL_CACHE%"
           if ERRORLEVEL 1 exit /b

pom.xml

@@ -41,6 +41,7 @@
     <junit.version>5.6.2</junit.version>
     <jmh.version>1.21</jmh.version>
     <versions-plugin.version>2.7</versions-plugin.version>
+    <errorprone.version>2.6.0</errorprone.version>
     <maven.javadoc.skip>true</maven.javadoc.skip>
     <maven.source.skip>true</maven.source.skip>
     <gpg.skip>true</gpg.skip>
@@ -174,6 +175,60 @@
         <maven.compiler.release>11</maven.compiler.release>
       </properties>
     </profile>
+
+    <!--
+      Profile that enables lint checks on compilation
+      Uses Google Error Prone for more coverage
+    -->
+    <profile>
+      <id>lint</id>
+      <activation>
+        <!-- activate lint checks only on JDK1.9+ (required by Error Prone) -->
+        <jdk>(1.9,)</jdk>
+        <!-- custom property to disable link checks on command line (enabled by default) -->
+        <property>
+          <name>!lint.skip</name>
+          <value>!true</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <version>3.8.0</version>
+            <configuration>
+              <showWarnings>true</showWarnings>
+              <fork>true</fork> <!-- Required for JDK16+ -->
+              <compilerArgs combine.children="append">
+                <!--arg>-Werror</arg--> <!-- Disabled (temporarily?) -->
+                <arg>-Xlint:all</arg>
+                <arg>-XDcompilePolicy=simple</arg>
+                <arg>-Xplugin:ErrorProne</arg>
+                <!-- Following are required on JDK16+ -->
+                <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
+                <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
+                <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
+                <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg>
+                <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg>
+                <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
+                <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
+                <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
+                <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
+                <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
+              </compilerArgs>
+              <annotationProcessorPaths combine.children="append">
+                <path>
+                  <groupId>com.google.errorprone</groupId>
+                  <artifactId>error_prone_core</artifactId>
+                  <version>${errorprone.version}</version>
+                </path>
+              </annotationProcessorPaths>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 
   <!-- http://central.sonatype.org/pages/requirements.html#developer-information -->

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,19 +79,18 @@ 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
 
-# Export op defs
-$BAZEL_BIN/java_op_exporter \
-    --api_dirs=$BAZEL_SRCS/external/org_tensorflow/tensorflow/core/api_def/base_api,src/bazel/api_def \
-    $TENSORFLOW_LIB > $GEN_RESOURCE_DIR/ops.pb
+if [[ -z "${SKIP_EXPORT:-}" ]]; then
+  # Export op defs
+  echo "Exporting Ops"
+  $BAZEL_BIN/java_op_exporter \
+      --api_dirs=$BAZEL_SRCS/external/org_tensorflow/tensorflow/core/api_def/base_api,src/bazel/api_def \
+      $TENSORFLOW_LIB > $GEN_RESOURCE_DIR/ops.pb
+else
+  echo "Skipping Op export"
+fi
 
 
 # Copy generated Java protos from source jars

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>