Merge branch 'master' into fix-conda-not-found

mudler · Nov 26, 2023 · 39b0d7c · 39b0d7c
2 parents 7bd476d + 9482acf
commit 39b0d7c
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ GOLLAMA_VERSION?=aeba71ee842819da681ea537e78846dc75949ac0
 
 GOLLAMA_STABLE_VERSION?=50cee7712066d9e38306eccadcfbb44ea87df4b7
 
-CPPLLAMA_VERSION?=e9c13ff78114af6fc6a4f27cc8dcdda0f3d389fb
+CPPLLAMA_VERSION?=f837c3a992b2b6146936cb120871a8cf9d0e3857
 
 # gpt4all version
 GPT4ALL_REPO?=https://github.com/nomic-ai/gpt4all

diff --git a/backend/python/transformers/run.sh b/backend/python/transformers/run.sh
@@ -11,4 +11,4 @@ source activate transformers
 # get the directory where the bash script is located
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-python $DIR/transformers.py $@
+python $DIR/transformers_server.py $@
diff --git a/backend/python/transformers/test.sh b/backend/python/transformers/test.sh
@@ -8,4 +8,4 @@ source activate transformers
 # get the directory where the bash script is located
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-python -m unittest $DIR/test_transformers.py
+python -m unittest $DIR/test_transformers_server.py
diff --git a/backend/python/transformers/test_transformers.py b/backend/python/transformers/test_transformers.py
@@ -18,7 +18,7 @@ def setUp(self):
         """
         This method sets up the gRPC service by starting the server
         """
-        self.service = subprocess.Popen(["python3", "transformers.py", "--addr", "localhost:50051"])
+        self.service = subprocess.Popen(["python3", "transformers_server.py", "--addr", "localhost:50051"])
 
     def tearDown(self) -> None:
         """

diff --git a/backend/python/transformers/transformers.py → ...ython/transformers/transformers_server.py b/backend/python/transformers/transformers.py → ...ython/transformers/transformers_server.py