Working on bazel protobuf generation.

Author: Craigacp

tensorflow-core/pom.xml

@@ -42,7 +42,7 @@
     https://github.com/tensorflow/tensorflow/blob/master/tensorflow/workspace2.bzl
     (but for the currently used release, not master)
     -->
-    <protobuf.version>3.21.9</protobuf.version>
+    <protobuf.version>4.28.3</protobuf.version>
 
     <native.classifier>${javacpp.platform}${javacpp.platform.extension}</native.classifier>
     <javacpp.platform.extension></javacpp.platform.extension>

tensorflow-core/tensorflow-core-native/.bazelversion

@@ -1,2 +1,2 @@
-7.7.0
+7.4.1
 # NOTE: Update Bazel version in tensorflow/tools/ci_build/release/common.sh.oss

tensorflow-core/tensorflow-core-native/BUILD

@@ -4,8 +4,6 @@ java_proto_library(
     name = "java_proto_gen_sources",
     deps = [
         "@org_tensorflow//tensorflow/core:protos_all",
-        "@local_xla//xla/tsl/protobuf:bfc_memory_map_proto",
-        "@local_xla//xla/tsl/protobuf:test_log_proto",
-        "@local_tsl//tsl/protobuf:protos_all"
+        "@local_xla//xla/tsl/protobuf:protos_all"
     ]
 )

tensorflow-core/tensorflow-core-native/WORKSPACE

@@ -37,15 +37,6 @@ http_archive(
     url = "https://github.com/bazelbuild/rules_shell/releases/download/v0.4.1/rules_shell-v0.4.1.tar.gz",
 )
 
-# We must initialize hermetic python first.
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-http_archive(
-    name = "rules_java",
-    sha256 = "c73336802d0b4882e40770666ad055212df4ea62cfa6edf9cb0f9d29828a0934",
-    url = "https://github.com/bazelbuild/rules_java/releases/download/5.3.5/rules_java-5.3.5.tar.gz",
-)
-
 # Initialize the TensorFlow repository and all dependencies.
 #
 # The cascade of load() statements and tf_workspace?() calls works around the
@@ -76,7 +67,7 @@ python_init_repositories(
         "tensorflow*",
         "tf_nightly*",
     ],
-    local_wheel_workspaces = ["//:WORKSPACE"],
+    local_wheel_workspaces = ["@org_tensorflow//:WORKSPACE"],
     requirements = {
         "3.9": "@org_tensorflow//:requirements_lock_3_9.txt",
         "3.10": "@org_tensorflow//:requirements_lock_3_10.txt",
@@ -113,32 +104,11 @@ tf_workspace0()
 
 load(
     "@local_xla//third_party/py:python_wheel.bzl",
-    "nvidia_wheel_versions_repository",
     "python_wheel_version_suffix_repository",
 )
 
-nvidia_wheel_versions_repository(
-    name = "nvidia_wheel_versions",
-    versions_source = "//ci/official/requirements_updater:nvidia-requirements.txt",
-)
-
 python_wheel_version_suffix_repository(name = "tf_wheel_version_suffix")
 
-load(
-    "@rules_ml_toolchain//cc/deps:cc_toolchain_deps.bzl",
-    "cc_toolchain_deps",
-)
-
-cc_toolchain_deps()
-
-register_toolchains("@rules_ml_toolchain//cc:linux_x86_64_linux_x86_64")
-
-register_toolchains("@rules_ml_toolchain//cc:linux_x86_64_linux_x86_64_cuda")
-
-register_toolchains("@rules_ml_toolchain//cc:linux_aarch64_linux_aarch64")
-
-register_toolchains("@rules_ml_toolchain//cc:linux_aarch64_linux_aarch64_cuda")
-
 load(
     "@rules_ml_toolchain//third_party/gpus/cuda/hermetic:cuda_json_init_repository.bzl",
     "cuda_json_init_repository",
@@ -205,3 +175,21 @@ load(
 nvshmem_redist_init_repository(
     nvshmem_redistributions = NVSHMEM_REDISTRIBUTIONS,
 )
+
+load(
+    "@rules_ml_toolchain//third_party/nvshmem/hermetic:nvshmem_configure.bzl",
+    "nvshmem_configure",
+)
+
+nvshmem_configure(name = "local_config_nvshmem")
+
+load(
+    "@rules_ml_toolchain//cc_toolchain/deps:cc_toolchain_deps.bzl",
+    "cc_toolchain_deps",
+)
+
+cc_toolchain_deps()
+
+register_toolchains("@rules_ml_toolchain//cc_toolchain:lx64_lx64")
+
+register_toolchains("@rules_ml_toolchain//cc_toolchain:lx64_lx64_cuda")

tensorflow-core/tensorflow-core-native/scripts/bazel_common.sh

@@ -2,7 +2,6 @@
 set -eu
 
 # Set generic Bazel build options
-export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
 export BAZEL_VC="${VCINSTALLDIR:-}"
 if [[ -d $BAZEL_VC ]]; then
     export BUILD_FLAGS="--output_user_root=$(cygpath -w $TMP) build"
@@ -16,7 +15,7 @@ fi
 if [[ "${PLATFORM:-}" == macosx-arm64 ]]; then
   BUILD_FLAGS="$BUILD_FLAGS --config=macos_arm64"
 fi
-BUILD_FLAGS="$BUILD_FLAGS --experimental_repo_remote_exec --python_path="$PYTHON_BIN_PATH" --output_filter=DONT_MATCH_ANYTHING --verbose_failures --distinct_host_configuration=true"
+BUILD_FLAGS="$BUILD_FLAGS --experimental_repo_remote_exec --python_path="$PYTHON_BIN_PATH" --output_filter=DONT_MATCH_ANYTHING --verbose_failures"
 
 export BAZEL_BIN=$(pwd -P)/bazel-bin
 export TENSORFLOW_BIN=$BAZEL_BIN/external/org_tensorflow/tensorflow

tensorflow-core/tensorflow-core-native/tensorflow.bazelrc

@@ -222,7 +222,7 @@ build:apple-toolchain --host_crosstool_top=@local_config_apple_cc//:toolchain
 # Settings for MacOS on ARM CPUs.
 build:macos_arm64 --cpu=darwin_arm64
 build:macos_arm64 --macos_minimum_os=11.0
-build:macos_arm64 --platforms=@build_bazel_apple_support//configs/platforms:darwin_arm64
+build:macos_arm64 --platforms=@build_bazel_apple_support//platforms:darwin_arm64
 
 # iOS configs for each architecture and the fat binary builds.
 build:ios --apple_platform_type=ios
@@ -234,16 +234,16 @@ build:ios_armv7 --cpu=ios_armv7
 build:ios_armv7 --platforms=@org_tensorflow//tensorflow/tools/toolchains/ios:ios_armv7
 build:ios_arm64 --config=ios
 build:ios_arm64 --cpu=ios_arm64
-build:ios_arm64 --platforms=@build_bazel_apple_support//configs/platforms:ios_arm64
+build:ios_arm64 --platforms=@build_bazel_apple_support//platforms:ios_arm64
 build:ios_arm64e --config=ios
 build:ios_arm64e --cpu=ios_arm64e
-build:ios_arm64e --platforms=@build_bazel_apple_support//configs/platforms:ios_arm64e
+build:ios_arm64e --platforms=@build_bazel_apple_support//platforms:ios_arm64e
 build:ios_sim_arm64 --config=ios
 build:ios_sim_arm64 --cpu=ios_sim_arm64
-build:ios_sim_arm64 --platforms=@build_bazel_apple_support//configs/platforms:ios_sim_arm64
+build:ios_sim_arm64 --platforms=@build_bazel_apple_support//platforms:ios_sim_arm64
 build:ios_x86_64 --config=ios
 build:ios_x86_64 --cpu=ios_x86_64
-build:ios_x86_64 --platforms=@build_bazel_apple_support//configs/platforms:ios_x86_64
+build:ios_x86_64 --platforms=@build_bazel_apple_support//platforms:ios_x86_64
 build:ios_fat --config=ios
 build:ios_fat --ios_multi_cpus=armv7,arm64,i386,x86_64