Merge pull request #672 from ralphbean/whats-in-a-name

Switch PROVIDER name to HARDWARE
containers · Jul 12, 2024 · 3cab84c · 3cab84c
2 parents 56ba565 + cf0b33e
commit 3cab84c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/training/Makefile b/training/Makefile
@@ -78,11 +78,11 @@ nvidia: instruct-nvidia
 
 .PHONY: amd-bootc-models nvidia-bootc-models intel-bootc-models
 amd-models: amd
-	$(MAKE) PROVIDER=amd -C model bootc-models
+	$(MAKE) HARDWARE=amd -C model bootc-models
 nvidia-models: nvidia
-	$(MAKE) PROVIDER=nvidia -C model bootc-models
+	$(MAKE) HARDWARE=nvidia -C model bootc-models
 intel-models: intel
-	$(MAKE) PROVIDER=intel -C model bootc-models
+	$(MAKE) HARDWARE=intel -C model bootc-models
 
 .PHONY: bootc-models
 bootc-models:

diff --git a/training/amd-bootc/Makefile b/training/amd-bootc/Makefile
@@ -1,5 +1,5 @@
-PROVIDER ?= amd
-IMAGE_NAME ?= $(PROVIDER)-bootc
+HARDWARE ?= amd
+IMAGE_NAME ?= $(HARDWARE)-bootc
 
 include ../common/Makefile.common
 

diff --git a/training/common/Makefile.common b/training/common/Makefile.common
@@ -1,9 +1,9 @@
 FROM ?=
-PROVIDER ?=
+HARDWARE ?=
 
 REGISTRY ?= quay.io
 REGISTRY_ORG ?= ai-lab
-IMAGE_NAME ?= $(PROVIDER)-bootc
+IMAGE_NAME ?= $(HARDWARE)-bootc
 IMAGE_TAG ?= latest
 BOOTC_IMAGE ?= ${REGISTRY}/${REGISTRY_ORG}/${IMAGE_NAME}:${IMAGE_TAG}
 BOOTC_MODELS_IMAGE ?= ${REGISTRY}/${REGISTRY_ORG}/${IMAGE_NAME}-models:${IMAGE_TAG}
@@ -35,7 +35,7 @@ ARCH ?=
 DRIVER_VERSION ?=
 KERNEL_VERSION ?=
 
-INSTRUCTLAB_IMAGE = $(REGISTRY)/$(REGISTRY_ORG)/instructlab-$(PROVIDER):$(IMAGE_TAG)
+INSTRUCTLAB_IMAGE = $(REGISTRY)/$(REGISTRY_ORG)/instructlab-$(HARDWARE):$(IMAGE_TAG)
 WRAPPER = $(CURDIR)/../ilab-wrapper/ilab
 QLORA_WRAPPER = $(CURDIR)/../ilab-wrapper/ilab-qlora
 TRAIN_WRAPPER =  $(CURDIR)/../ilab-wrapper/ilab-training-launcher

diff --git a/training/nvidia-bootc/Makefile b/training/nvidia-bootc/Makefile
@@ -1,5 +1,5 @@
-PROVIDER ?= nvidia
-IMAGE_NAME ?= $(PROVIDER)-bootc
+HARDWARE ?= nvidia
+IMAGE_NAME ?= $(HARDWARE)-bootc
 
 CUDA_VERSION ?=
 OS_VERSION_MAJOR ?=