Merge branch 'tensorflow:master' into master

Author: Jerry-Ge

.bazelrc

@@ -755,7 +755,7 @@ build:tf_public_macos_cache_push --config=tf_public_macos_cache --remote_upload_
 # LIBTENSORFLOW TESTS are for building Libtensorflow archives. These are CUDA/CPU-agnostic.
 test:linux_libtensorflow_test --config=cuda_wheel -- //tensorflow/tools/lib_package:libtensorflow_test //tensorflow/tools/lib_package:libtensorflow_java_test
 build:linux_libtensorflow_build --config=cuda_wheel -- //tensorflow/tools/lib_package:libtensorflow.tar.gz //tensorflow/tools/lib_package:libtensorflow_jni.tar.gz //tensorflow/java:libtensorflow.jar //tensorflow/java:libtensorflow-src.jar //tensorflow/tools/lib_package:libtensorflow_proto.zip
-build:windows_libtensorflow_build --config=cuda_wheel --config=windows_x86_cpu -- //:LICENSE //tensorflow:tensorflow.dll //tensorflow:tensorflow_dll_import_lib //tensorflow/tools/lib_package:clicenses_generate //tensorflow/java:tensorflow_jni.dll //tensorflow/tools/lib_package:jnilicenses_generate
+build:windows_libtensorflow_build --config=cuda_wheel --config=windows_x86_cpu_2022 -- //:LICENSE //tensorflow:tensorflow.dll //tensorflow:tensorflow_dll_import_lib //tensorflow/tools/lib_package:clicenses_generate //tensorflow/java:tensorflow_jni.dll //tensorflow/tools/lib_package:jnilicenses_generate
 
 # PYTHON TESTS run a suite of Python tests intended for verifying that the Python wheel
 # will work properly. These are usually run Nightly or upon Release.

ci/official/envs/windows_x86_2022

@@ -18,6 +18,7 @@ TFCI_DOCKER_IMAGE="gcr.io/tensorflow-testing/tf-win2022@sha256:915cb093630432c38
 TFCI_BAZEL_BAZELRC_ARGS="--output_user_root=C:/t"
 TFCI_BAZEL_COMMON_ARGS="--repo_env=HERMETIC_PYTHON_VERSION=$TFCI_PYTHON_VERSION --config=windows_x86_cpu_2022"
 TFCI_BAZEL_TARGET_SELECTING_CONFIG_PREFIX=windows_x86_cpu_2022
+TFCI_BUILD_PIP_PACKAGE_ARGS="--repo_env=WHEEL_NAME=tensorflow_cpu"
 TFCI_OUTPUT_DIR=build_output
 TFCI_FIND_BIN=C:/tools/msys64/usr/bin/find.exe
 TFCI_LIB_SUFFIX="-cpu-windows-x86_64"

ci/official/libtensorflow.sh

@@ -22,7 +22,12 @@ fi
 
 # Update the version numbers for Nightly only
 if [[ "$TFCI_NIGHTLY_UPDATE_VERSION_ENABLE" == 1 ]]; then
-  tfrun python3 tensorflow/tools/ci_build/update_version.py --nightly
+  python_bin=python3
+  # TODO(belitskiy): Add a `python3` alias/symlink to Windows Docker image.
+  if [[ $(uname -s) = MSYS_NT* ]]; then
+    python_bin="python"
+  fi
+  tfrun "$python_bin" tensorflow/tools/ci_build/update_version.py --nightly
 fi
 
 if [[ $(uname -s) != MSYS_NT* ]]; then
@@ -36,5 +41,10 @@ tfrun bash ./ci/official/utilities/repack_libtensorflow.sh "$TFCI_OUTPUT_DIR" "$
 
 if [[ "$TFCI_ARTIFACT_STAGING_GCS_ENABLE" == 1 ]]; then
   # Note: -n disables overwriting previously created files.
-  gsutil cp "$TFCI_OUTPUT_DIR"/*.tar.gz "$TFCI_ARTIFACT_STAGING_GCS_URI"
+  # TODO(b/389744576): Remove when gsutil is made to work properly on MSYS2.
+  if [[ $(uname -s) != MSYS_NT* ]]; then
+    gsutil cp "$TFCI_OUTPUT_DIR"/*.tar.gz "$TFCI_ARTIFACT_STAGING_GCS_URI"
+  else
+    powershell -command "gsutil cp '$TFCI_OUTPUT_DIR/*.zip' '$TFCI_ARTIFACT_STAGING_GCS_URI'"
+  fi
 fi

ci/official/wheel.sh

@@ -22,7 +22,12 @@ fi
 
 # Update the version numbers for Nightly only
 if [[ "$TFCI_NIGHTLY_UPDATE_VERSION_ENABLE" == 1 ]]; then
-  tfrun python3 tensorflow/tools/ci_build/update_version.py --nightly
+  python_bin=python3
+  # TODO(belitskiy): Add a `python3` alias/symlink to Windows Docker image.
+  if [[ $(uname -s) = MSYS_NT* ]]; then
+    python_bin="python"
+  fi
+  tfrun "$python_bin" tensorflow/tools/ci_build/update_version.py --nightly
   # replace tensorflow to tf_nightly in the wheel name
   export TFCI_BUILD_PIP_PACKAGE_ARGS="$(echo $TFCI_BUILD_PIP_PACKAGE_ARGS | sed 's/tensorflow/tf_nightly/')"
 fi
@@ -42,7 +47,12 @@ tfrun bash ./ci/official/utilities/rename_and_verify_wheels.sh
 
 if [[ "$TFCI_ARTIFACT_STAGING_GCS_ENABLE" == 1 ]]; then
   # Note: -n disables overwriting previously created files.
-  gsutil cp -n "$TFCI_OUTPUT_DIR"/*.whl "$TFCI_ARTIFACT_STAGING_GCS_URI"
+  # TODO(b/389744576): Remove when gsutil is made to work properly on MSYS2.
+  if [[ $(uname -s) != MSYS_NT* ]]; then
+    gsutil cp -n "$TFCI_OUTPUT_DIR"/*.whl "$TFCI_ARTIFACT_STAGING_GCS_URI"
+  else
+    powershell -command "gsutil cp -n '$TFCI_OUTPUT_DIR/*.whl' '$TFCI_ARTIFACT_STAGING_GCS_URI'"
+  fi
 fi
 
 if [[ "$TFCI_WHL_BAZEL_TEST_ENABLE" == 1 ]]; then

tensorflow/c/eager/parallel_device/parallel_device.cc

@@ -15,8 +15,11 @@ limitations under the License.
 
 #include "tensorflow/c/eager/parallel_device/parallel_device.h"
 
-#include <cstring>
+#include <cstdint>
 #include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"

tensorflow/c/eager/parallel_device/parallel_device_lib.cc

@@ -15,8 +15,12 @@ limitations under the License.
 
 #include "tensorflow/c/eager/parallel_device/parallel_device_lib.h"
 
+#include <cstdint>
+#include <functional>
+#include <memory>
 #include <string>
 #include <utility>
+#include <vector>
 
 #include "absl/memory/memory.h"
 #include "absl/status/status.h"

tensorflow/c/eager/parallel_device/parallel_device_lib.h

@@ -16,6 +16,8 @@ limitations under the License.
 #ifndef TENSORFLOW_C_EAGER_PARALLEL_DEVICE_PARALLEL_DEVICE_LIB_H_
 #define TENSORFLOW_C_EAGER_PARALLEL_DEVICE_PARALLEL_DEVICE_LIB_H_
 
+#include <cstddef>
+#include <cstdint>
 #include <memory>
 #include <optional>
 #include <string>

tensorflow/c/eager/parallel_device/parallel_device_lib_test.cc

@@ -15,6 +15,12 @@ limitations under the License.
 
 #include "tensorflow/c/eager/parallel_device/parallel_device_lib.h"
 
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include <gmock/gmock.h>
 #include "absl/status/status.h"
 #include "tensorflow/c/c_api_experimental.h"

tensorflow/c/eager/parallel_device/parallel_device_test.cc

@@ -14,6 +14,9 @@ limitations under the License.
 ==============================================================================*/
 
 #include <array>
+#include <memory>
+#include <string>
+#include <vector>
 
 #include <gmock/gmock.h>
 #include "tensorflow/c/c_api.h"

tensorflow/c/eager/tape.h

@@ -174,8 +174,8 @@ class GradientTape {
   // is set to false.
   absl::Status ComputeGradient(
       const VSpace<Gradient, BackwardFunction, TapeTensor>& vspace,
-      const absl::Span<const int64_t> target_tensor_ids,
-      const absl::Span<const int64_t> source_tensor_ids,
+      absl::Span<const int64_t> target_tensor_ids,
+      absl::Span<const int64_t> source_tensor_ids,
       const std::unordered_map<int64, TapeTensor>& sources_that_are_targets,
       gtl::ArraySlice<Gradient*> output_gradients, absl::Span<Gradient*> result,
       bool build_default_zeros_grads = true);