From cd893cfb6a48a0917a1812148aead6ab956a3a8a Mon Sep 17 00:00:00 2001
From: Mark Daoust <markdaoust@google.com>
Date: Tue, 28 Apr 2020 14:31:16 -0700
Subject: [PATCH] Update java generator.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Add a "package" argument so it can be used for packages other than tensorflow.
- Use [-subpackages](https://docs.oracle.com/javase/7/docs/technotes/tools/solaris/javadoc.html) arg to make generaion recursive.
- Merge bazel generated op-source so ops docs are generated.

$> tree /tmp/gen_java

org/
└── tensorflow
    ├── DataType.html
    ├── EagerSession.DevicePlacementPolicy.html
    ├── EagerSession.html
    ├── EagerSession.Options.html
    ├── EagerSession.ResourceCleanupStrategy.html
    ├── examples
    │   ├── LabelImage.html
    │   └── package-summary.html
    ├── ExecutionEnvironment.html
    ├── Graph.html
    ├── GraphOperationBuilder.html
    ├── GraphOperation.html
    ├── Graph.WhileSubgraphBuilder.html
    ├── op
    │   ├── annotation
    │   │   ├── Operator.html
    │   │   └── package-summary.html
    │   ├── core
    │   │   ├── Abort.html
    │   │   ├── Abort.Options.html
    │   │   ├── All.html
    │   │   ├── All.Options.html
    │   │   ├── AllToAll.html
    │   │   ├── AnonymousIteratorV2.html
    │   │   ├── AnonymousMemoryCache.html
    │   │   ├── AnonymousMultiDeviceIterator.html
    │   │   ├── AnonymousRandomSeedGenerator.html
    │   │   ├── AnonymousSeedGenerator.html
    │   │   ├── Any.html
    │   │   ├── Any.Options.html
    │   │   ├── ApplyAdagradV2.html
    │   │   ├── ApplyAdagradV2.Options.html
    │   │   ├── AssertCardinalityDataset.html
    │   │   ├── AssertNextDataset.html
    │   │   ├── AssertThat.html
    │   │   ├── AssertThat.Options.html
   ...

PiperOrigin-RevId: 308898353
Change-Id: Idedd2283d205ae08d32c3dc48b3ec5adb6c15ac4
---
 tensorflow/tools/docs/build_java_api_docs.py | 25 +++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/tensorflow/tools/docs/build_java_api_docs.py b/tensorflow/tools/docs/build_java_api_docs.py
index f92d17fd6ee..343a561d225 100644
--- a/tensorflow/tools/docs/build_java_api_docs.py
+++ b/tensorflow/tools/docs/build_java_api_docs.py
@@ -19,6 +19,9 @@ from __future__ import division
 from __future__ import print_function
 
 import pathlib
+import shutil
+import subprocess
+import tempfile
 
 from absl import app
 from absl import flags
@@ -42,15 +45,31 @@ flags.DEFINE_bool(
     'search_hints', True,
     '[UNUSED] Include metadata search hints in the generated files')
 
+# Use this flag to disable bazel generation if you're not setup for it.
+flags.DEFINE_bool('gen_ops', True, 'enable/disable bazel-generated ops')
+
 # __file__ is the path to this file
 DOCS_TOOLS_DIR = pathlib.Path(__file__).resolve().parent
-TENSORFLOW_ROOT = DOCS_TOOLS_DIR.parent.parent
-SOURCE_PATH = TENSORFLOW_ROOT / 'java/src/main/java'
+TENSORFLOW_ROOT = DOCS_TOOLS_DIR.parents[2]
+SOURCE_PATH = TENSORFLOW_ROOT / 'tensorflow/java/src/main/java'
+OP_SOURCE_PATH = (
+    TENSORFLOW_ROOT /
+    'bazel-bin/tensorflow/java/ops/src/main/java/org/tensorflow/op')
 
 
 def main(unused_argv):
+  merged_source = pathlib.Path(tempfile.mkdtemp())
+  shutil.copytree(SOURCE_PATH, merged_source / 'java')
+
+  if FLAGS.gen_ops:
+    subprocess.check_call(
+        ['bazel', 'build', '//tensorflow/java:java_op_gen_sources'],
+        cwd=TENSORFLOW_ROOT)
+    shutil.copytree(OP_SOURCE_PATH, merged_source / 'java/org/tensorflow/ops')
+
   gen_java.gen_java_docs(
-      source_path=SOURCE_PATH,
+      package='org.tensorflow',
+      source_path=merged_source / 'java',
       output_dir=pathlib.Path(FLAGS.output_dir),
       site_path=pathlib.Path(FLAGS.site_path))