diff --git a/00_Miscellaneous/model_optimisation/Tutorial - TensorFlow Model Optimisation for Serving - MNIST with Keras.ipynb b/00_Miscellaneous/model_optimisation/Tutorial - TensorFlow Model Optimisation for Serving - MNIST with Keras.ipynb index f46d7b7..ad904b8 100644 --- a/00_Miscellaneous/model_optimisation/Tutorial - TensorFlow Model Optimisation for Serving - MNIST with Keras.ipynb +++ b/00_Miscellaneous/model_optimisation/Tutorial - TensorFlow Model Optimisation for Serving - MNIST with Keras.ipynb @@ -1249,7 +1249,7 @@ "source": [ "%%bash\n", "\n", - "gsutil -m rm -r gs://${BUCKET}/tf-model-optimisation" + "gcloud storage rm --recursive gs://${BUCKET}/tf-model-optimisation" ] }, { @@ -1265,7 +1265,7 @@ "\n", "echo ${saved_model_dir}\n", "\n", - "gsutil -m cp -r ${saved_model_dir} gs://${BUCKET}/tf-model-optimisation/original" + "gcloud storage cp --recursive ${saved_model_dir} gs://${BUCKET}/tf-model-optimisation/original" ] }, { @@ -1281,7 +1281,7 @@ "\n", "echo ${saved_model_dir}\n", "\n", - "gsutil -m cp -r ${saved_model_dir} gs://${BUCKET}/tf-model-optimisation" + "gcloud storage cp --recursive ${saved_model_dir} gs://${BUCKET}/tf-model-optimisation" ] }, { diff --git a/00_Miscellaneous/model_optimisation/Tutorial - TensorFlow Model Optimisation for Serving - MNIST.ipynb b/00_Miscellaneous/model_optimisation/Tutorial - TensorFlow Model Optimisation for Serving - MNIST.ipynb index 11830d5..5136423 100644 --- a/00_Miscellaneous/model_optimisation/Tutorial - TensorFlow Model Optimisation for Serving - MNIST.ipynb +++ b/00_Miscellaneous/model_optimisation/Tutorial - TensorFlow Model Optimisation for Serving - MNIST.ipynb @@ -1298,7 +1298,7 @@ "source": [ "%%bash\n", "\n", - "gsutil -m rm -r gs://${BUCKET}/tf-model-optimisation" + "gcloud storage rm --recursive gs://${BUCKET}/tf-model-optimisation" ] }, { @@ -1314,7 +1314,7 @@ "\n", "echo ${saved_model_dir}\n", "\n", - "gsutil -m cp -r ${saved_model_dir} gs://${BUCKET}/tf-model-optimisation/original" + "gcloud storage cp --recursive ${saved_model_dir} gs://${BUCKET}/tf-model-optimisation/original" ] }, { @@ -1330,7 +1330,7 @@ "\n", "echo ${saved_model_dir}\n", "\n", - "gsutil -m cp -r ${saved_model_dir} gs://${BUCKET}/tf-model-optimisation" + "gcloud storage cp --recursive ${saved_model_dir} gs://${BUCKET}/tf-model-optimisation" ] }, { diff --git a/00_Miscellaneous/tf_train_eval_export/Tutorial - Optimising Learning Rate.ipynb b/00_Miscellaneous/tf_train_eval_export/Tutorial - Optimising Learning Rate.ipynb index 78da17a..68dd268 100644 --- a/00_Miscellaneous/tf_train_eval_export/Tutorial - Optimising Learning Rate.ipynb +++ b/00_Miscellaneous/tf_train_eval_export/Tutorial - Optimising Learning Rate.ipynb @@ -44,14 +44,14 @@ }, { "cell_type": "code", - "execution_count": 2, + "execution_count": null, "metadata": {}, "outputs": [], "source": [ "DATA_DIR='data'\n", "# !mkdir $DATA_DIR\n", - "# !gsutil cp gs://cloud-samples-data/ml-engine/census/data/adult.data.csv $DATA_DIR\n", - "# !gsutil cp gs://cloud-samples-data/ml-engine/census/data/adult.test.csv $DATA_DIR\n", + "# !gcloud storage cp gs://cloud-samples-data/ml-engine/census/data/adult.data.csv $DATA_DIR\n", + "# !gcloud storage cp gs://cloud-samples-data/ml-engine/census/data/adult.test.csv $DATA_DIR\n", "TRAIN_DATA_FILE = os.path.join(DATA_DIR, 'adult.data.csv')\n", "EVAL_DATA_FILE = os.path.join(DATA_DIR, 'adult.test.csv')" ] diff --git a/00_Miscellaneous/tf_train_eval_export/Tutorial - TensorFlow from Estimators to Keras.ipynb b/00_Miscellaneous/tf_train_eval_export/Tutorial - TensorFlow from Estimators to Keras.ipynb index 0c99a8a..1c5ddb9 100644 --- a/00_Miscellaneous/tf_train_eval_export/Tutorial - TensorFlow from Estimators to Keras.ipynb +++ b/00_Miscellaneous/tf_train_eval_export/Tutorial - TensorFlow from Estimators to Keras.ipynb @@ -68,8 +68,8 @@ "source": [ "DATA_DIR='data'\n", "!mkdir $DATA_DIR\n", - "!gsutil cp gs://cloud-samples-data/ml-engine/census/data/adult.data.csv $DATA_DIR\n", - "!gsutil cp gs://cloud-samples-data/ml-engine/census/data/adult.test.csv $DATA_DIR\n", + "!gcloud storage cp gs://cloud-samples-data/ml-engine/census/data/adult.data.csv $DATA_DIR\n", + "!gcloud storage cp gs://cloud-samples-data/ml-engine/census/data/adult.test.csv $DATA_DIR\n", "TRAIN_DATA_FILE = os.path.join(DATA_DIR, 'adult.data.csv')\n", "EVAL_DATA_FILE = os.path.join(DATA_DIR, 'adult.test.csv')" ] diff --git a/00_Miscellaneous/tfx/02_tfx_end_to_end.ipynb b/00_Miscellaneous/tfx/02_tfx_end_to_end.ipynb index 90413da..ae752bb 100644 --- a/00_Miscellaneous/tfx/02_tfx_end_to_end.ipynb +++ b/00_Miscellaneous/tfx/02_tfx_end_to_end.ipynb @@ -59,9 +59,7 @@ "outputs": [], "source": [ "!mkdir $DATA_DIR\n", - "!gsutil cp gs://cloud-samples-data/ml-engine/census/data/adult.data.csv $DATA_DIR\n", - "!gsutil cp gs://cloud-samples-data/ml-engine/census/data/adult.test.csv $DATA_DIR" - ] + "!gcloud storage cp gs://cloud-samples-data/ml-engine/census/data/adult.data.csv $DATA_DIR\n", "!gcloud storage cp gs://cloud-samples-data/ml-engine/census/data/adult.test.csv $DATA_DIR" ] }, { "cell_type": "code", diff --git a/00_Miscellaneous/tfx/tfx-pipelines/01-census-data-analysis.ipynb b/00_Miscellaneous/tfx/tfx-pipelines/01-census-data-analysis.ipynb index fd1ba8c..dd28cf1 100644 --- a/00_Miscellaneous/tfx/tfx-pipelines/01-census-data-analysis.ipynb +++ b/00_Miscellaneous/tfx/tfx-pipelines/01-census-data-analysis.ipynb @@ -39,7 +39,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": null, "metadata": {}, "outputs": [ { @@ -58,8 +58,8 @@ "source": [ "!mkdir $DATA_DIR\n", "!mkdir $TRAIN_DATA_DIR\n", - "!gsutil cp gs://cloud-samples-data/ml-engine/census/data/adult.data.csv $DATA_DIR\n", - "!gsutil cp gs://cloud-samples-data/ml-engine/census/data/adult.test.csv $DATA_DIR" + "!gcloud storage cp gs://cloud-samples-data/ml-engine/census/data/adult.data.csv $DATA_DIR\n", + "!gcloud storage cp gs://cloud-samples-data/ml-engine/census/data/adult.test.csv $DATA_DIR" ] }, { diff --git a/07_Image_Analysis/02.0 - CNN with CIFAR-10 tfrecords dataset.ipynb b/07_Image_Analysis/02.0 - CNN with CIFAR-10 tfrecords dataset.ipynb index 1c1ba88..54ae168 100644 --- a/07_Image_Analysis/02.0 - CNN with CIFAR-10 tfrecords dataset.ipynb +++ b/07_Image_Analysis/02.0 - CNN with CIFAR-10 tfrecords dataset.ipynb @@ -644,9 +644,9 @@ " print response['serviceAccount']\")\n", "\n", "echo \"Authorizing the Cloud ML Service account $SVC_ACCOUNT to access files in $BUCKET\"\n", - "gsutil -m defacl ch -u $SVC_ACCOUNT:R gs://$BUCKET\n", - "gsutil -m acl ch -u $SVC_ACCOUNT:R -r gs://$BUCKET # error message (if bucket is empty) can be ignored\n", - "gsutil -m acl ch -u $SVC_ACCOUNT:W gs://$BUCKET" + "gcloud storage buckets update gs://$BUCKET --add-default-object-acl-grant=entity=user-$SVC_ACCOUNT,role=READER\n", + "gcloud storage objects update gs://$BUCKET/** --add-acl-grant=entity=user-$SVC_ACCOUNT,role=READER # error message (if bucket is empty) can be ignored\n", + "gcloud storage buckets update gs://$BUCKET --add-acl-grant=entity=user-$SVC_ACCOUNT,role=WRITER" ] }, { @@ -665,8 +665,8 @@ "%%bash\n", "\n", "echo ${BUCKET}\n", - "gsutil -m rm -rf gs://${BUCKET}/cifar-10\n", - "gsutil -m cp cifar-10/*.tfrecords gs://${BUCKET}/cifar-10" + "gcloud storage rm --recursive --continue-on-error gs://${BUCKET}/cifar-10\n", + "gcloud storage cp cifar-10/*.tfrecords gs://${BUCKET}/cifar-10" ] }, { @@ -687,7 +687,7 @@ "JOBNAME=sm_$(date -u +%y%m%d_%H%M%S)\n", "echo $OUTDIR $REGION $JOBNAME\n", "\n", - "gsutil -m rm -rf $OUTDIR\n", + "gcloud storage rm --recursive --continue-on-error $OUTDIR\n", "gcloud ml-engine jobs submit training $JOBNAME \\\n", " --region=$REGION \\\n", " --module-name=cnn-model-02.task \\\n", @@ -715,7 +715,7 @@ "JOBNAME=sm_$(date -u +%y%m%d_%H%M%S)\n", "echo $OUTDIR $REGION $JOBNAME\n", "\n", - "gsutil -m rm -rf $OUTDIR\n", + "gcloud storage rm --recursive --continue-on-error $OUTDIR\n", "gcloud ml-engine jobs submit training $JOBNAME \\\n", " --region=$REGION \\\n", " --module-name=cnn-model-02.task \\\n", diff --git a/08_Text_Analysis/07 - Text Similarity Analysis with tf.transform - tf.hub - Dataflow - BigQuery.ipynb b/08_Text_Analysis/07 - Text Similarity Analysis with tf.transform - tf.hub - Dataflow - BigQuery.ipynb index 3c2755d..3242162 100644 --- a/08_Text_Analysis/07 - Text Similarity Analysis with tf.transform - tf.hub - Dataflow - BigQuery.ipynb +++ b/08_Text_Analysis/07 - Text Similarity Analysis with tf.transform - tf.hub - Dataflow - BigQuery.ipynb @@ -84,13 +84,13 @@ }, { "cell_type": "code", - "execution_count": 2, + "execution_count": null, "metadata": {}, "outputs": [], "source": [ "# %%bash \n", "\n", - "# gsutil cp gs://cloudml-textanalysis/data/reuters.tar.gz ./data\n", + "# gcloud storage cp gs://cloudml-textanalysis/data/reuters.tar.gz ./data\n", "# gunzip -c data/reuters.tar.gz | tar xopf -" ] },