Update paths to py_utils and repo_utils in local_python_runtime

Author: laramiel

bazel/repo_rules/local_python_runtime.bzl

@@ -32,12 +32,12 @@ and @rules_python/python/private/local_runtime_repo.bzl
 """
 
 load(
-    "//bazel/repo_rules:py_utils.bzl",
+    "//third_party/tensorstore/opensource_only/bazel/repo_rules:py_utils.bzl",
     "py_utils",
     _ENV_VARS = "ENV_VARS",
 )
 load(
-    "//bazel/repo_rules:repo_utils.bzl",
+    "//third_party/tensorstore/opensource_only/bazel/repo_rules:repo_utils.bzl",
     "repo_utils",
 )
 
@@ -86,13 +86,12 @@ def _expand_incompatible_template():
         abi3_libraries = "[]",
     )
 
-def _symlink_libraries(rctx, logger, subdir, libraries, shlib_suffix):
+def _symlink_libraries(rctx, logger, libraries, shlib_suffix):
     """Symlinks the shared libraries into the lib/ directory.
 
     Args:
         rctx: A repository_ctx object
         logger: A repo_utils.logger object
-        subdir: The subdirectory to symlink to. e.g. "lib"
         libraries: paths to libraries to attempt to symlink.
         shlib_suffix: Optional. Ensure that the generated symlinks end with this suffix.
     Returns:
@@ -112,9 +111,9 @@ def _symlink_libraries(rctx, logger, subdir, libraries, shlib_suffix):
             # of the runtime installation.
             continue
         if shlib_suffix and not origin.basename.endswith(shlib_suffix):
-            target = "{}/{}{}".format(subdir, origin.basename, shlib_suffix)
+            target = "lib/{}{}".format(origin.basename, shlib_suffix)
         else:
-            target = "{}/{}".format(subdir, origin.basename)
+            target = "lib/{}".format(origin.basename)
         logger.debug(lambda: "Symlinking {} to {}".format(origin, target))
         repo_utils.watch(rctx, origin)
         rctx.symlink(origin, target)
@@ -197,31 +196,30 @@ def _local_python_repo_impl(rctx):
     rctx.symlink(include_path, "include")
 
     rctx.report_progress("Symlinking external Python shared libraries")
+    additional_dlls = _symlink_libraries(rctx, logger, info["additional_dlls"], None)
 
     interface_library = None
-    libraries = _symlink_libraries(rctx, logger, "lib", info["dynamic_libraries"], info["shlib_suffix"])
+    libraries = _symlink_libraries(rctx, logger, info["dynamic_libraries"], info["shlib_suffix"])
     if libraries:
-        symlinked = _symlink_libraries(rctx, logger, "lib", info["interface_libraries"], None)
+        libraries.extend(additional_dlls)
+        symlinked = _symlink_libraries(rctx, logger, info["interface_libraries"], None)
         if symlinked:
             interface_library = symlinked[0]
     else:
-        libraries = _symlink_libraries(rctx, logger, "lib", info["static_libraries"], None)
+        libraries = _symlink_libraries(rctx, logger, info["static_libraries"], None)
         if not libraries:
             logger.info("No python libraries found.")
 
     abi3_interface_library = None
-    abi3_libraries = _symlink_libraries(rctx, logger, "lib", info["abi_dynamic_libraries"], info["shlib_suffix"])
+    abi3_libraries = _symlink_libraries(rctx, logger, info["abi_dynamic_libraries"], info["shlib_suffix"])
     if abi3_libraries:
-        symlinked = _symlink_libraries(rctx, logger, "lib", info["abi_interface_libraries"], None)
+        abi3_libraries.extend(additional_dlls)
+        symlinked = _symlink_libraries(rctx, logger, info["abi_interface_libraries"], None)
         if symlinked:
             abi3_interface_library = symlinked[0]
     else:
         logger.info("No abi3 python libraries found.")
 
-    # On Windows, we need to link to the additional DLLs.
-    if info["additional_dlls"]:
-        _symlink_libraries(rctx, logger, "dlls", info["additional_dlls"], None)
-
     os_name = repo_utils.get_platforms_os_name(rctx)
 
     build_bazel = _TOOLCHAIN_IMPL_TEMPLATE.format(
@@ -277,7 +275,7 @@ How to handle errors when trying to automatically determine settings.
     ),
     "_get_runtime_info": attr.label(
         allow_single_file = True,
-        default = Label("//bazel/repo_rules:get_local_runtime_info.py"),
+        default = Label("//third_party/tensorstore/opensource_only/bazel/repo_rules:get_local_runtime_info.py"),
     ),
 }