feat(conda): share env between diffusers and bark

mudler · Dec 19, 2023 · 873258b · 873258b
1 parent d4210db
commit 873258b
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 179 deletions.
diff --git a/backend/python/bark/Makefile b/backend/python/bark/Makefile
@@ -1,8 +1,6 @@
 .PHONY: ttsbark
 ttsbark:
-	@echo "Creating virtual environment..."
-	@conda env create --name ttsbark --file ttsbark.yml
-	@echo "Virtual environment created."
+	$(MAKE) -C ../common-env/transformers
 
 .PHONY: run
 run:

diff --git a/backend/python/bark/run.sh b/backend/python/bark/run.sh
@@ -6,7 +6,7 @@
 export PATH=$PATH:/opt/conda/bin
 
 # Activate conda environment
-source activate ttsbark
+source activate transformers
 
 # get the directory where the bash script is located
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"

diff --git a/backend/python/bark/test.sh b/backend/python/bark/test.sh
@@ -3,7 +3,7 @@
 ## A bash script wrapper that runs the bark server with conda
 
 # Activate conda environment
-source activate ttsbark
+source activate transformers
 
 # get the directory where the bash script is located
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"

diff --git a/backend/python/bark/ttsbark.yml b/backend/python/bark/ttsbark.yml
diff --git a/backend/python/diffusers/Makefile b/backend/python/diffusers/Makefile
@@ -1,8 +1,6 @@
 .PHONY: diffusers
 diffusers:
-	@echo "Creating virtual environment..."
-	@conda env create --name diffusers --file diffusers.yml
-	@echo "Virtual environment created."
+	$(MAKE) -C ../common-env/transformers
 
 .PHONY: run
 run:

diff --git a/backend/python/diffusers/diffusers.yml b/backend/python/diffusers/diffusers.yml
diff --git a/backend/python/diffusers/run.sh b/backend/python/diffusers/run.sh
@@ -6,7 +6,7 @@
 export PATH=$PATH:/opt/conda/bin
 
 # Activate conda environment
-source activate diffusers
+source activate transformers
 
 # get the directory where the bash script is located
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"

diff --git a/backend/python/diffusers/test.sh b/backend/python/diffusers/test.sh
@@ -6,7 +6,7 @@
 export PATH=$PATH:/opt/conda/bin
 
 # Activate conda environment
-source activate diffusers
+source activate transformers
 
 # get the directory where the bash script is located
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"