Fix/javadoc script

.github/workflows/build.yml

@@ -62,6 +62,28 @@ jobs:
           fi
           echo "Repository URL: $REPOSITORY_URL"
           echo "::set-output name=repositoryUrl::$REPOSITORY_URL"
+#  linux-arm64:
+#    runs-on: linux-arm64-ubuntu2204
+#    needs: prepare
+#    strategy:
+#      matrix:
+#        ext: [""]
+#    steps:
+#      - name: Install environment
+#        run: |
+#          sudo apt update
+#          sudo apt install -y curl wget unzip tar git gcc g++ maven default-jdk
+#      - name: Checkout repository
+#        uses: actions/checkout@v1
+#      - name: Build project
+#        run: |
+#          gcc --version
+#          mvn -version
+#          echo "<settings><servers><server><id>ossrh</id><username>${{ secrets.CI_DEPLOY_USERNAME }}</username><password>${{ secrets.CI_DEPLOY_PASSWORD }}</password></server></servers></settings>" > $HOME/.m2/settings.xml
+#          mvn clean install -pl '!tensorflow-framework' -B -U -e -Djavacpp.platform=${{ github.job }} -Djavacpp.platform.extension=${{ matrix.ext }}
+#      - name: Deploy native artifact
+#        if: env.DEPLOY_RELEASE == 'true' || env.DEPLOY_SNAPSHOT == 'true'
+#        run: mvn -f tensorflow-core/tensorflow-core-native/pom.xml deploy:deploy-file@native-only -B -e -Djavacpp.platform=${{ github.job }} -Djavacpp.platform.extension=${{ matrix.ext }} -Durl=${{ needs.prepare.outputs.repositoryUrl }}
   linux-x86_64:
     runs-on: ubuntu-20.04
     needs: prepare
@@ -178,32 +200,9 @@ jobs:
         run: |
           call mvn -f tensorflow-core/tensorflow-core-native/pom.xml deploy:deploy-file@native-only -B -e -Djavacpp.platform=${{ github.job }} -Djavacpp.platform.extension=${{ matrix.ext }} -Durl=${{ needs.prepare.outputs.repositoryUrl }}
           if ERRORLEVEL 1 exit /b
-  linux-arm64:
-    runs-on: linux-arm64-ubuntu2204
-    needs: prepare
-    strategy:
-       matrix:
-         ext: [""]
-    steps:
-      - name: Install environment
-        run: |
-          sudo apt update
-          sudo apt install -y curl wget unzip tar git gcc g++ maven default-jdk
-      - name: Checkout repository
-        uses: actions/checkout@v1
-      - name: Build project
-        run: |
-          gcc --version
-          mvn -version
-          echo "<settings><servers><server><id>ossrh</id><username>${{ secrets.CI_DEPLOY_USERNAME }}</username><password>${{ secrets.CI_DEPLOY_PASSWORD }}</password></server></servers></settings>" > $HOME/.m2/settings.xml
-          mvn clean install -pl '!tensorflow-framework' -B -U -e -Djavacpp.platform=${{ github.job }} -Djavacpp.platform.extension=${{ matrix.ext }}
-      - name: Deploy native artifact
-        if: env.DEPLOY_RELEASE == 'true' || env.DEPLOY_SNAPSHOT == 'true'
-        run: mvn -f tensorflow-core/tensorflow-core-native/pom.xml deploy:deploy-file@native-only -B -e -Djavacpp.platform=${{ github.job }} -Djavacpp.platform.extension=${{ matrix.ext }} -Durl=${{ needs.prepare.outputs.repositoryUrl }}
-
   deploy:
     if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/staging') }} # DEPLOY_SNAPSHOT (releases should be signed and deployed manually from local machine)
-    needs: [linux-x86_64, macosx-x86_64, windows-x86_64, macosx-arm64, linux-arm64]
+    needs: [linux-x86_64, macosx-x86_64, windows-x86_64, macosx-arm64] #, linux-arm64]
     runs-on: ubuntu-20.04
     steps:
       - name: Configure Java

tensorflow-core/tensorflow-core-native/pom.xml

@@ -669,6 +669,7 @@
               <minmemory>256m</minmemory>
               <maxmemory>2048m</maxmemory>
               <links>
+                <link>https://protobuf.dev/reference/java/api-docs</link>
                 <link>http://bytedeco.org/javacpp/apidocs</link>
               </links>
             </configuration>

tools/build_java_api_docs.py

@@ -13,14 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Generate TensorFlow Lite Java reference docs for TensorFlow.org."""
+"""Generate TensorFlow Java reference docs for TensorFlow.org."""
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
 import pathlib
 import shutil
 import tempfile
+from git import Repo
 
 from absl import app
 from absl import flags
@@ -48,6 +49,18 @@
 TOOLS_DIR = pathlib.Path(__file__).resolve().parent
 REPO_ROOT = TOOLS_DIR.parent
 
+
+def checkout_ndarray():
+  repo_url = 'https://github.com/tensorflow/java-ndarray'
+  local_repo_path = REPO_ROOT/'ndarray'
+  if not pathlib.Path(local_repo_path).exists():
+    local_repo = Repo.clone_from(repo_url, local_repo_path)
+  else:
+    local_repo = Repo(local_repo_path)
+  local_repo.remotes['origin'].fetch()
+  local_repo.git.checkout('v1.0.0')
+
+
 def overlay(from_root, to_root):
   for from_path in pathlib.Path(from_root).rglob('*'):
     relpath = from_path.relative_to(from_root)
@@ -58,24 +71,27 @@ def overlay(from_root, to_root):
     else:
       to_path.mkdir(exist_ok=True)
 
+
 def main(unused_argv):
+  checkout_ndarray()
   merged_source = pathlib.Path(tempfile.mkdtemp())
   (merged_source / 'java/org').mkdir(parents=True)
 
-  shutil.copytree(REPO_ROOT/'tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/',
-                  merged_source/'java/org/tensorflow')
-  overlay(REPO_ROOT/'tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow',
-            merged_source/'java/org/tensorflow')
-  shutil.copytree(REPO_ROOT/'tensorflow-framework/src/main/java/org/tensorflow/framework',
-                  merged_source/'java/org/tensorflow/framework')
-  shutil.copytree(REPO_ROOT/'ndarray/src/main/java/org/tensorflow/ndarray',
-                  merged_source/'java/org/tensorflow/ndarray')
+  shutil.copytree(REPO_ROOT/'tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/', merged_source/'java/org/tensorflow')
+  overlay(REPO_ROOT/'tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow', merged_source/'java/org/tensorflow')
+  shutil.copytree(REPO_ROOT/'tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/proto', merged_source/'java/org/tensorflow/proto')
+  shutil.copytree(REPO_ROOT/'tensorflow-core/tensorflow-core-native/src/main/java/org/tensorflow/exceptions', merged_source/'java/org/tensorflow/exceptions')
+  shutil.copytree(REPO_ROOT/'tensorflow-core/tensorflow-core-native/src/gen/java/org/tensorflow/internal/c_api', merged_source/'java/org/tensorflow/internal/c_api')
+  shutil.copytree(REPO_ROOT/'tensorflow-framework/src/main/java/org/tensorflow/framework', merged_source/'java/org/tensorflow/framework')
+  shutil.copytree(REPO_ROOT/'ndarray/ndarray/src/main/java/org/tensorflow/ndarray', merged_source/'java/org/tensorflow/ndarray')
 
   gen_java.gen_java_docs(
       package='org.tensorflow',
       source_path=merged_source / 'java',
       output_dir=pathlib.Path(FLAGS.output_dir),
-      site_path=pathlib.Path(FLAGS.site_path))
+      site_path=pathlib.Path(FLAGS.site_path),
+      script_path=pathlib.Path(REPO_ROOT/'tools/run-javadoc-for-tf.sh'), # FIXME use default one??
+  )
 
 
 if __name__ == '__main__':