diff --git a/k8s/europe-west4/storage/filestore.yaml b/k8s/europe-west4/storage/filestore.yaml index 70c7dd0c9..cea2ba99a 100644 --- a/k8s/europe-west4/storage/filestore.yaml +++ b/k8s/europe-west4/storage/filestore.yaml @@ -49,11 +49,11 @@ spec: - name: sync image: google/cloud-sdk command: - - gsutil - - -m + - gcloud + - storage - rsync - - -d - - -r + - --delete-unmatched-destination-objects + - --recursive - gs://xl-ml-test-filestore - /filestore volumeMounts: diff --git a/k8s/us-central1/storage/filestore.yaml b/k8s/us-central1/storage/filestore.yaml index a14ad5570..6760cebf0 100644 --- a/k8s/us-central1/storage/filestore.yaml +++ b/k8s/us-central1/storage/filestore.yaml @@ -49,11 +49,11 @@ spec: - name: sync image: google/cloud-sdk command: - - gsutil - - -m + - gcloud + - storage - rsync - - -d - - -r + - --delete-unmatched-destination-objects + - --recursive - gs://xl-ml-test-filestore - /filestore volumeMounts: diff --git a/k8s/us-central2/storage/filestore.yaml b/k8s/us-central2/storage/filestore.yaml index 7d7f596aa..154c41302 100644 --- a/k8s/us-central2/storage/filestore.yaml +++ b/k8s/us-central2/storage/filestore.yaml @@ -72,11 +72,11 @@ spec: - name: sync image: google/cloud-sdk command: - - gsutil - - -m + - gcloud + - storage - rsync - - -d - - -r + - --delete-unmatched-destination-objects + - --recursive - gs://xl-ml-test-filestore - /filestore volumeMounts: diff --git a/tests/jax/latest/common.libsonnet b/tests/jax/latest/common.libsonnet index f9fc37bd2..eb4178c3d 100644 --- a/tests/jax/latest/common.libsonnet +++ b/tests/jax/latest/common.libsonnet @@ -76,7 +76,7 @@ local tpus = import 'templates/tpus.libsonnet'; %(extraFlags)s # Upload files from worker 0, and ignore CommandException for the rest workers in TPU pod - gsutil -m cp -r ${OUTPUT_DIR} $(MODEL_DIR) || exit 0 + gcloud storage cp --recursive ${OUTPUT_DIR} $(MODEL_DIR) || exit 0 ||| % (self.scriptConfig { extraFlags: std.join(' ', config.extraFlags) }), }, } diff --git a/tests/jax/latest/flax-wmt-wmt17_translate.libsonnet b/tests/jax/latest/flax-wmt-wmt17_translate.libsonnet index db5be8a7e..ea737f90c 100644 --- a/tests/jax/latest/flax-wmt-wmt17_translate.libsonnet +++ b/tests/jax/latest/flax-wmt-wmt17_translate.libsonnet @@ -38,8 +38,8 @@ local tpus = import 'templates/tpus.libsonnet'; wmt_profiling:: wmt { local config = self, runTest+: ||| - gsutil -q stat $(MODEL_DIR)/plugins/profile/*/*.xplane.pb - gsutil cp -r $(MODEL_DIR)/plugins /tmp/ + gcloud storage objects list --stat --fetch-encrypted-object-hashes $(MODEL_DIR)/plugins/profile/*/*.xplane.pb + gcloud storage cp --recursive $(MODEL_DIR)/plugins /tmp/ python3 -m pip uninstall tensorboard_plugin_profile python3 -m pip install tbp-nightly python3 ~/.local/lib/python3.*/site-packages/tensorboard_plugin_profile/integration_tests/tpu/tensorflow/tpu_tf2_keras_test.* --log_directory=/tmp/ diff --git a/tests/pytorch/nightly/hf-glue.libsonnet b/tests/pytorch/nightly/hf-glue.libsonnet index dd42a6b6e..4d70c0b4a 100644 --- a/tests/pytorch/nightly/hf-glue.libsonnet +++ b/tests/pytorch/nightly/hf-glue.libsonnet @@ -28,7 +28,7 @@ local utils = import 'templates/utils.libsonnet'; pip install -r no_vision_require.txt |||, local command_copy_metrics = ||| - gsutil -m cp -r ./tensorboard-metrics/* $(MODEL_DIR) + gcloud storage cp --recursive ./tensorboard-metrics/* $(MODEL_DIR) |||, local hf_glue = self.hf_glue, hf_glue:: common.PyTorchTest { diff --git a/tests/pytorch/nightly/hf-llm.libsonnet b/tests/pytorch/nightly/hf-llm.libsonnet index 0e65ebd55..470d69608 100644 --- a/tests/pytorch/nightly/hf-llm.libsonnet +++ b/tests/pytorch/nightly/hf-llm.libsonnet @@ -20,7 +20,7 @@ local utils = import 'templates/utils.libsonnet'; { local command_copy_metrics = ||| - gsutil -m cp -r /tmp/test-clm/*.json $(MODEL_DIR) + gcloud storage cp --recursive /tmp/test-clm/*.json $(MODEL_DIR) |||, local gpt2_model = self.gpt2_model, @@ -116,8 +116,8 @@ local utils = import 'templates/utils.libsonnet'; pip install . git log -1 pip install datasets evaluate scikit-learn - gsutil cp -r gs://cloud-tpu-tpuvm-artifacts/config/xl-ml-test/pytorch/gpt2/my_config_*.json examples/pytorch/language-modeling/ - gsutil cp gs://cloud-tpu-tpuvm-artifacts/config/xl-ml-test/pytorch/gpt2/fsdp_config.json examples/pytorch/language-modeling/ + gcloud storage cp --recursive gs://cloud-tpu-tpuvm-artifacts/config/xl-ml-test/pytorch/gpt2/my_config_*.json examples/pytorch/language-modeling/ + gcloud storage cp gs://cloud-tpu-tpuvm-artifacts/config/xl-ml-test/pytorch/gpt2/fsdp_config.json examples/pytorch/language-modeling/ |||, }, }, diff --git a/tests/pytorch/r2.2/hf-glue.libsonnet b/tests/pytorch/r2.2/hf-glue.libsonnet index dd42a6b6e..4d70c0b4a 100644 --- a/tests/pytorch/r2.2/hf-glue.libsonnet +++ b/tests/pytorch/r2.2/hf-glue.libsonnet @@ -28,7 +28,7 @@ local utils = import 'templates/utils.libsonnet'; pip install -r no_vision_require.txt |||, local command_copy_metrics = ||| - gsutil -m cp -r ./tensorboard-metrics/* $(MODEL_DIR) + gcloud storage cp --recursive ./tensorboard-metrics/* $(MODEL_DIR) |||, local hf_glue = self.hf_glue, hf_glue:: common.PyTorchTest { diff --git a/tests/pytorch/r2.2/hf-llm.libsonnet b/tests/pytorch/r2.2/hf-llm.libsonnet index 0e65ebd55..470d69608 100644 --- a/tests/pytorch/r2.2/hf-llm.libsonnet +++ b/tests/pytorch/r2.2/hf-llm.libsonnet @@ -20,7 +20,7 @@ local utils = import 'templates/utils.libsonnet'; { local command_copy_metrics = ||| - gsutil -m cp -r /tmp/test-clm/*.json $(MODEL_DIR) + gcloud storage cp --recursive /tmp/test-clm/*.json $(MODEL_DIR) |||, local gpt2_model = self.gpt2_model, @@ -116,8 +116,8 @@ local utils = import 'templates/utils.libsonnet'; pip install . git log -1 pip install datasets evaluate scikit-learn - gsutil cp -r gs://cloud-tpu-tpuvm-artifacts/config/xl-ml-test/pytorch/gpt2/my_config_*.json examples/pytorch/language-modeling/ - gsutil cp gs://cloud-tpu-tpuvm-artifacts/config/xl-ml-test/pytorch/gpt2/fsdp_config.json examples/pytorch/language-modeling/ + gcloud storage cp --recursive gs://cloud-tpu-tpuvm-artifacts/config/xl-ml-test/pytorch/gpt2/my_config_*.json examples/pytorch/language-modeling/ + gcloud storage cp gs://cloud-tpu-tpuvm-artifacts/config/xl-ml-test/pytorch/gpt2/fsdp_config.json examples/pytorch/language-modeling/ |||, }, }, diff --git a/tests/tensorflow/experimental.libsonnet b/tests/tensorflow/experimental.libsonnet index 55988c5d2..1bfbed1aa 100644 --- a/tests/tensorflow/experimental.libsonnet +++ b/tests/tensorflow/experimental.libsonnet @@ -117,7 +117,7 @@ local mixins = import 'templates/mixins.libsonnet'; ssh -i scripts/id_rsa -o StrictHostKeyChecking=no xl-ml-test@$(cat /scripts/tpu_ip) \ 'docker run -i --rm --privileged -v "/gcs:/gcs" -v "$(LOCAL_OUTPUT_DIR):$(LOCAL_OUTPUT_DIR)" --entrypoint "" %(dockerArgs)s %(dockerImage)s '%(dockerCommand)s exit_code=$? - ssh -i scripts/id_rsa -o StrictHostKeyChecking=no xl-ml-test@$(cat /scripts/tpu_ip) 'gsutil -m cp -r $(LOCAL_OUTPUT_DIR) $(MODEL_DIR)' + ssh -i scripts/id_rsa -o StrictHostKeyChecking=no xl-ml-test@$(cat /scripts/tpu_ip) 'gcloud storage cp --recursive $(LOCAL_OUTPUT_DIR) $(MODEL_DIR)' bash /scripts/cleanup.sh exit $exit_code ||| % remoteScript,