Skip to content

Commit fb02cae

Browse files
starpitstarpit
committed
feat: bump guidebook store and madwizard to pick up roberta
1 parent 37fde44 commit fb02cae

15 files changed

+57
-40
lines changed

Diff for: ‎package-lock.json

+17-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎plugins/plugin-madwizard/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"access": "public"
2424
},
2525
"dependencies": {
26-
"madwizard": "^0.21.0",
27-
"@guidebooks/store": "^0.5.8"
26+
"madwizard": "^0.21.2",
27+
"@guidebooks/store": "^0.6.1"
2828
}
2929
}

Diff for: ‎tests/kind/profiles/gpu1/keep-it-simple

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"madwizard/apriori/mac-installer": "Homebrew",
1111
"madwizard/apriori/in-terminal": "HTML",
1212
"Start a new Run####Connect Dashboard to an existing Run####Boot up a Cloud Computer####Shut down a Cloud Computer": "Start a new Run",
13-
"Training Demos####Fine Tuning Demos####Bring Your Own Code": "Bring Your Own Code",
13+
"Run with CodeFlare Model Architecture####Bring Your Own Code####Demos": "Bring Your Own Code",
1414
"Location of your working directory": "{\"Location of your working directory\":\"tests/kind/inputs/ray-tune-tutorial\"}",
1515
"Provide custom base image, if any": "{\"Provide custom base image, if any\":\"rayproject/ray-ml:1.13.1-py37-gpu\"}",
1616
"AWS####IBM####My data is not stored in S3": "My data is not stored in S3",

Diff for: ‎tests/kind/profiles/gpu1/mcad-coscheduler

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"madwizard/apriori/mac-installer": "Homebrew",
1111
"madwizard/apriori/in-terminal": "HTML",
1212
"Start a new Run####Connect Dashboard to an existing Run####Boot up a Cloud Computer####Shut down a Cloud Computer": "Start a new Run",
13-
"Training Demos####Fine Tuning Demos####Bring Your Own Code": "Bring Your Own Code",
13+
"Run with CodeFlare Model Architecture####Bring Your Own Code####Demos": "Bring Your Own Code",
1414
"Location of your working directory": "{\"Location of your working directory\":\"tests/kind/inputs/ray-tune-tutorial\"}",
1515
"Provide custom base image, if any": "{\"Provide custom base image, if any\":\"rayproject/ray-ml:1.13.1-py37-gpu\"}",
1616
"AWS####IBM####My data is not stored in S3": "My data is not stored in S3",

Diff for: ‎tests/kind/profiles/gpu1/mcad-default

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"madwizard/apriori/mac-installer": "Homebrew",
1111
"madwizard/apriori/in-terminal": "HTML",
1212
"Start a new Run####Connect Dashboard to an existing Run####Boot up a Cloud Computer####Shut down a Cloud Computer": "Start a new Run",
13-
"Training Demos####Fine Tuning Demos####Bring Your Own Code": "Bring Your Own Code",
13+
"Run with CodeFlare Model Architecture####Bring Your Own Code####Demos": "Bring Your Own Code",
1414
"Location of your working directory": "{\"Location of your working directory\":\"tests/kind/inputs/ray-tune-tutorial\"}",
1515
"Provide custom base image, if any": "{\"Provide custom base image, if any\":\"rayproject/ray-ml:1.13.1-py37-gpu\"}",
1616
"AWS####IBM####My data is not stored in S3": "My data is not stored in S3",

Diff for: ‎tests/kind/profiles/gpu1/mcad-preinstalled

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"madwizard/apriori/mac-installer": "Homebrew",
1111
"madwizard/apriori/in-terminal": "HTML",
1212
"Start a new Run####Connect Dashboard to an existing Run####Boot up a Cloud Computer####Shut down a Cloud Computer": "Start a new Run",
13-
"Training Demos####Fine Tuning Demos####Bring Your Own Code": "Bring Your Own Code",
13+
"Run with CodeFlare Model Architecture####Bring Your Own Code####Demos": "Bring Your Own Code",
1414
"Location of your working directory": "{\"Location of your working directory\":\"tests/kind/inputs/ray-tune-tutorial\"}",
1515
"Provide custom base image, if any": "{\"Provide custom base image, if any\":\"rayproject/ray-ml:1.13.1-py37-gpu\"}",
1616
"AWS####IBM####My data is not stored in S3": "My data is not stored in S3",

Diff for: ‎tests/kind/profiles/gpu1/ray-autoscaler

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"madwizard/apriori/mac-installer": "Homebrew",
1111
"madwizard/apriori/in-terminal": "HTML",
1212
"Start a new Run####Connect Dashboard to an existing Run####Boot up a Cloud Computer####Shut down a Cloud Computer": "Start a new Run",
13-
"Training Demos####Fine Tuning Demos####Bring Your Own Code": "Bring Your Own Code",
13+
"Run with CodeFlare Model Architecture####Bring Your Own Code####Demos": "Bring Your Own Code",
1414
"Location of your working directory": "{\"Location of your working directory\":\"tests/kind/inputs/ray-tune-tutorial\"}",
1515
"Provide custom base image, if any": "{\"Provide custom base image, if any\":\"rayproject/ray-ml:1.13.1-py37-gpu\"}",
1616
"AWS####IBM####My data is not stored in S3": "My data is not stored in S3",

Diff for: ‎tests/kind/profiles/non-gpu1/keep-it-simple

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
"name": "keep-it-simple",
33
"creationTime": 1660657756574,
44
"lastModifiedTime": 1660658307175,
5-
"lastUsedTime": 1661181259640,
5+
"lastUsedTime": 1661620649166,
66
"choices": {
77
"madwizard/apriori/use-gpu": "don't use gpus",
88
"madwizard/apriori/arch": "x64",
99
"madwizard/apriori/platform": "darwin",
1010
"madwizard/apriori/mac-installer": "Homebrew",
1111
"madwizard/apriori/in-terminal": "HTML",
1212
"Start a new Run####Connect Dashboard to an existing Run####Boot up a Cloud Computer####Shut down a Cloud Computer": "Start a new Run",
13-
"Training Demos####Fine Tuning Demos####Bring Your Own Code": "Bring Your Own Code",
13+
"Run with CodeFlare Model Architecture####Bring Your Own Code####Demos": "Bring Your Own Code",
1414
"BERT####MLFlow Demo####Tensorboard Demo": "MLFlow Demo",
1515
"Location of your working directory": "{\"Location of your working directory\":\"tests/kind/inputs/qiskit\"}",
1616
"Provide custom base image, if any": "{\"Provide custom base image, if any\":\"rayproject/ray:1.13.1-py37\"}",
@@ -22,4 +22,4 @@
2222
"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\"}",
2323
"Keep It Simple####Use the Ray Autoscaler####Use the Multi-user Enhanced Kubernetes Scheduler": "Keep It Simple"
2424
}
25-
}
25+
}

Diff for: ‎tests/kind/profiles/non-gpu1/mcad-coscheduler

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"madwizard/apriori/mac-installer": "Homebrew",
1111
"madwizard/apriori/in-terminal": "HTML",
1212
"Start a new Run####Connect Dashboard to an existing Run####Boot up a Cloud Computer####Shut down a Cloud Computer": "Start a new Run",
13-
"Training Demos####Fine Tuning Demos####Bring Your Own Code": "Bring Your Own Code",
13+
"Run with CodeFlare Model Architecture####Bring Your Own Code####Demos": "Bring Your Own Code",
1414
"BERT####MLFlow Demo####Tensorboard Demo": "MLFlow Demo",
1515
"Location of your working directory": "{\"Location of your working directory\":\"tests/kind/inputs/qiskit\"}",
1616
"Provide custom base image, if any": "{\"Provide custom base image, if any\":\"rayproject/ray:1.13.1-py37\"}",

Diff for: ‎tests/kind/profiles/non-gpu1/mcad-default

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"madwizard/apriori/mac-installer": "Homebrew",
1111
"madwizard/apriori/in-terminal": "HTML",
1212
"Start a new Run####Connect Dashboard to an existing Run####Boot up a Cloud Computer####Shut down a Cloud Computer": "Start a new Run",
13-
"Training Demos####Fine Tuning Demos####Bring Your Own Code": "Bring Your Own Code",
13+
"Run with CodeFlare Model Architecture####Bring Your Own Code####Demos": "Bring Your Own Code",
1414
"BERT####MLFlow Demo####Tensorboard Demo": "MLFlow Demo",
1515
"Location of your working directory": "{\"Location of your working directory\":\"tests/kind/inputs/qiskit\"}",
1616
"Provide custom base image, if any": "{\"Provide custom base image, if any\":\"rayproject/ray:1.13.1-py37\"}",

Diff for: ‎tests/kind/profiles/non-gpu1/mcad-preinstalled

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"madwizard/apriori/mac-installer": "Homebrew",
1111
"madwizard/apriori/in-terminal": "HTML",
1212
"Start a new Run####Connect Dashboard to an existing Run####Boot up a Cloud Computer####Shut down a Cloud Computer": "Start a new Run",
13-
"Training Demos####Fine Tuning Demos####Bring Your Own Code": "Bring Your Own Code",
13+
"Run with CodeFlare Model Architecture####Bring Your Own Code####Demos": "Bring Your Own Code",
1414
"BERT####MLFlow Demo####Tensorboard Demo": "MLFlow Demo",
1515
"Location of your working directory": "{\"Location of your working directory\":\"tests/kind/inputs/qiskit\"}",
1616
"Provide custom base image, if any": "{\"Provide custom base image, if any\":\"rayproject/ray:1.13.1-py37\"}",

Diff for: ‎tests/kind/profiles/non-gpu1/ray-autoscaler

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"madwizard/apriori/mac-installer": "Homebrew",
1111
"madwizard/apriori/in-terminal": "HTML",
1212
"Start a new Run####Connect Dashboard to an existing Run####Boot up a Cloud Computer####Shut down a Cloud Computer": "Start a new Run",
13-
"Training Demos####Fine Tuning Demos####Bring Your Own Code": "Bring Your Own Code",
13+
"Run with CodeFlare Model Architecture####Bring Your Own Code####Demos": "Bring Your Own Code",
1414
"BERT####MLFlow Demo####Tensorboard Demo": "MLFlow Demo",
1515
"Location of your working directory": "{\"Location of your working directory\":\"tests/kind/inputs/qiskit\"}",
1616
"Provide custom base image, if any": "{\"Provide custom base image, if any\":\"rayproject/ray:1.13.1-py37\"}",

Diff for: ‎tests/kind/profiles/non-gpu2/keep-it-simple

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"madwizard/apriori/mac-installer": "Homebrew",
1111
"madwizard/apriori/in-terminal": "HTML",
1212
"Start a new Run####Connect Dashboard to an existing Run####Boot up a Cloud Computer####Shut down a Cloud Computer": "Start a new Run",
13-
"Training Demos####Fine Tuning Demos####Bring Your Own Code": "Bring Your Own Code",
13+
"Run with CodeFlare Model Architecture####Bring Your Own Code####Demos": "Bring Your Own Code",
1414
"BERT####MLFlow Demo####Tensorboard Demo": "MLFlow Demo",
1515
"Location of your working directory": "{\"Location of your working directory\":\"tests/kind/inputs/qiskit-runtime-env-with-pips\"}",
1616
"Provide custom base image, if any": "{\"Provide custom base image, if any\":\"rayproject/ray:1.13.1-py37\"}",

Diff for: ‎tests/kind/profiles/non-gpu3/keep-it-simple

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"madwizard/apriori/mac-installer": "Homebrew",
1111
"madwizard/apriori/in-terminal": "HTML",
1212
"Start a new Run####Connect Dashboard to an existing Run####Boot up a Cloud Computer####Shut down a Cloud Computer": "Start a new Run",
13-
"Training Demos####Fine Tuning Demos####Bring Your Own Code": "Bring Your Own Code",
13+
"Run with CodeFlare Model Architecture####Bring Your Own Code####Demos": "Bring Your Own Code",
1414
"BERT####MLFlow Demo####Tensorboard Demo": "MLFlow Demo",
1515
"Location of your working directory": "{\"Location of your working directory\":\"tests/kind/inputs/qiskit-runtime-env-with-conda\"}",
1616
"Provide custom base image, if any": "{\"Provide custom base image, if any\":\"rayproject/ray:1.13.1-py37\"}",

Diff for: ‎tests/kind/run.sh

+24-7
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,11 @@ export CI=true
4646
# build docker image of log aggregator just for this test and load it
4747
# into kind
4848
function build {
49-
export LOG_AGGREGATOR_IMAGE=codeflare-log-aggregator:test
50-
FAST=true npm run build:docker:log-aggregator
51-
kind load docker-image $LOG_AGGREGATOR_IMAGE --name $CLUSTER
49+
if [ -n "$TEST_LOG_AGGREGATOR" ]; then
50+
export LOG_AGGREGATOR_IMAGE=codeflare-log-aggregator:test
51+
FAST=true npm run build:docker:log-aggregator
52+
kind load docker-image $LOG_AGGREGATOR_IMAGE --name $CLUSTER
53+
fi
5254
}
5355

5456
#
@@ -78,15 +80,27 @@ function run {
7880
GUIDEBOOK_NAME="main-job-run" "$ROOT"/bin/codeflare -V -p $profile $yes $guidebook
7981
}
8082

83+
# Undeploy any prior ray cluster
84+
function cleanup_ray {
85+
local profileFull=$1
86+
local variant=$(dirname $profileFull)
87+
local profile=$(basename $profileFull)
88+
export MWPROFILES_PATH="$MWPROFILES_PATH_BASE"/$variant
89+
90+
echo "[Test] Undeploying any prior ray cluster"
91+
(GUIDEBOOK_NAME="ray-undeploy" "$ROOT"/bin/codeflare -p $profile -y ml/ray/stop/kubernetes \
92+
|| exit 0)
93+
}
94+
8195
# Undeploy any prior log aggregator
82-
function cleanup {
96+
function cleanup_log_aggregator {
8397
local profileFull=$1
8498
local variant=$(dirname $profileFull)
8599
local profile=$(basename $profileFull)
86100
export MWPROFILES_PATH="$MWPROFILES_PATH_BASE"/$variant
87101

88-
echo "[Test] Undeploying any prior log aggregator"
89-
(GUIDEBOOK_NAME="log-aggregator-undeploy" "$ROOT"/bin/codeflare -p $profile -y ml/ray/aggregator/in-cluster/client-side/undeploy \
102+
echo "[Test] Undeploying any prior ray cluster"
103+
(GUIDEBOOK_NAME="ray-undeploy" "$ROOT"/bin/codeflare -p $profile -y ml/ray/stop/kubernetes \
90104
|| exit 0)
91105
}
92106

@@ -216,13 +230,16 @@ function test {
216230
export JOB_ID=$(node -e 'console.log(require("uuid").v4())')
217231
echo "[Test] Using JOB_ID=$JOB_ID"
218232

233+
# 0. clean up prior ray clusters
234+
cleanup_ray "$1"
235+
219236
# 1. launch codeflare guidebook run
220237
run "$1" | tee $OUTPUT &
221238
RUN_PID=$!
222239

223240
# 2. if asked, attach a log aggregator
224241
if [ -n "$TEST_LOG_AGGREGATOR" ]; then
225-
cleanup "$1"
242+
cleanup_log_aggregator "$1"
226243

227244
# wait to attach until the job has been submitted
228245
# while true; do

0 commit comments

Comments
 (0)