Skip to content

Commit d4d7877

Browse files
committed
feat: do not automatically bring down cluster on ctrl+c
also picks up mcad resource adjustments to improve test stability
1 parent b65ebc3 commit d4d7877

File tree

7 files changed

+31
-34
lines changed

7 files changed

+31
-34
lines changed

Diff for: package-lock.json

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

Diff for: plugins/plugin-codeflare/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
"@types/split2": "^3.2.1"
3131
},
3232
"dependencies": {
33-
"@guidebooks/store": "^7.2.9",
33+
"@guidebooks/store": "^7.3.1",
3434
"@logdna/tail-file": "^3.0.1",
3535
"@patternfly/react-charts": "^6.94.18",
3636
"@patternfly/react-core": "^4.276.6",
3737
"asciinema-player": "^3.1.0",
3838
"chokidar": "^3.5.3",
39-
"madwizard": "^7.0.4",
39+
"madwizard": "^7.2.1",
4040
"needle": "^3.2.0",
4141
"open": "^8.4.2",
4242
"pretty-bytes": "^6.1.0",

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

+4-10
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"name": "mcad-coscheduler",
2+
"name": "mcad-coscheduler.arm64",
33
"creationTime": 1660657756574,
44
"lastModifiedTime": 1664150418757,
5-
"lastUsedTime": 1677700501499,
5+
"lastUsedTime": 1680221854788,
66
"choices": {
77
"madwizard/apriori/use-gpu": "don't use gpus",
88
"madwizard/apriori/arch": "arm64",
@@ -14,13 +14,7 @@
1414
"ml/codeflare/training/byoc/form": "{\"Path to source\":\"$PWD/tests/kind/inputs/qiskit\",\"Base image\":\"rayproject/ray:2.3.0-py38-aarch64\",\"Command line prefix\":\"python3 main.py\"}",
1515
"kubernetes/choose/secret/image-pull": "No secret needed, since my image is public",
1616
"s3/choose/bucket/maybe": "My data is not stored in S3",
17-
"ml/ray/start/resources": {
18-
"Number of Workers": 0,
19-
"CPUs per worker": "2",
20-
"GPUs per worker": 0,
21-
"Memory per worker": "2.5Gi",
22-
"Ephemeral Storage per worker": "5Gi"
23-
},
17+
"ml/ray/start/resources": "{\"Number of Workers\":0,\"CPUs per worker\":\"2\",\"GPUs per worker\":0,\"Memory per worker\":\"2.5Gi\",\"Ephemeral Storage per worker\":\"5Gi\"}",
2418
"kubernetes/context": "kind-codeflare-test",
2519
"kubernetes/choose/ns": "default",
2620
"ml/ray/storage/s3/maybe": "My code does not use Ray Workflows",
@@ -30,4 +24,4 @@
3024
"kubernetes/mcad/choose/job-priority": "Default Priority",
3125
"kubernetes/mcad/choose/scheduler": "MCAD with the Advanced Coscheduler"
3226
}
33-
}
27+
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
"s3/choose/bucket/maybe": "My data is not stored in S3",
1717
"ml/ray/start/resources": {
1818
"Number of Workers": 0,
19-
"CPUs per worker": "300m",
19+
"CPUs per worker": "600m",
2020
"GPUs per worker": 0,
21-
"Memory per worker": "2.5Gi",
21+
"Memory per worker": "3Gi",
2222
"Ephemeral Storage per worker": "5Gi"
2323
},
2424
"kubernetes/context": "kind-codeflare-test",

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "mcad-default.arm64",
33
"creationTime": 1660657756574,
44
"lastModifiedTime": 1660747919298,
5-
"lastUsedTime": 1680126433820,
5+
"lastUsedTime": 1680221369322,
66
"choices": {
77
"madwizard/apriori/use-gpu": "don't use gpus",
88
"madwizard/apriori/arch": "arm64",
@@ -24,4 +24,4 @@
2424
"kubernetes/mcad/choose/job-priority": "Default Priority",
2525
"kubernetes/mcad/choose/scheduler": "MCAD with the Default Kubernetes Scheduler"
2626
}
27-
}
27+
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"ml/codeflare/training/byoc/form": "{\"Path to source\":\"$PWD/tests/kind/inputs/qiskit\",\"Base image\":\"rayproject/ray:2.1.0-py38\",\"Command line prefix\":\"python3 main.py\"}",
1515
"kubernetes/choose/secret/image-pull": "No secret needed, since my image is public",
1616
"s3/choose/bucket/maybe": "My data is not stored in S3",
17-
"ml/ray/start/resources": "{\"Number of Workers\":0,\"CPUs per worker\":\"300m\",\"GPUs per worker\":0,\"Memory per worker\":\"2.5Gi\",\"Ephemeral Storage per worker\":\"5Gi\"}",
17+
"ml/ray/start/resources": "{\"Number of Workers\":0,\"CPUs per worker\":\"800m\",\"GPUs per worker\":0,\"Memory per worker\":\"4Gi\",\"Ephemeral Storage per worker\":\"5Gi\"}",
1818
"kubernetes/context": "kind-codeflare-test",
1919
"kubernetes/choose/ns": "default",
2020
"ml/ray/storage/s3/maybe": "My code does not use Ray Workflows",

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
"s3/choose/bucket/maybe": "My data is not stored in S3",
1717
"ml/ray/start/resources": {
1818
"Number of Workers": 0,
19-
"CPUs per worker": "300m",
19+
"CPUs per worker": "800m",
2020
"GPUs per worker": 0,
21-
"Memory per worker": "2.5Gi",
21+
"Memory per worker": "4Gi",
2222
"Ephemeral Storage per worker": "5Gi"
2323
},
2424
"kubernetes/context": "kind-codeflare-test",

0 commit comments

Comments
 (0)