Skip to content

Commit fb6483c

Browse files
committed
test: add a runtime-env test that uses conda to inject dependencies
1 parent bdab6d4 commit fb6483c

File tree

9 files changed

+59
-18
lines changed

9 files changed

+59
-18
lines changed

.github/workflows/kind.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,16 @@ jobs:
1212

1313
strategy:
1414
matrix:
15+
profile:
16+
- non-gpu1/keep-it-simple
17+
- non-gpu2/keep-it-simple
18+
- non-gpu3/keep-it-simple
19+
- non-gpu1/ray-autoscaler
20+
- non-gpu1/mcad-default
21+
- non-gpu1/mcad-coscheduler
22+
- non-gpu1/mcad-preinstalled
1523
os: [ubuntu-latest]
1624
node-version: [16.x]
17-
profile: [non-gpu1/keep-it-simple, non-gpu2/keep-it-simple, non-gpu1/ray-autoscaler, non-gpu1/mcad-default, non-gpu1/mcad-coscheduler, non-gpu1/mcad-preinstalled]
1825

1926
steps:
2027
- uses: actions/checkout@v3

package-lock.json

Lines changed: 16 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@
114114
"typescript": "4.7.4"
115115
},
116116
"dependencies": {
117-
"@guidebooks/store": "^0.3.3",
118117
"@kui-shell/client": "file:./plugins/plugin-client-default",
119118
"@kui-shell/core": "11.5.0-dev-20220807-191654",
120119
"@kui-shell/plugin-bash-like": "11.5.0-dev-20220807-191654",

plugins/plugin-madwizard/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"access": "public"
2424
},
2525
"dependencies": {
26-
"madwizard": "^0.19.1"
26+
"madwizard": "^0.19.3",
27+
"@guidebooks/store": "^0.4.0"
2728
}
2829
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Same as ../qiskit, but using a runtime-env.yaml rather than a requirements.txt to specify pip dependencies via conda.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../qiskit/main.py
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
name: qiskit
2+
conda:
3+
dependencies:
4+
- pip
5+
- pip:
6+
- qiskit==0.37.0

tests/kind/profiles/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
- gpu1: Uses tests/kind/inputs/ray-tune-tutorial. GPU: yes
66
- non-gpu1: Uses tests/kind/inputs/qiskit with a requirements.txt. GPU: no
77
- non-gpu2: Ibid, but with a runtime-env.yaml that specifies pips. GPU: no
8+
- non-gpu3: Ibid, but with a runtime-env.yaml that specifies conda pip dependencies. GPU: no
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"name": "keep-it-simple",
3+
"creationTime": 1660657756574,
4+
"lastModifiedTime": 1660658307175,
5+
"lastUsedTime": 1660742079201,
6+
"choices": {
7+
"madwizard/apriori/use-gpu": "don't use gpus",
8+
"madwizard/apriori/arch": "x64",
9+
"madwizard/apriori/platform": "darwin",
10+
"madwizard/apriori/mac-installer": "Homebrew",
11+
"madwizard/apriori/in-terminal": "HTML",
12+
"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",
14+
"BERT####MLFlow Demo####Tensorboard Demo": "MLFlow Demo",
15+
"Location of your working directory": "{\"Location of your working directory\":\"tests/kind/inputs/qiskit-runtime-env-with-conda\"}",
16+
"Provide custom base image, if any": "{\"Provide custom base image, if any\":\"rayproject/ray:1.13.1-py37\"}",
17+
"AWS####IBM####My data is not stored in S3": "My data is not stored in S3",
18+
"Run Locally####Run on a Kubernetes Cluster": "Run on a Kubernetes Cluster",
19+
"expand((kubectl config get-contexts -o name | grep -E . >& /dev/null && kubectl config get-contexts -o name) || (kubectl version | grep Server >& /dev/null && echo \"${KUBE_CONTEXT_FOR_TEST-In-cluster}\" || exit 1), Kubernetes contexts)": "kind-codeflare-test",
20+
"expand([ -z ${KUBE_CONTEXT} ] && exit 1 || X=$([ -n \"$KUBE_NS_FOR_TEST\" ] && echo $KUBE_NS_FOR_TEST || kubectl ${KUBE_CONTEXT_ARG} get ns -o name || oc ${KUBE_CONTEXT_ARG} get projects -o name); echo \"$X\" | sed -E 's#(namespace|project.project.openshift.io)/##' | grep -Ev 'openshift|kube-', Kubernetes namespaces)####Create a namespace": "default",
21+
"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\"}",
22+
"Keep It Simple####Use the Ray Autoscaler####Use the Multi-user Enhanced Kubernetes Scheduler": "Keep It Simple"
23+
}
24+
}

0 commit comments

Comments
 (0)