Tf update 04 2022 (#3535)

* Pin tf to 2c6d3ed00f16838831aa460c5668a8466b9f3649 * Update xla_client import according to tf changes * Overwrite deprecated bazel options, reset famework_shared_object, disable remote cache
pytorch · Jun 16, 2022 · 6c04ebf · 6c04ebf
1 parent 23496c5
commit 6c04ebf
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.circleci/common.sh b/.circleci/common.sh
@@ -92,8 +92,8 @@ function install_deps_pytorch_xla() {
     exit 1
   fi
   bazels3cache --bucket=${XLA_CLANG_CACHE_S3_BUCKET_NAME} --maxEntrySizeBytes=0 --logging.level=verbose
-  # Use cloud cache to build when available.
-  sed -i '/bazel build/ a --remote_http_cache=http://localhost:7777 \\' $XLA_DIR/build_torch_xla_libs.sh
+  # Uncomment to use cloud cache to build when available.
+  # sed -i '/bazel build/ a --remote_http_cache=http://localhost:7777 \\' $XLA_DIR/build_torch_xla_libs.sh
 
 }
 

diff --git a/build_torch_xla_libs.sh b/build_torch_xla_libs.sh
@@ -62,7 +62,7 @@ else
   cp -r -u -p $THIRD_PARTY_DIR/xla_client $THIRD_PARTY_DIR/tensorflow/tensorflow/compiler/xla/
 
   pushd $THIRD_PARTY_DIR/tensorflow
-  bazel build $MAX_JOBS $VERBOSE $TPUVM_FLAG --define framework_shared_object=false -c "$MODE" "${OPTS[@]}" \
+  bazel build $MAX_JOBS $VERBOSE $TPUVM_FLAG --spawn_strategy=sandboxed --define framework_shared_object=false -c "$MODE" "${OPTS[@]}" \
     $XLA_CUDA_CFG //tensorflow/compiler/xla/xla_client:libxla_computation_client.so
 
   popd

diff --git a/third_party/tensorflow b/third_party/tensorflow
diff --git a/third_party/xla_client/xrt_computation_client.cc b/third_party/xla_client/xrt_computation_client.cc
@@ -25,7 +25,7 @@
 #include "tensorflow/compiler/xrt/xrt_util.h"
 #include "tensorflow/core/framework/allocator.h"
 #include "tensorflow/core/profiler/lib/traceme.h"
-#include "tensorflow/core/tpu/tpu_api_dlsym_initializer.h"
+#include "tensorflow/core/tpu/tpu_initializer_helper.h"
 #include "tensorflow/core/util/device_name_utils.h"
 
 namespace xla {