-
Notifications
You must be signed in to change notification settings - Fork 43
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Convert MNIST PyTorch and MNIST Ray test cases to go
- Loading branch information
Showing
15 changed files
with
922 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| /* | ||
| Copyright 2023. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package integration | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| . "github.com/onsi/gomega" | ||
| cfosupport "github.com/project-codeflare/codeflare-operator/test/support" | ||
| mcadv1beta1 "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1" | ||
| rayv1alpha1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1alpha1" | ||
|
|
||
| corev1 "k8s.io/api/core/v1" | ||
| rbacv1 "k8s.io/api/rbac/v1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
|
|
||
| support "github.com/opendatahub-io/distributed-workloads/tests/integration/support" | ||
| ) | ||
|
|
||
| func TestMCADRay(t *testing.T) { | ||
| test := cfosupport.With(t) | ||
|
|
||
| // Create a namespace | ||
| namespace := test.NewTestNamespace() | ||
|
|
||
| // Test configuration | ||
| jupyterNotebookConfigMapFileName := "mnist_ray_mini.ipynb" | ||
| config := &corev1.ConfigMap{ | ||
| TypeMeta: metav1.TypeMeta{ | ||
| APIVersion: corev1.SchemeGroupVersion.String(), | ||
| Kind: "ConfigMap", | ||
| }, | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: "notebooks-ray", | ||
| }, | ||
| BinaryData: map[string][]byte{ | ||
| // MNIST MCAD Notebook | ||
| jupyterNotebookConfigMapFileName: ReadFile(test, "resources/mnist_ray_mini.ipynb"), | ||
| "mnist.py": ReadFile(test, "resources/mnist.py"), | ||
| "requirements.txt": ReadFile(test, "resources/requirements.txt"), | ||
| }, | ||
| Immutable: cfosupport.Ptr(true), | ||
| } | ||
| config, err := test.Client().Core().CoreV1().ConfigMaps(namespace.Name).Create(test.Ctx(), config, metav1.CreateOptions{}) | ||
| test.Expect(err).NotTo(HaveOccurred()) | ||
| test.T().Logf("Created ConfigMap %s/%s successfully", config.Namespace, config.Name) | ||
|
|
||
| // Create RBAC, retrieve token for user with limited rights | ||
| policyRules := []rbacv1.PolicyRule{ | ||
| { | ||
| Verbs: []string{"get", "create", "delete", "list", "patch", "update"}, | ||
| // APIGroups: []string{mcadv1beta1.GroupName}, | ||
| APIGroups: []string{"mcad.ibm.com"}, | ||
| Resources: []string{"appwrappers"}, | ||
| }, | ||
| { | ||
| Verbs: []string{"get", "list"}, | ||
| APIGroups: []string{rayv1alpha1.GroupVersion.Group}, | ||
| Resources: []string{"rayclusters", "rayclusters/status"}, | ||
| }, | ||
| { | ||
| Verbs: []string{"get", "list"}, | ||
| APIGroups: []string{"route.openshift.io"}, | ||
| Resources: []string{"routes"}, | ||
| }, | ||
| } | ||
| token := support.CreateTestRBAC(test, namespace, policyRules) | ||
|
|
||
| // Create Notebook CR | ||
| support.CreateNotebook(test, namespace, token, config.Name, jupyterNotebookConfigMapFileName) | ||
|
|
||
| // Make sure the AppWrapper is created and running | ||
| test.Eventually(cfosupport.AppWrappers(test, namespace), cfosupport.TestTimeoutLong). | ||
| Should( | ||
| And( | ||
| HaveLen(1), | ||
| ContainElement(WithTransform(cfosupport.AppWrapperName, HavePrefix("mnistjob"))), | ||
| ContainElement(WithTransform(cfosupport.AppWrapperState, Equal(mcadv1beta1.AppWrapperStateActive))), | ||
| ), | ||
| ) | ||
|
|
||
| // Make sure the AppWrapper finishes and is deleted | ||
| test.Eventually(cfosupport.AppWrappers(test, namespace), cfosupport.TestTimeoutLong). | ||
| Should(HaveLen(0)) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| /* | ||
| Copyright 2023. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package integration | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| . "github.com/onsi/gomega" | ||
| cfosupport "github.com/project-codeflare/codeflare-operator/test/support" | ||
| mcadv1beta1 "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1" | ||
|
|
||
| corev1 "k8s.io/api/core/v1" | ||
| rbacv1 "k8s.io/api/rbac/v1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
|
|
||
| support "github.com/opendatahub-io/distributed-workloads/tests/integration/support" | ||
| ) | ||
|
|
||
| func TestMnistPyTorchMCAD(t *testing.T) { | ||
| test := cfosupport.With(t) | ||
|
|
||
| // Create a namespace | ||
| namespace := test.NewTestNamespace() | ||
|
|
||
| // Test configuration | ||
| jupyterNotebookConfigMapFileName := "mnist_mcad_mini.ipynb" | ||
| config := &corev1.ConfigMap{ | ||
| TypeMeta: metav1.TypeMeta{ | ||
| APIVersion: corev1.SchemeGroupVersion.String(), | ||
| Kind: "ConfigMap", | ||
| }, | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: "notebooks-mcad", | ||
| }, | ||
| BinaryData: map[string][]byte{ | ||
| // MNIST MCAD Notebook | ||
| jupyterNotebookConfigMapFileName: ReadFile(test, "resources/mnist_mcad_mini.ipynb"), | ||
| }, | ||
| Immutable: cfosupport.Ptr(true), | ||
| } | ||
| config, err := test.Client().Core().CoreV1().ConfigMaps(namespace.Name).Create(test.Ctx(), config, metav1.CreateOptions{}) | ||
| test.Expect(err).NotTo(HaveOccurred()) | ||
| test.T().Logf("Created ConfigMap %s/%s successfully", config.Namespace, config.Name) | ||
|
|
||
| // Create RBAC, retrieve token for user with limited rights | ||
| policyRules := []rbacv1.PolicyRule{ | ||
| { | ||
| Verbs: []string{"get", "create", "delete", "list", "patch", "update"}, | ||
| // APIGroups: []string{mcadv1beta1.GroupName}, | ||
| APIGroups: []string{"mcad.ibm.com"}, | ||
| Resources: []string{"appwrappers"}, | ||
| }, | ||
| // Needed for job.logs() | ||
| { | ||
| Verbs: []string{"get"}, | ||
| APIGroups: []string{""}, | ||
| Resources: []string{"pods/log"}, | ||
| }, | ||
| } | ||
| token := support.CreateTestRBAC(test, namespace, policyRules) | ||
|
|
||
| // Create Notebook CR | ||
| support.CreateNotebook(test, namespace, token, config.Name, jupyterNotebookConfigMapFileName) | ||
|
|
||
| // Make sure the AppWrapper is created and running | ||
| test.Eventually(cfosupport.AppWrappers(test, namespace), cfosupport.TestTimeoutLong). | ||
| Should( | ||
| And( | ||
| HaveLen(1), | ||
| ContainElement(WithTransform(cfosupport.AppWrapperName, HavePrefix("mnistjob"))), | ||
| ContainElement(WithTransform(cfosupport.AppWrapperState, Equal(mcadv1beta1.AppWrapperStateActive))), | ||
| ), | ||
| ) | ||
|
|
||
| // Make sure the AppWrapper finishes and is deleted | ||
| test.Eventually(cfosupport.AppWrappers(test, namespace), cfosupport.TestTimeoutLong). | ||
| Should(HaveLen(0)) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| { | ||
| "cells": [ | ||
| { | ||
| "cell_type": "code", | ||
| "execution_count": null, | ||
| "id": "b55bc3ea-4ce3-49bf-bb1f-e209de8ca47a", | ||
| "metadata": { | ||
| "tags": [] | ||
| }, | ||
| "outputs": [], | ||
| "source": [ | ||
| "# Import pieces from codeflare-sdk\n", | ||
| "from codeflare_sdk.job.jobs import DDPJobDefinition\n", | ||
| "from time import sleep" | ||
| ] | ||
| }, | ||
| { | ||
| "cell_type": "code", | ||
| "execution_count": null, | ||
| "id": "47ca5c15", | ||
| "metadata": { | ||
| "tags": ["parameters"] | ||
| }, | ||
| "outputs": [], | ||
| "source": [ | ||
| "#parameters\n", | ||
| "namespace = \"default\"" | ||
| ] | ||
| }, | ||
| { | ||
| "cell_type": "code", | ||
| "execution_count": null, | ||
| "id": "26b21373", | ||
| "metadata": {}, | ||
| "outputs": [], | ||
| "source": [ | ||
| "job = DDPJobDefinition(name=\"mnistjob\", script=\"mnist.py\", scheduler_args={\"namespace\": namespace}, j=\"1x1\", gpu=0, cpu=1, memMB=2000, image=\"quay.io/project-codeflare/mnist-job-test:v0.0.1\").submit()" | ||
| ] | ||
| }, | ||
| { | ||
| "cell_type": "code", | ||
| "execution_count": null, | ||
| "id": "d24e9f95", | ||
| "metadata": {}, | ||
| "outputs": [], | ||
| "source": [ | ||
| "finished = False\n", | ||
| "while not finished:\n", | ||
| " sleep(1)\n", | ||
| " try:\n", | ||
| " finished = (\"Epoch 4: 100%\" in job.logs())\n", | ||
| " except:\n", | ||
| " finished = False" | ||
| ] | ||
| }, | ||
| { | ||
| "cell_type": "code", | ||
| "execution_count": null, | ||
| "id": "f078b7cd", | ||
| "metadata": {}, | ||
| "outputs": [], | ||
| "source": [ | ||
| "job.cancel()" | ||
| ] | ||
| } | ||
| ], | ||
| "metadata": { | ||
| "kernelspec": { | ||
| "display_name": "Python 3 (ipykernel)", | ||
| "language": "python", | ||
| "name": "python3" | ||
| }, | ||
| "language_info": { | ||
| "codemirror_mode": { | ||
| "name": "ipython", | ||
| "version": 3 | ||
| }, | ||
| "file_extension": ".py", | ||
| "mimetype": "text/x-python", | ||
| "name": "python", | ||
| "nbconvert_exporter": "python", | ||
| "pygments_lexer": "ipython3", | ||
| "version": "3.9.13" | ||
| }, | ||
| "vscode": { | ||
| "interpreter": { | ||
| "hash": "f9f85f796d01129d0dd105a088854619f454435301f6ffec2fea96ecbd9be4ac" | ||
| } | ||
| } | ||
| }, | ||
| "nbformat": 4, | ||
| "nbformat_minor": 5 | ||
| } |
Oops, something went wrong.