Merge branch 'main' of github.com:containers/ai-lab-recipes into squash

containers · Jun 11, 2024 · 3c85c24 · 3c85c24
2 parents 885fcb6 + f90a88c
commit 3c85c24
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/model_servers/common/Makefile.common b/model_servers/common/Makefile.common
@@ -12,7 +12,7 @@ endif
 
 .PHONY: build
 build:
-	podman build --squash-all $(CHAT_FORMAT:%=--build-arg CHAT_FORMAT=%) --build-arg PORT=$(PORT) -t $(IMAGE) . -f base/Containerfile
+	podman build --squash-all --build-arg PORT=$(PORT) -t $(IMAGE) . -f base/Containerfile
 
 .PHONY: install
 install:

diff --git a/model_servers/llamacpp_python/Makefile b/model_servers/llamacpp_python/Makefile
@@ -1,6 +1,6 @@
 APP := llamacpp_python
 PORT ?= 8001
-CHAT_FORMAT ?= llama-2
+CHAT_FORMAT ?=
 
 include ../common/Makefile.common
 

diff --git a/model_servers/llamacpp_python/base/Containerfile b/model_servers/llamacpp_python/base/Containerfile
@@ -1,5 +1,4 @@
 FROM registry.access.redhat.com/ubi9/python-311:1-62.1716478620
-ENV CHAT_FORMAT=llama-2
 WORKDIR /locallm
 COPY src .
 USER root

diff --git a/model_servers/llamacpp_python/src/run.sh b/model_servers/llamacpp_python/src/run.sh
@@ -11,7 +11,7 @@ if [ ${MODEL_PATH} ]; then
         --port ${PORT:=8001} \
         --n_gpu_layers ${GPU_LAYERS:=0} \
         --clip_model_path ${CLIP_MODEL_PATH:=None} \
-        --chat_format ${CHAT_FORMAT:="llama-2"} \
+        --chat_format ${CHAT_FORMAT:=None} \
         --interrupt_requests ${INTERRUPT_REQUESTS:=False}
     exit 0
 fi