feat: bump guidebook store and madwizard to pick up roberta

starpit · starpit · commit fb02caefe7b4 · 2022-08-27T14:58:12.000-04:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/plugins/plugin-madwizard/package.json b/plugins/plugin-madwizard/package.json
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "madwizard": "^0.21.0",
-    "@guidebooks/store": "^0.5.8"
+    "madwizard": "^0.21.2",
+    "@guidebooks/store": "^0.6.1"
   }
 }
diff --git a/tests/kind/profiles/gpu1/keep-it-simple b/tests/kind/profiles/gpu1/keep-it-simple
@@ -10,7 +10,7 @@
     "madwizard/apriori/mac-installer": "Homebrew",
     "madwizard/apriori/in-terminal": "HTML",
     "Start a new Run####Connect Dashboard to an existing Run####Boot up a Cloud Computer####Shut down a Cloud Computer": "Start a new Run",
-    "Training Demos####Fine Tuning Demos####Bring Your Own Code": "Bring Your Own Code",
+    "Run with CodeFlare Model Architecture####Bring Your Own Code####Demos": "Bring Your Own Code",
     "Location of your working directory": "{\"Location of your working directory\":\"tests/kind/inputs/ray-tune-tutorial\"}",
     "Provide custom base image, if any": "{\"Provide custom base image, if any\":\"rayproject/ray-ml:1.13.1-py37-gpu\"}",
     "AWS####IBM####My data is not stored in S3": "My data is not stored in S3",
diff --git a/tests/kind/profiles/gpu1/mcad-coscheduler b/tests/kind/profiles/gpu1/mcad-coscheduler
@@ -10,7 +10,7 @@
     "madwizard/apriori/mac-installer": "Homebrew",
     "madwizard/apriori/in-terminal": "HTML",
     "Start a new Run####Connect Dashboard to an existing Run####Boot up a Cloud Computer####Shut down a Cloud Computer": "Start a new Run",
-    "Training Demos####Fine Tuning Demos####Bring Your Own Code": "Bring Your Own Code",
+    "Run with CodeFlare Model Architecture####Bring Your Own Code####Demos": "Bring Your Own Code",
     "Location of your working directory": "{\"Location of your working directory\":\"tests/kind/inputs/ray-tune-tutorial\"}",
     "Provide custom base image, if any": "{\"Provide custom base image, if any\":\"rayproject/ray-ml:1.13.1-py37-gpu\"}",
     "AWS####IBM####My data is not stored in S3": "My data is not stored in S3",
diff --git a/tests/kind/profiles/gpu1/mcad-default b/tests/kind/profiles/gpu1/mcad-default
@@ -10,7 +10,7 @@
     "madwizard/apriori/mac-installer": "Homebrew",
     "madwizard/apriori/in-terminal": "HTML",
     "Start a new Run####Connect Dashboard to an existing Run####Boot up a Cloud Computer####Shut down a Cloud Computer": "Start a new Run",
-    "Training Demos####Fine Tuning Demos####Bring Your Own Code": "Bring Your Own Code",
+    "Run with CodeFlare Model Architecture####Bring Your Own Code####Demos": "Bring Your Own Code",
     "Location of your working directory": "{\"Location of your working directory\":\"tests/kind/inputs/ray-tune-tutorial\"}",
     "Provide custom base image, if any": "{\"Provide custom base image, if any\":\"rayproject/ray-ml:1.13.1-py37-gpu\"}",
     "AWS####IBM####My data is not stored in S3": "My data is not stored in S3",
diff --git a/tests/kind/profiles/gpu1/mcad-preinstalled b/tests/kind/profiles/gpu1/mcad-preinstalled
@@ -10,7 +10,7 @@
     "madwizard/apriori/mac-installer": "Homebrew",
     "madwizard/apriori/in-terminal": "HTML",
     "Start a new Run####Connect Dashboard to an existing Run####Boot up a Cloud Computer####Shut down a Cloud Computer": "Start a new Run",
-    "Training Demos####Fine Tuning Demos####Bring Your Own Code": "Bring Your Own Code",
+    "Run with CodeFlare Model Architecture####Bring Your Own Code####Demos": "Bring Your Own Code",
     "Location of your working directory": "{\"Location of your working directory\":\"tests/kind/inputs/ray-tune-tutorial\"}",
     "Provide custom base image, if any": "{\"Provide custom base image, if any\":\"rayproject/ray-ml:1.13.1-py37-gpu\"}",
     "AWS####IBM####My data is not stored in S3": "My data is not stored in S3",
diff --git a/tests/kind/profiles/gpu1/ray-autoscaler b/tests/kind/profiles/gpu1/ray-autoscaler
@@ -10,7 +10,7 @@
     "madwizard/apriori/mac-installer": "Homebrew",
     "madwizard/apriori/in-terminal": "HTML",
     "Start a new Run####Connect Dashboard to an existing Run####Boot up a Cloud Computer####Shut down a Cloud Computer": "Start a new Run",
-    "Training Demos####Fine Tuning Demos####Bring Your Own Code": "Bring Your Own Code",
+    "Run with CodeFlare Model Architecture####Bring Your Own Code####Demos": "Bring Your Own Code",
     "Location of your working directory": "{\"Location of your working directory\":\"tests/kind/inputs/ray-tune-tutorial\"}",
     "Provide custom base image, if any": "{\"Provide custom base image, if any\":\"rayproject/ray-ml:1.13.1-py37-gpu\"}",
     "AWS####IBM####My data is not stored in S3": "My data is not stored in S3",
diff --git a/tests/kind/profiles/non-gpu1/keep-it-simple b/tests/kind/profiles/non-gpu1/keep-it-simple
@@ -2,15 +2,15 @@
   "name": "keep-it-simple",
   "creationTime": 1660657756574,
   "lastModifiedTime": 1660658307175,
-  "lastUsedTime": 1661181259640,
+  "lastUsedTime": 1661620649166,
   "choices": {
     "madwizard/apriori/use-gpu": "don't use gpus",
     "madwizard/apriori/arch": "x64",
     "madwizard/apriori/platform": "darwin",
     "madwizard/apriori/mac-installer": "Homebrew",
     "madwizard/apriori/in-terminal": "HTML",
     "Start a new Run####Connect Dashboard to an existing Run####Boot up a Cloud Computer####Shut down a Cloud Computer": "Start a new Run",
-    "Training Demos####Fine Tuning Demos####Bring Your Own Code": "Bring Your Own Code",
+    "Run with CodeFlare Model Architecture####Bring Your Own Code####Demos": "Bring Your Own Code",
     "BERT####MLFlow Demo####Tensorboard Demo": "MLFlow Demo",
     "Location of your working directory": "{\"Location of your working directory\":\"tests/kind/inputs/qiskit\"}",
     "Provide custom base image, if any": "{\"Provide custom base image, if any\":\"rayproject/ray:1.13.1-py37\"}",
@@ -22,4 +22,4 @@
     "Number of CPUs####Number of GPUs####Minimum Workers####Maximum Workers####Worker Memory####Head Memory": "{\"Number of CPUs\":\"500m\",\"Number of GPUs\":\"0\",\"Minimum Workers\":\"1\",\"Maximum Workers\":\"1\",\"Worker Memory\":\"1.5Gi\",\"Head Memory\":\"1.5Gi\"}",
     "Keep It Simple####Use the Ray Autoscaler####Use the Multi-user Enhanced Kubernetes Scheduler": "Keep It Simple"
   }
-}
+}
diff --git a/tests/kind/profiles/non-gpu1/mcad-coscheduler b/tests/kind/profiles/non-gpu1/mcad-coscheduler
@@ -10,7 +10,7 @@
     "madwizard/apriori/mac-installer": "Homebrew",
     "madwizard/apriori/in-terminal": "HTML",
     "Start a new Run####Connect Dashboard to an existing Run####Boot up a Cloud Computer####Shut down a Cloud Computer": "Start a new Run",
-    "Training Demos####Fine Tuning Demos####Bring Your Own Code": "Bring Your Own Code",
+    "Run with CodeFlare Model Architecture####Bring Your Own Code####Demos": "Bring Your Own Code",
     "BERT####MLFlow Demo####Tensorboard Demo": "MLFlow Demo",
     "Location of your working directory": "{\"Location of your working directory\":\"tests/kind/inputs/qiskit\"}",
     "Provide custom base image, if any": "{\"Provide custom base image, if any\":\"rayproject/ray:1.13.1-py37\"}",
diff --git a/tests/kind/profiles/non-gpu1/mcad-default b/tests/kind/profiles/non-gpu1/mcad-default
@@ -10,7 +10,7 @@
     "madwizard/apriori/mac-installer": "Homebrew",
     "madwizard/apriori/in-terminal": "HTML",
     "Start a new Run####Connect Dashboard to an existing Run####Boot up a Cloud Computer####Shut down a Cloud Computer": "Start a new Run",
-    "Training Demos####Fine Tuning Demos####Bring Your Own Code": "Bring Your Own Code",
+    "Run with CodeFlare Model Architecture####Bring Your Own Code####Demos": "Bring Your Own Code",
     "BERT####MLFlow Demo####Tensorboard Demo": "MLFlow Demo",
     "Location of your working directory": "{\"Location of your working directory\":\"tests/kind/inputs/qiskit\"}",
     "Provide custom base image, if any": "{\"Provide custom base image, if any\":\"rayproject/ray:1.13.1-py37\"}",
diff --git a/tests/kind/profiles/non-gpu1/mcad-preinstalled b/tests/kind/profiles/non-gpu1/mcad-preinstalled
@@ -10,7 +10,7 @@
     "madwizard/apriori/mac-installer": "Homebrew",
     "madwizard/apriori/in-terminal": "HTML",
     "Start a new Run####Connect Dashboard to an existing Run####Boot up a Cloud Computer####Shut down a Cloud Computer": "Start a new Run",
-    "Training Demos####Fine Tuning Demos####Bring Your Own Code": "Bring Your Own Code",
+    "Run with CodeFlare Model Architecture####Bring Your Own Code####Demos": "Bring Your Own Code",
     "BERT####MLFlow Demo####Tensorboard Demo": "MLFlow Demo",
     "Location of your working directory": "{\"Location of your working directory\":\"tests/kind/inputs/qiskit\"}",
     "Provide custom base image, if any": "{\"Provide custom base image, if any\":\"rayproject/ray:1.13.1-py37\"}",
diff --git a/tests/kind/profiles/non-gpu1/ray-autoscaler b/tests/kind/profiles/non-gpu1/ray-autoscaler
@@ -10,7 +10,7 @@
     "madwizard/apriori/mac-installer": "Homebrew",
     "madwizard/apriori/in-terminal": "HTML",
     "Start a new Run####Connect Dashboard to an existing Run####Boot up a Cloud Computer####Shut down a Cloud Computer": "Start a new Run",
-    "Training Demos####Fine Tuning Demos####Bring Your Own Code": "Bring Your Own Code",
+    "Run with CodeFlare Model Architecture####Bring Your Own Code####Demos": "Bring Your Own Code",
     "BERT####MLFlow Demo####Tensorboard Demo": "MLFlow Demo",
     "Location of your working directory": "{\"Location of your working directory\":\"tests/kind/inputs/qiskit\"}",
     "Provide custom base image, if any": "{\"Provide custom base image, if any\":\"rayproject/ray:1.13.1-py37\"}",
diff --git a/tests/kind/profiles/non-gpu2/keep-it-simple b/tests/kind/profiles/non-gpu2/keep-it-simple
@@ -10,7 +10,7 @@
     "madwizard/apriori/mac-installer": "Homebrew",
     "madwizard/apriori/in-terminal": "HTML",
     "Start a new Run####Connect Dashboard to an existing Run####Boot up a Cloud Computer####Shut down a Cloud Computer": "Start a new Run",
-    "Training Demos####Fine Tuning Demos####Bring Your Own Code": "Bring Your Own Code",
+    "Run with CodeFlare Model Architecture####Bring Your Own Code####Demos": "Bring Your Own Code",
     "BERT####MLFlow Demo####Tensorboard Demo": "MLFlow Demo",
     "Location of your working directory": "{\"Location of your working directory\":\"tests/kind/inputs/qiskit-runtime-env-with-pips\"}",
     "Provide custom base image, if any": "{\"Provide custom base image, if any\":\"rayproject/ray:1.13.1-py37\"}",
diff --git a/tests/kind/profiles/non-gpu3/keep-it-simple b/tests/kind/profiles/non-gpu3/keep-it-simple
@@ -10,7 +10,7 @@
     "madwizard/apriori/mac-installer": "Homebrew",
     "madwizard/apriori/in-terminal": "HTML",
     "Start a new Run####Connect Dashboard to an existing Run####Boot up a Cloud Computer####Shut down a Cloud Computer": "Start a new Run",
-    "Training Demos####Fine Tuning Demos####Bring Your Own Code": "Bring Your Own Code",
+    "Run with CodeFlare Model Architecture####Bring Your Own Code####Demos": "Bring Your Own Code",
     "BERT####MLFlow Demo####Tensorboard Demo": "MLFlow Demo",
     "Location of your working directory": "{\"Location of your working directory\":\"tests/kind/inputs/qiskit-runtime-env-with-conda\"}",
     "Provide custom base image, if any": "{\"Provide custom base image, if any\":\"rayproject/ray:1.13.1-py37\"}",
diff --git a/tests/kind/run.sh b/tests/kind/run.sh
@@ -46,9 +46,11 @@ export CI=true
 # build docker image of log aggregator just for this test and load it
 # into kind
 function build {
-    export LOG_AGGREGATOR_IMAGE=codeflare-log-aggregator:test
-    FAST=true npm run build:docker:log-aggregator
-    kind load docker-image $LOG_AGGREGATOR_IMAGE --name $CLUSTER
+    if [ -n "$TEST_LOG_AGGREGATOR" ]; then
+        export LOG_AGGREGATOR_IMAGE=codeflare-log-aggregator:test
+        FAST=true npm run build:docker:log-aggregator
+        kind load docker-image $LOG_AGGREGATOR_IMAGE --name $CLUSTER
+    fi
 }
 
 #
@@ -78,15 +80,27 @@ function run {
     GUIDEBOOK_NAME="main-job-run" "$ROOT"/bin/codeflare -V -p $profile $yes $guidebook
 }
 
+# Undeploy any prior ray cluster
+function cleanup_ray {
+    local profileFull=$1
+    local variant=$(dirname $profileFull)
+    local profile=$(basename $profileFull)
+    export MWPROFILES_PATH="$MWPROFILES_PATH_BASE"/$variant
+
+    echo "[Test] Undeploying any prior ray cluster"
+    (GUIDEBOOK_NAME="ray-undeploy" "$ROOT"/bin/codeflare -p $profile -y ml/ray/stop/kubernetes \
+         || exit 0)
+}
+
 # Undeploy any prior log aggregator
-function cleanup {
+function cleanup_log_aggregator {
     local profileFull=$1
     local variant=$(dirname $profileFull)
     local profile=$(basename $profileFull)
     export MWPROFILES_PATH="$MWPROFILES_PATH_BASE"/$variant
 
-    echo "[Test] Undeploying any prior log aggregator"
-    (GUIDEBOOK_NAME="log-aggregator-undeploy" "$ROOT"/bin/codeflare -p $profile -y ml/ray/aggregator/in-cluster/client-side/undeploy \
+    echo "[Test] Undeploying any prior ray cluster"
+    (GUIDEBOOK_NAME="ray-undeploy" "$ROOT"/bin/codeflare -p $profile -y ml/ray/stop/kubernetes \
          || exit 0)
 }
 
@@ -216,13 +230,16 @@ function test {
     export JOB_ID=$(node -e 'console.log(require("uuid").v4())')
     echo "[Test] Using JOB_ID=$JOB_ID"
 
+    # 0. clean up prior ray clusters
+    cleanup_ray "$1"
+    
     # 1. launch codeflare guidebook run
     run "$1" | tee $OUTPUT &
     RUN_PID=$!
 
     # 2. if asked, attach a log aggregator
     if [ -n "$TEST_LOG_AGGREGATOR" ]; then
-        cleanup "$1"
+        cleanup_log_aggregator "$1"
 
         # wait to attach until the job has been submitted
         # while true; do

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`"access": "public"`
`24`	`24`	`},`
`25`	`25`	`"dependencies": {`
`26`		`- "madwizard": "^0.21.0",`
`27`		`- "@guidebooks/store": "^0.5.8"`
	`26`	`+ "madwizard": "^0.21.2",`
	`27`	`+ "@guidebooks/store": "^0.6.1"`
`28`	`28`	`}`
`29`	`29`	`}`