Skip conda install if intel

mudler · Mar 4, 2024 · a6a039c · a6a039c
1 parent 454b3a6
commit a6a039c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/backend/python/common-env/transformers/Makefile b/backend/python/common-env/transformers/Makefile
@@ -8,6 +8,10 @@ ifeq ($(BUILD_TYPE), hipblas)
 	CONDA_ENV_PATH = "transformers-rocm.yml"
 endif
 
+ifneq (,$(findstring sycl,$(BUILD_TYPE)))
+export SKIP_CONDA=1
+endif
+
 .PHONY: transformers
 transformers:
 	@echo "Installing $(CONDA_ENV_PATH)..."

diff --git a/backend/python/common-env/transformers/install.sh b/backend/python/common-env/transformers/install.sh
@@ -6,12 +6,16 @@ conda_env_exists(){
     ! conda list --name "${@}" >/dev/null 2>/dev/null
 }
 
-if conda_env_exists "transformers" ; then
-    echo "Creating virtual environment..."
-    conda env create --name transformers --file $1
-    echo "Virtual environment created."
-else 
-    echo "Virtual environment already exists."
+if [ $SKIP_CONDA == 1 ]; then
+    echo "Skipping conda environment installation"
+else
+    if conda_env_exists "transformers" ; then
+        echo "Creating virtual environment..."
+        conda env create --name transformers --file $1
+        echo "Virtual environment created."
+    else 
+        echo "Virtual environment already exists."
+    fi
 fi
 
 if [ "$PIP_CACHE_PURGE" = true ] ; then

diff --git a/backend/python/diffusers/Makefile b/backend/python/diffusers/Makefile
@@ -5,7 +5,7 @@ export CONDA_ENV_PATH = "diffusers-rocm.yml"
 endif
 
 ifneq (,$(findstring sycl,$(BUILD_TYPE)))
-export SKIP=1
+export SKIP_CONDA=1
 endif
 
 .PHONY: diffusers

diff --git a/backend/python/diffusers/install.sh b/backend/python/diffusers/install.sh
@@ -6,7 +6,7 @@ conda_env_exists(){
     ! conda list --name "${@}" >/dev/null 2>/dev/null
 }
 
-if [ $SKIP == 1 ]; then
+if [ $SKIP_CONDA == 1 ]; then
     echo "Skipping conda environment installation"
 else
     if conda_env_exists "diffusers" ; then