Fixes after testing.

Signed-off-by: Revital Sur <eres@il.ibm.com>
IBM · Jun 3, 2024 · 2ae0984 · 2ae0984
1 parent d280247
commit 2ae0984
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/kfp/kfp_ray_components/src/create_ray_cluster.py b/kfp/kfp_ray_components/src/create_ray_cluster.py
@@ -17,7 +17,7 @@
     from kfp_v1_workflow_support.utils import KFPUtils, RayRemoteJobs
     print(f"Load KFPv2 libs")
 else:
-    from kfp_v1_workflow_support.utils import KFPUtils, RayRemoteJobs
+    from workflow_support.utils import KFPUtils, RayRemoteJobs
     print(f"Load KFPv1 libs")
 
 def start_ray_cluster(

diff --git a/kfp/kfp_ray_components/src/delete_ray_cluster.py b/kfp/kfp_ray_components/src/delete_ray_cluster.py
@@ -18,7 +18,7 @@
     from kfp_v1_workflow_support.utils import KFPUtils, RayRemoteJobs
     print(f"Load KFPv2 libs")
 else:
-    from kfp_v1_workflow_support.utils import KFPUtils, RayRemoteJobs
+    from workflow_support.utils import KFPUtils, RayRemoteJobs
     print(f"Load KFPv1 libs")
 
 # Cleans and shutdowns the Ray cluster

diff --git a/kfp/kfp_ray_components/src/execute_ray_job.py b/kfp/kfp_ray_components/src/execute_ray_job.py
@@ -14,10 +14,10 @@
 
 kfp_v2 = os.getenv("KFP_v2", 0)
 if kfp_v2 == 1:
-    from kfp_v1_workflow_support.utils import KFPUtils, execute_ray_jobs
+    from workflow_support.utils import KFPUtils, execute_ray_jobs
     print(f"Load KFPv2 libs")
 else:
-    from kfp_v1_workflow_support.utils import KFPUtils, execute_ray_jobs
+    from workflow_support.utils import KFPUtils, execute_ray_jobs
     print(f"Load KFPv1 libs")
 
 

diff --git a/kfp/kfp_ray_components/src/execute_ray_job_multi_s3.py b/kfp/kfp_ray_components/src/execute_ray_job_multi_s3.py
@@ -14,10 +14,10 @@
 
 kfp_v2 = os.getenv("KFP_v2", 0)
 if kfp_v2 == 1:
-    from kfp_v1_workflow_support.utils import KFPUtils, execute_ray_jobs
+    from workflow_support.utils import KFPUtils, execute_ray_jobs
     print(f"Load KFPv2 libs")
 else:
-    from kfp_v1_workflow_support.utils import KFPUtils, execute_ray_jobs
+    from workflow_support.utils import KFPUtils, execute_ray_jobs
     print(f"Load KFPv1 libs")
 
 

diff --git a/kfp/kfp_ray_components/src/subworkflow.py b/kfp/kfp_ray_components/src/subworkflow.py
@@ -3,10 +3,10 @@
 
 kfp_v2 = os.getenv("KFP_v2", 0)
 if kfp_v2 == 1:
-    from kfp_v1_workflow_support.utils import KFPUtils, PipelinesUtils
+    from workflow_support.utils import KFPUtils, PipelinesUtils
     print(f"Load KFPv2 libs")
 else:
-    from kfp_v1_workflow_support.utils import KFPUtils, PipelinesUtils
+    from workflow_support.utils import KFPUtils, PipelinesUtils
     print(f"Load KFPv1 libs")
 
 from data_processing.utils import ParamsUtils

diff --git a/transforms/.make.transforms_workflows b/transforms/.make.transforms_workflows
@@ -49,7 +49,7 @@ ifeq ($(USE_DEV_IMAGES), 1)
 	cd ${TRANSFORM_SRC} && $(MAKE) image && $(MAKE) load-image
 	cd ${REPOROOT}/kfp/kfp_ray_components && $(MAKE) image && $(MAKE) load-image
 endif
-	. ${WORKFLOW_VENV_ACTIVATE}  && ${PYTHON} -m kfp_support.workflow_support.utils.pipelines_tests_utils -c "sanity-test" -p ${CURDIR}/${PIPELINE_FILE}
+	. ${WORKFLOW_VENV_ACTIVATE}  && ${PYTHON} -m workflow_support.utils.pipelines_tests_utils -c "sanity-test" -p ${CURDIR}/${PIPELINE_FILE}
 
 ${WORKFLOW_VENV_ACTIVATE}: ${REPOROOT}/.make.versions ${REPOROOT}/kfp/requirements.env ${REPOROOT}/kfp/kfp_ray_components/requirements.txt ${DPK_RAY_LIB_DIR} ${REPOROOT}/kfp/kfp_support_lib/
 	rm -rf ${REPOROOT}/transforms/venv
@@ -68,5 +68,5 @@ ${WORKFLOW_VENV_ACTIVATE}: ${REPOROOT}/.make.versions ${REPOROOT}/kfp/requiremen
 	@if [ -z ${CLUSTER_EXISTS} ]; then \
 		cd ${REPOROOT} && make setup;  \
 	fi
-	. ${WORKFLOW_VENV_ACTIVATE}  && ${PYTHON} -m kfp_support.workflow_support.utils.pipelines_tests_utils -c "upload" -p ${CURDIR}/${PIPELINE_FILE}
+	. ${WORKFLOW_VENV_ACTIVATE}  && ${PYTHON} -m workflow_support.utils.pipelines_tests_utils -c "upload" -p ${CURDIR}/${PIPELINE_FILE}