diff --git a/eval.sh b/eval.sh index d6f04df55b457bb841aa85bb011c41fffb8ffb4e..e097904ca1408c4d0307c2b181be4ca317e90e60 100755 --- a/eval.sh +++ b/eval.sh @@ -41,11 +41,12 @@ if [ $USE_SEPARATE_CHANNELS == true ]; then fi if [ $USE_CLOUD == true ]; then + JOB_ID="eval_$JOB_ID" gcloud ml-engine jobs submit training "$JOB_ID" \ --stream-logs \ --module-name sciencebeam_gym.trainer.task \ --package-path sciencebeam_gym \ - --staging-bucket "$BUCKET" \ + --staging-bucket "$TEMP_BUCKET" \ --region us-central1 \ --runtime-version=1.2 \ -- \ diff --git a/predict.sh b/predict.sh index 38735cf764c7c53a266c748fa5fdede6369f4bcd..351325c3b32dee59c1c2e30fe58b416c90ed5922 100755 --- a/predict.sh +++ b/predict.sh @@ -55,7 +55,7 @@ if [ $USE_CLOUD == true ]; then --stream-logs \ --module-name sciencebeam_gym.trainer.task \ --package-path sciencebeam_gym \ - --staging-bucket "$BUCKET" \ + --staging-bucket "$TEMP_BUCKET" \ --region us-central1 \ --runtime-version=1.2 \ -- \ diff --git a/prepare-shell.sh b/prepare-shell.sh index 5f378b3a5dcfa7a3278828ab1c6b072df6551bf9..f13c3dc17ae434ca2c03086cf055c28260516129 100755 --- a/prepare-shell.sh +++ b/prepare-shell.sh @@ -11,6 +11,7 @@ TRAINING_ARGS="" PROJECT=$(gcloud config list project --format "value(core.project)") LOCAL_PATH_ROOT="./.models" BUCKET="gs://${PROJECT}-ml" +TEMP_BUCKET= COLOR_MAP_FILENAME="color_map.conf" USE_SEPARATE_CHANNELS=true DATASET_SUFFIX= @@ -61,6 +62,10 @@ if [ -z "$JOB_ID" ]; then JOB_ID="${DEFAULT_JOB_ID}" fi +if [ -z "$TEMP_BUCKET" ]; then + TEMP_BUCKET="${BUCKET}" +fi + # cloud paths GCS_SUB_PROJECT_PATH="${BUCKET}/${SUB_PROJECT_NAME}" GCS_PATH="${GCS_SUB_PROJECT_PATH}/${MODEL_NAME}/${VERSION_NAME}" diff --git a/save-model.sh b/save-model.sh index 03b4337684a29d82774b5ae3ed9422dfd2b93a38..68c36fc3b131d93b986cd1a88dd2b9af4d35dd6c 100755 --- a/save-model.sh +++ b/save-model.sh @@ -41,7 +41,7 @@ if [ $USE_CLOUD == true ]; then --stream-logs \ --module-name sciencebeam_gym.trainer.task \ --package-path sciencebeam_gym \ - --staging-bucket "$BUCKET" \ + --staging-bucket "$TEMP_BUCKET" \ --region us-central1 \ --runtime-version=1.2 \ -- \ diff --git a/train.sh b/train.sh index 6d466bf662bbbdd30f13a3b1d4c133f6baf8a813..1059d2f75773592a4ff919e706043529b075c417 100755 --- a/train.sh +++ b/train.sh @@ -39,7 +39,7 @@ if [ $USE_CLOUD == true ]; then --stream-logs \ --module-name sciencebeam_gym.trainer.task \ --package-path sciencebeam_gym \ - --staging-bucket "$BUCKET" \ + --staging-bucket "$TEMP_BUCKET" \ --region us-central1 \ --runtime-version=1.2 \ --scale-tier=BASIC_GPU \