fix Makefile typo on Include and add config for repo_level_ordering a…

…nd fdedup Signed-off-by: David Wood <[email protected]>
IBM · Oct 4, 2024 · 7636304 · 7636304
1 parent 1c99306
commit 7636304
Show file tree

Hide file tree

Showing 24 changed files with 58 additions and 22 deletions.
diff --git a/transforms/code/code2parquet/kfp_ray/Makefile b/transforms/code/code2parquet/kfp_ray/Makefile
@@ -3,7 +3,7 @@ WORKFLOW_VENV_ACTIVATE=${REPOROOT}/transforms/venv/bin/activate
 include $(REPOROOT)/transforms/.make.workflows
 
 # Include the common configuration for this transform
-Include ../transform.config
+include ../transform.config
 
 SRC_DIR=${CURDIR}/../ray/
 

diff --git a/transforms/code/code_quality/kfp_ray/Makefile b/transforms/code/code_quality/kfp_ray/Makefile
@@ -3,7 +3,7 @@ WORKFLOW_VENV_ACTIVATE=${REPOROOT}/transforms/venv/bin/activate
 include $(REPOROOT)/transforms/.make.workflows
 
 # Include the common configuration for this transform
-Include ../transform.config
+include ../transform.config
 
 SRC_DIR=${CURDIR}/../ray/
 

diff --git a/transforms/code/header_cleanser/kfp_ray/Makefile b/transforms/code/header_cleanser/kfp_ray/Makefile
@@ -3,7 +3,7 @@ WORKFLOW_VENV_ACTIVATE=${REPOROOT}/transforms/venv/bin/activate
 include $(REPOROOT)/transforms/.make.workflows
 
 # Include the common configuration for this transform
-Include ../transform.config
+include ../transform.config
 
 SRC_DIR=${CURDIR}/../ray/
 

diff --git a/transforms/code/license_select/kfp_ray/Makefile b/transforms/code/license_select/kfp_ray/Makefile
@@ -3,7 +3,7 @@ WORKFLOW_VENV_ACTIVATE=${REPOROOT}/transforms/venv/bin/activate
 include $(REPOROOT)/transforms/.make.workflows
 
 # Include the common configuration for this transform
-Include ../transform.config
+include ../transform.config
 
 SRC_DIR=${CURDIR}/../ray/
 

diff --git a/transforms/code/malware/kfp_ray/Makefile b/transforms/code/malware/kfp_ray/Makefile
@@ -3,7 +3,7 @@ WORKFLOW_VENV_ACTIVATE=${REPOROOT}/transforms/venv/bin/activate
 include $(REPOROOT)/transforms/.make.workflows
 
 # Include the common configuration for this transform
-Include ../transform.config
+include ../transform.config
 
 SRC_DIR=${CURDIR}/../ray/
 

diff --git a/transforms/code/proglang_select/kfp_ray/Makefile b/transforms/code/proglang_select/kfp_ray/Makefile
@@ -3,7 +3,7 @@ WORKFLOW_VENV_ACTIVATE=${REPOROOT}/transforms/venv/bin/activate
 include $(REPOROOT)/transforms/.make.workflows
 
 # Include the common configuration for this transform
-Include ../transform.config
+include ../transform.config
 
 SRC_DIR=${CURDIR}/../ray/
 

diff --git a/transforms/code/repo_level_ordering/kfp_ray/Makefile b/transforms/code/repo_level_ordering/kfp_ray/Makefile
@@ -3,7 +3,7 @@ WORKFLOW_VENV_ACTIVATE=${REPOROOT}/transforms/venv/bin/activate
 include $(REPOROOT)/transforms/.make.workflows
 
 # Include the common configuration for this transform
-Include ../transform.config
+include ../transform.config
 
 SRC_DIR=${CURDIR}/../ray/
 

diff --git a/transforms/code/repo_level_ordering/ray/Makefile b/transforms/code/repo_level_ordering/ray/Makefile
@@ -19,8 +19,6 @@ include ../transform.config
 
 BASE_IMAGE=$(RAY_BASE_IMAGE)
 
-TRANSFORM_NAME=repo_level_order
-
 venv::	.transforms.ray-venv
 
 test::	.transforms.ray-test

diff --git a/transforms/code/repo_level_ordering/transform.config b/transforms/code/repo_level_ordering/transform.config
@@ -0,0 +1,19 @@
+#
+# This is intended to be included across the Makefiles provided within
+# a given transform's directory tree,  so must use compatible syntax.
+#
+################################################################################
+# This defines the name of the transform and is used to match against
+# expected files and is used to define the transform's image name. 
+TRANSFORM_NAME=repo_level_order
+
+################################################################################
+# This defines the transforms' version number as would be used
+# when publishing the wheel.  In general, only the micro version
+# number should be advanced relative to the DPK_VERSION. 
+#
+# If you change the versions numbers, be sure to run "make set-versions" to 
+# update version numbers across the transform (e.g., pyproject.toml).
+REPO_LVL_ORDER_RAY_VERSION=$(REPO_LEVEL_ORDER_PYTHON_VERSION)
+
+
diff --git a/transforms/language/doc_chunk/kfp_ray/Makefile b/transforms/language/doc_chunk/kfp_ray/Makefile
@@ -3,7 +3,7 @@ WORKFLOW_VENV_ACTIVATE=${REPOROOT}/transforms/venv/bin/activate
 include $(REPOROOT)/transforms/.make.workflows
 
 # Include the common configuration for this transform
-Include ../transform.config
+include ../transform.config
 
 SRC_DIR=${CURDIR}/../ray/
 

diff --git a/transforms/language/doc_quality/kfp_ray/Makefile b/transforms/language/doc_quality/kfp_ray/Makefile
@@ -3,7 +3,7 @@ WORKFLOW_VENV_ACTIVATE=${REPOROOT}/transforms/venv/bin/activate
 include $(REPOROOT)/transforms/.make.workflows
 
 # Include the common configuration for this transform
-Include ../transform.config
+include ../transform.config
 
 SRC_DIR=${CURDIR}/../ray/
 

diff --git a/transforms/language/lang_id/kfp_ray/Makefile b/transforms/language/lang_id/kfp_ray/Makefile
@@ -3,7 +3,7 @@ WORKFLOW_VENV_ACTIVATE=${REPOROOT}/transforms/venv/bin/activate
 include $(REPOROOT)/transforms/.make.workflows
 
 # Include the common configuration for this transform
-Include ../transform.config
+include ../transform.config
 
 SRC_DIR=${CURDIR}/../ray/
 

diff --git a/transforms/language/pdf2parquet/kfp_ray/Makefile b/transforms/language/pdf2parquet/kfp_ray/Makefile
@@ -3,7 +3,7 @@ WORKFLOW_VENV_ACTIVATE=${REPOROOT}/transforms/venv/bin/activate
 include $(REPOROOT)/transforms/.make.workflows
 
 # Include the common configuration for this transform
-Include ../transform.config
+include ../transform.config
 
 SRC_DIR=${CURDIR}/../ray/
 

diff --git a/transforms/language/pii_redactor/kfp_ray/Makefile b/transforms/language/pii_redactor/kfp_ray/Makefile
@@ -3,7 +3,7 @@ WORKFLOW_VENV_ACTIVATE=${REPOROOT}/transforms/venv/bin/activate
 include $(REPOROOT)/transforms/.make.workflows
 
 # Include the common configuration for this transform
-Include ../transform.config
+include ../transform.config
 
 SRC_DIR=${CURDIR}/../ray/
 

diff --git a/transforms/language/text_encoder/kfp_ray/Makefile b/transforms/language/text_encoder/kfp_ray/Makefile
@@ -3,7 +3,7 @@ WORKFLOW_VENV_ACTIVATE=${REPOROOT}/transforms/venv/bin/activate
 include $(REPOROOT)/transforms/.make.workflows
 
 # Include the common configuration for this transform
-Include ../transform.config
+include ../transform.config
 
 SRC_DIR=${CURDIR}/../ray/
 

diff --git a/transforms/universal/doc_id/kfp_ray/Makefile b/transforms/universal/doc_id/kfp_ray/Makefile
@@ -3,7 +3,7 @@ WORKFLOW_VENV_ACTIVATE=${REPOROOT}/transforms/venv/bin/activate
 include $(REPOROOT)/transforms/.make.workflows
 
 # Include the common configuration for this transform
-Include ../transform.config
+include ../transform.config
 
 SRC_DIR=${CURDIR}/../ray/
 

diff --git a/transforms/universal/ededup/kfp_ray/Makefile b/transforms/universal/ededup/kfp_ray/Makefile
@@ -3,7 +3,7 @@ WORKFLOW_VENV_ACTIVATE=${REPOROOT}/transforms/venv/bin/activate
 include $(REPOROOT)/transforms/.make.workflows
 
 # Include the common configuration for this transform
-Include ../transform.config
+include ../transform.config
 
 SRC_DIR=${CURDIR}/../ray/
 

diff --git a/transforms/universal/fdedup/kfp_ray/Makefile b/transforms/universal/fdedup/kfp_ray/Makefile
@@ -3,7 +3,7 @@ WORKFLOW_VENV_ACTIVATE=${REPOROOT}/transforms/venv/bin/activate
 include $(REPOROOT)/transforms/.make.workflows
 
 # Include the common configuration for this transform
-Include ../transform.config
+include ../transform.config
 
 SRC_DIR=${CURDIR}/../ray/
 

diff --git a/transforms/universal/fdedup/ray/Makefile b/transforms/universal/fdedup/ray/Makefile
@@ -18,6 +18,7 @@ include $(REPOROOT)/transforms/.make.transforms
 include ../transform.config
 
 BASE_IMAGE=${RAY_BASE_IMAGE}
+
 venv::	.transforms.ray-venv
 
 test::	.transforms.ray-test

diff --git a/transforms/universal/fdedup/transform.config b/transforms/universal/fdedup/transform.config
@@ -0,0 +1,18 @@
+#
+# This is intended to be included across the Makefiles provided within
+# a given transform's directory tree,  so must use compatible syntax.
+#
+################################################################################
+# This defines the name of the transform and is used to match against
+# expected files and is used to define the transform's image name. 
+TRANSFORM_NAME=fdedup
+
+################################################################################
+# This defines the transforms' version number as would be used
+# when publishing the wheel.  In general, only the micro version
+# number should be advanced relative to the DPK_VERSION. 
+#
+# If you change the versions numbers, be sure to run "make set-versions" to 
+# update version numbers across the transform (e.g., pyproject.toml).
+FDEDUP_RAY_VERSION=$(_PYTHON_VERSION)
+
diff --git a/transforms/universal/filter/kfp_ray/Makefile b/transforms/universal/filter/kfp_ray/Makefile
@@ -3,7 +3,7 @@ WORKFLOW_VENV_ACTIVATE=${REPOROOT}/transforms/venv/bin/activate
 include $(REPOROOT)/transforms/.make.workflows
 
 # Include the common configuration for this transform
-Include ../transform.config
+include ../transform.config
 
 SRC_DIR=${CURDIR}/../ray/
 

diff --git a/transforms/universal/profiler/kfp_ray/Makefile b/transforms/universal/profiler/kfp_ray/Makefile
@@ -3,7 +3,7 @@ WORKFLOW_VENV_ACTIVATE=${REPOROOT}/transforms/venv/bin/activate
 include $(REPOROOT)/transforms/.make.workflows
 
 # Include the common configuration for this transform
-Include ../transform.config
+include ../transform.config
 
 SRC_DIR=${CURDIR}/../ray/
 

diff --git a/transforms/universal/resize/kfp_ray/Makefile b/transforms/universal/resize/kfp_ray/Makefile
@@ -3,7 +3,7 @@ WORKFLOW_VENV_ACTIVATE=${REPOROOT}/transforms/venv/bin/activate
 include $(REPOROOT)/transforms/.make.workflows
 
 # Include the common configuration for this transform
-Include ../transform.config
+include ../transform.config
 
 SRC_DIR=${CURDIR}/../ray/
 

diff --git a/transforms/universal/tokenization/kfp_ray/Makefile b/transforms/universal/tokenization/kfp_ray/Makefile
@@ -3,7 +3,7 @@ WORKFLOW_VENV_ACTIVATE=${REPOROOT}/transforms/venv/bin/activate
 include $(REPOROOT)/transforms/.make.workflows
 
 # Include the common configuration for this transform
-Include ../transform.config
+include ../transform.config
 
 SRC_DIR=${CURDIR}/../ray/