Merge pull request #61 from IBM/make-run-samples

Updated Makefile comment and make minio-start target extendible.
IBM · May 8, 2024 · 211572c · 211572c
2 parents 9887784 + 688f7fa
commit 211572c
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 6 deletions.
diff --git a/.make.defaults b/.make.defaults
@@ -254,10 +254,9 @@ __check_defined = \
 
 .PHONY: .defaults.check.installed
 .defaults.check.installed::
-	@installed=$$(which $(CHECK_RUNNABLE));		\
-	if [ -z "$$installed" ]; then			\
-	    echo $(CHECK_RUNNABLE) must be installed;	\
-	    exit 1;					\
+	if [ ! command -v $(CHECK_RUNNABLE) &>/dev/null ]; then \
+	    echo $(CHECK_RUNNABLE) must be installed;		\
+	    exit 1;						\
 	fi
 
 .PHONY: .defaults.minio.check

diff --git a/transforms/.make.transforms b/transforms/.make.transforms
@@ -249,8 +249,8 @@ conventions:
 	$(MAKE) MINIO_SRC=$$dir/test-data/input MINIO_DEST=$(TRANSFORM_NAME)/ .defaults.minio.load-test-data
 
 
-.PHONY: minio-start
-minio-start:	
+.PHONY: .minio-start
+.minio-start:	
 	$(MAKE) .defaults.minio.start
 	$(MAKE) .transforms.minio-load
 	@# Help: Start and load the minio server with $(TRANSFORM_NAME) test data 

diff --git a/transforms/code/code_quality/Makefile b/transforms/code/code_quality/Makefile
@@ -42,4 +42,6 @@ run-local-ray-sample: .transforms.run-local-ray-sample
 
 run-s3-ray-sample: .transforms.run-s3-ray-sample
 
+minio-start:	.minio-start
+
 load-image:: .transforms.load-image
diff --git a/transforms/code/malware/Makefile b/transforms/code/malware/Makefile
@@ -51,4 +51,6 @@ run-s3-ray-sample: #.transforms.run-s3-ray-sample
 	@# Help: Not implemented yet
 	@echo "No src/malware_s3_ray.py yet :("
 
+minio-start:	.minio-start
+
 load-image:: .transforms.load-image
diff --git a/transforms/code/proglang_select/Makefile b/transforms/code/proglang_select/Makefile
@@ -43,4 +43,6 @@ run-local-ray-sample: .transforms.run-local-ray-sample
 
 run-s3-ray-sample: .transforms.run-s3-ray-sample
 
+minio-start:	.minio-start
+
 load-image:: .transforms.load-image
diff --git a/transforms/universal/doc_id/Makefile b/transforms/universal/doc_id/Makefile
@@ -7,6 +7,7 @@ REPOROOT=../../..
 include ../../.make.transforms
 
 TRANSFORM_NAME=doc_id
+# $(REPOROOT)/.make.versions file contains the versions
 DOCKER_IMAGE_VERSION=${DOC_ID_VERSION}
 
 venv::	.transforms.venv
@@ -39,4 +40,6 @@ run-local-ray-sample: .transforms.run-local-ray-sample
 
 run-s3-ray-sample: .transforms.run-s3-ray-sample
 
+minio-start:	.minio-start
+
 load-image:: .transforms.load-image
diff --git a/transforms/universal/ededup/Makefile b/transforms/universal/ededup/Makefile
@@ -46,4 +46,6 @@ run-local-ray-sample: .transforms.run-local-ray-sample
 
 run-s3-ray-sample: .transforms.run-s3-ray-sample
 
+minio-start:	.minio-start
+
 load-image:: .transforms.load-image
diff --git a/transforms/universal/fdedup/Makefile b/transforms/universal/fdedup/Makefile
@@ -43,4 +43,6 @@ run-local-ray-sample: .transforms.run-local-ray-sample
 
 run-s3-ray-sample: .transforms.run-s3-ray-sample
 
+minio-start:	.minio-start
+
 load-image:: .transforms.load-image
diff --git a/transforms/universal/filter/Makefile b/transforms/universal/filter/Makefile
@@ -44,4 +44,6 @@ run-local-ray-sample: .transforms.run-local-ray-sample
 
 run-s3-ray-sample: .transforms.run-s3-ray-sample
 
+minio-start:	.minio-start
+
 load-image:: .transforms.load-image
diff --git a/transforms/universal/noop/Makefile b/transforms/universal/noop/Makefile
@@ -36,4 +36,6 @@ run-local-ray-sample: .transforms.run-local-ray-sample
 
 run-s3-ray-sample: .transforms.run-s3-ray-sample
 
+minio-start:	.minio-start
+
 load-image:: .transforms.load-image
diff --git a/transforms/universal/tokenization/Makefile b/transforms/universal/tokenization/Makefile
@@ -43,4 +43,6 @@ run-local-ray-sample: .transforms.run-local-ray-sample
 
 run-s3-ray-sample: .transforms.run-s3-ray-sample
 
+minio-start:	.minio-start
+
 load-image:: .transforms.load-image
Original file line number	Diff line number	Diff line change
Expand Up		@@ -42,4 +42,6 @@ run-local-ray-sample: .transforms.run-local-ray-sample

		run-s3-ray-sample: .transforms.run-s3-ray-sample

		minio-start: .minio-start

		load-image:: .transforms.load-image
Original file line number	Diff line number	Diff line change
Expand Up		@@ -43,4 +43,6 @@ run-local-ray-sample: .transforms.run-local-ray-sample

		run-s3-ray-sample: .transforms.run-s3-ray-sample

		minio-start: .minio-start

		load-image:: .transforms.load-image
Original file line number	Diff line number	Diff line change
Expand Up		@@ -46,4 +46,6 @@ run-local-ray-sample: .transforms.run-local-ray-sample

		run-s3-ray-sample: .transforms.run-s3-ray-sample

		minio-start: .minio-start

		load-image:: .transforms.load-image
Original file line number	Diff line number	Diff line change
Expand Up		@@ -44,4 +44,6 @@ run-local-ray-sample: .transforms.run-local-ray-sample

		run-s3-ray-sample: .transforms.run-s3-ray-sample

		minio-start: .minio-start

		load-image:: .transforms.load-image
Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,4 +36,6 @@ run-local-ray-sample: .transforms.run-local-ray-sample

		run-s3-ray-sample: .transforms.run-s3-ray-sample

		minio-start: .minio-start

		load-image:: .transforms.load-image