build: expose savedmodel loader headers on android

Author: Apricityx

scripts/patch_tfjava.py

@@ -1293,6 +1293,26 @@ def patch_workspace(path: Path) -> None:
 """
 
 
+TF_C_API_SAVED_MODEL_INCLUDE_PATCH = """--- a/tensorflow/c/c_api.cc
++++ b/tensorflow/c/c_api.cc
+@@ -29,11 +29,13 @@ limitations under the License.
+ #include "tensorflow/cc/framework/ops.h"
+ #include "tensorflow/cc/framework/scope_internal.h"
+ #include "tensorflow/cc/ops/while_loop.h"
+-#include "tensorflow/cc/saved_model/loader.h"
+ #include "tensorflow/core/distributed_runtime/server_lib.h"
+ #include "tensorflow/core/framework/logging.h"
+ #include "tensorflow/core/framework/op_gen_lib.h"
+ #endif  // !defined(IS_MOBILE_PLATFORM) && !defined(IS_SLIM_BUILD)
++#if !defined(IS_SLIM_BUILD)
++#include "tensorflow/cc/saved_model/loader.h"
++#endif  // !defined(IS_SLIM_BUILD)
+ #include "tensorflow/c/c_api_internal.h"
+ #include "tensorflow/c/tf_status_internal.h"
+ #include "tensorflow/c/tf_tensor.h"
+"""
+
+
 TF_C_API_SAVED_MODEL_ANDROID_PATCH = """--- a/tensorflow/c/c_api.cc
 +++ b/tensorflow/c/c_api.cc
 @@ -2189,11 +2189,11 @@
@@ -1520,6 +1540,7 @@ def write_tensorflow_android_absl_patch(path: Path) -> None:
     text += GRPC_SERVER_LIB_ANDROID_BUILD_PATCH
     text += GRPC_SERVER_LIB_ANDROID_CC_PATCH
     text += TF_C_API_EXPERIMENTAL_CC_PATCH
+    text += TF_C_API_SAVED_MODEL_INCLUDE_PATCH
     text += TF_C_API_SAVED_MODEL_ANDROID_PATCH
     text += SAVED_MODEL_ANDROID_LOADER_PATCH
     text += TENSORFLOW_FRAMEWORK_ANDROID_PATCH

scripts/wait_for_github_action.py

@@ -171,6 +171,7 @@ def main() -> int:
 
     start = time.monotonic()
     announced_waiting_for_run = False
+    last_error: str | None = None
     last_status: str | None = None
     target_run_id = args.run_id
 
@@ -180,32 +181,42 @@ def main() -> int:
             return 124
 
         run: dict[str, Any] | None
-        if target_run_id is not None:
-            run = fetch_run_by_id(args.repo, target_run_id)
-        else:
-            run = find_matching_run(
-                args.repo,
-                commit=args.commit,
-                branch=args.branch,
-                workflow=args.workflow,
-                event=args.event,
-            )
-            if run is None:
-                if not announced_waiting_for_run:
-                    print(
-                        "waiting for matching run: repo={repo} commit={commit} branch={branch} workflow={workflow} event={event}".format(
-                            repo=args.repo,
-                            commit=args.commit or "",
-                            branch=args.branch or "",
-                            workflow=args.workflow or "",
-                            event=args.event or "",
-                        ),
-                        flush=True,
-                    )
-                    announced_waiting_for_run = True
-                time.sleep(args.interval)
-                continue
-            target_run_id = int(run["databaseId"])
+        try:
+            if target_run_id is not None:
+                run = fetch_run_by_id(args.repo, target_run_id)
+            else:
+                run = find_matching_run(
+                    args.repo,
+                    commit=args.commit,
+                    branch=args.branch,
+                    workflow=args.workflow,
+                    event=args.event,
+                )
+                if run is None:
+                    if not announced_waiting_for_run:
+                        print(
+                            "waiting for matching run: repo={repo} commit={commit} branch={branch} workflow={workflow} event={event}".format(
+                                repo=args.repo,
+                                commit=args.commit or "",
+                                branch=args.branch or "",
+                                workflow=args.workflow or "",
+                                event=args.event or "",
+                            ),
+                            flush=True,
+                        )
+                        announced_waiting_for_run = True
+                    time.sleep(args.interval)
+                    continue
+                target_run_id = int(run["databaseId"])
+        except RuntimeError as exc:
+            message = str(exc)
+            if message != last_error:
+                print(f"transient gh error, retrying: {message}", file=sys.stderr, flush=True)
+                last_error = message
+            time.sleep(args.interval)
+            continue
+
+        last_error = None
 
         status = run["status"]
         if status != last_status: