From 85f664946eaeb24d7c44360b743893adcc6bdb69 Mon Sep 17 00:00:00 2001 From: maxusmusti Date: Fri, 31 Mar 2023 18:00:16 -0400 Subject: [PATCH 1/8] Update torchx version --- pyproject.toml | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index e2ffd6227..ef1d51e61 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,4 +25,4 @@ openshift-client = "1.0.18" rich = "^12.5" ray = {version = "2.1.0", extras = ["default"]} kubernetes = "26.1.0" -torchx = {git = "https://github.com/project-codeflare/torchx", rev = "OCP"} +codeflare-torchx = "0.5.0.dev0" diff --git a/requirements.txt b/requirements.txt index a17a43ad2..441212596 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,4 @@ openshift-client==1.0.18 rich==12.5.1 ray[default]==2.1.0 kubernetes==26.1.0 -git+https://github.com/project-codeflare/torchx@OCP +codeflare-torchx==v0.5.0.dev0 From 55ffd23cdb49dd01bd70898331930f24acdd0ff4 Mon Sep 17 00:00:00 2001 From: maxusmusti Date: Fri, 31 Mar 2023 18:02:29 -0400 Subject: [PATCH 2/8] Remove double-install --- custom-nb-image/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/custom-nb-image/Dockerfile b/custom-nb-image/Dockerfile index 7da9b62ef..2fd9c02b5 100644 --- a/custom-nb-image/Dockerfile +++ b/custom-nb-image/Dockerfile @@ -26,5 +26,4 @@ RUN pip uninstall pickle5 -y RUN pip install codeflare-sdk==0.4.0 \ datasets==2.6.1 \ transformers==4.23.1 \ - evaluate==0.3.0 \ - git+https://github.com/project-codeflare/torchx.git@OCP + evaluate==0.3.0 From 94cfdf8961de095075081495fd619c782b80b9b9 Mon Sep 17 00:00:00 2001 From: maxusmusti Date: Sun, 2 Apr 2023 14:36:58 -0400 Subject: [PATCH 3/8] Revised version --- pyproject.toml | 2 +- requirements.txt | 2 +- src/codeflare_sdk.egg-info/PKG-INFO | 1 + src/codeflare_sdk.egg-info/SOURCES.txt | 4 ++++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index ef1d51e61..aa93e71f5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,4 +25,4 @@ openshift-client = "1.0.18" rich = "^12.5" ray = {version = "2.1.0", extras = ["default"]} kubernetes = "26.1.0" -codeflare-torchx = "0.5.0.dev0" +codeflare-torchx = "0.5.0.dev1" diff --git a/requirements.txt b/requirements.txt index 441212596..497cd2b84 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,4 @@ openshift-client==1.0.18 rich==12.5.1 ray[default]==2.1.0 kubernetes==26.1.0 -codeflare-torchx==v0.5.0.dev0 +codeflare-torchx==v0.5.0.dev1 diff --git a/src/codeflare_sdk.egg-info/PKG-INFO b/src/codeflare_sdk.egg-info/PKG-INFO index 56985dd97..c4061c623 100644 --- a/src/codeflare_sdk.egg-info/PKG-INFO +++ b/src/codeflare_sdk.egg-info/PKG-INFO @@ -1,3 +1,4 @@ Metadata-Version: 2.1 Name: codeflare-sdk Version: 0.0.0 +License-File: LICENSE diff --git a/src/codeflare_sdk.egg-info/SOURCES.txt b/src/codeflare_sdk.egg-info/SOURCES.txt index 4a6c82bd6..96222b989 100644 --- a/src/codeflare_sdk.egg-info/SOURCES.txt +++ b/src/codeflare_sdk.egg-info/SOURCES.txt @@ -1,3 +1,4 @@ +LICENSE README.md pyproject.toml src/codeflare_sdk/__init__.py @@ -6,9 +7,12 @@ src/codeflare_sdk.egg-info/SOURCES.txt src/codeflare_sdk.egg-info/dependency_links.txt src/codeflare_sdk.egg-info/top_level.txt src/codeflare_sdk/cluster/__init__.py +src/codeflare_sdk/cluster/auth.py src/codeflare_sdk/cluster/cluster.py src/codeflare_sdk/cluster/config.py src/codeflare_sdk/cluster/model.py +src/codeflare_sdk/job/__init__.py +src/codeflare_sdk/job/jobs.py src/codeflare_sdk/utils/__init__.py src/codeflare_sdk/utils/generate_yaml.py src/codeflare_sdk/utils/pretty_print.py \ No newline at end of file From c3dc8e2e73782ac3f04150fe4468049aa13271fc Mon Sep 17 00:00:00 2001 From: maxusmusti Date: Sun, 2 Apr 2023 15:10:02 -0400 Subject: [PATCH 4/8] Further revised version --- pyproject.toml | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index aa93e71f5..eaefa4236 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,4 +25,4 @@ openshift-client = "1.0.18" rich = "^12.5" ray = {version = "2.1.0", extras = ["default"]} kubernetes = "26.1.0" -codeflare-torchx = "0.5.0.dev1" +codeflare-torchx = "0.5.0.dev2" diff --git a/requirements.txt b/requirements.txt index 497cd2b84..2f0c56bf0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,4 @@ openshift-client==1.0.18 rich==12.5.1 ray[default]==2.1.0 kubernetes==26.1.0 -codeflare-torchx==v0.5.0.dev1 +codeflare-torchx==v0.5.0.dev2 From c4232b6c1b72c22da4467ea48ea34683aeca98ce Mon Sep 17 00:00:00 2001 From: maxusmusti Date: Mon, 3 Apr 2023 11:41:35 -0400 Subject: [PATCH 5/8] Updated version to include new domain extension parsing --- pyproject.toml | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index eaefa4236..e949c7f6d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,4 +25,4 @@ openshift-client = "1.0.18" rich = "^12.5" ray = {version = "2.1.0", extras = ["default"]} kubernetes = "26.1.0" -codeflare-torchx = "0.5.0.dev2" +codeflare-torchx = "0.5.0.dev3" diff --git a/requirements.txt b/requirements.txt index 2f0c56bf0..8cf30e637 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,4 @@ openshift-client==1.0.18 rich==12.5.1 ray[default]==2.1.0 kubernetes==26.1.0 -codeflare-torchx==v0.5.0.dev2 +codeflare-torchx==v0.5.0.dev3 From f125f70750cd1bd70bd7e20cc4a05486080e971a Mon Sep 17 00:00:00 2001 From: maxusmusti Date: Mon, 3 Apr 2023 11:44:14 -0400 Subject: [PATCH 6/8] Remove accidental v --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8cf30e637..70e99c863 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,4 @@ openshift-client==1.0.18 rich==12.5.1 ray[default]==2.1.0 kubernetes==26.1.0 -codeflare-torchx==v0.5.0.dev3 +codeflare-torchx==0.5.0.dev3 From 80a60769bd5d0601e9f0426e86bc525b9be9110a Mon Sep 17 00:00:00 2001 From: maxusmusti Date: Mon, 3 Apr 2023 12:46:04 -0400 Subject: [PATCH 7/8] Parse fix --- pyproject.toml | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index e949c7f6d..84fcfa794 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,4 +25,4 @@ openshift-client = "1.0.18" rich = "^12.5" ray = {version = "2.1.0", extras = ["default"]} kubernetes = "26.1.0" -codeflare-torchx = "0.5.0.dev3" +codeflare-torchx = "0.5.0.dev4" diff --git a/requirements.txt b/requirements.txt index 70e99c863..ad9db9341 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,4 @@ openshift-client==1.0.18 rich==12.5.1 ray[default]==2.1.0 kubernetes==26.1.0 -codeflare-torchx==0.5.0.dev3 +codeflare-torchx==0.5.0.dev4 From 7ffa9f6a165da06406f522227bdb922d98ef2265 Mon Sep 17 00:00:00 2001 From: maxusmusti Date: Mon, 3 Apr 2023 14:37:49 -0400 Subject: [PATCH 8/8] Final update: fixed extensions --- pyproject.toml | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 84fcfa794..061cd997d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,4 +25,4 @@ openshift-client = "1.0.18" rich = "^12.5" ray = {version = "2.1.0", extras = ["default"]} kubernetes = "26.1.0" -codeflare-torchx = "0.5.0.dev4" +codeflare-torchx = "0.5.0.dev5" diff --git a/requirements.txt b/requirements.txt index ad9db9341..a805aacd8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,4 @@ openshift-client==1.0.18 rich==12.5.1 ray[default]==2.1.0 kubernetes==26.1.0 -codeflare-torchx==0.5.0.dev4 +codeflare-torchx==0.5.0.dev5