Merge pull request containers#101 from MichaelClifford/reorganize

Replace playground with model_servers
mhdawson · Mar 28, 2024 · 0055a48 · 0055a48
2 parents 865533c + 9598ecb
commit 0055a48
Show file tree

Hide file tree

Showing 16 changed files with 11 additions and 22 deletions.
diff --git a/chatbot/ai-lab.yaml b/chatbot/ai-lab.yaml
@@ -5,8 +5,8 @@ application:
   description: This is a Streamlit chat demo application. 
   containers:
     - name: llamacpp-server
-      contextdir: ../playground
-      containerfile: Containerfile
+      contextdir: ../model_servers/llamacpp_python
+      containerfile: ./base/Containerfile
       model-service: true
       backend: 
         - llama

diff --git a/code-generation/ai-lab.yaml b/code-generation/ai-lab.yaml
@@ -5,8 +5,8 @@ application:
   description: This is a code-generation demo application. 
   containers:
     - name: llamacpp-server
-      contextdir: ../playground
-      containerfile: Containerfile
+      contextdir: ../model_servers/llamacpp_python
+      containerfile: ./base/Containerfile
       model-service: true
       backend: 
         - llama

diff --git a/image_understanding/ai-lab.yaml b/image_understanding/ai-lab.yaml
@@ -4,8 +4,8 @@ application:
   description: This demo uses a Multimodal model to analyze the content of images.  
   containers:
     - name: llamacpp-server
-      contextdir: ../playground
-      containerfile: Containerfile
+      contextdir: ../model_servers/llamacpp_python
+      containerfile: ./base/Containerfile
       model-service: true
       backend: 
         - llama

diff --git a/model_servers/llamacpp/src/run.sh b/model_servers/llamacpp/src/run.sh
diff --git a/playground/README.md → model_servers/llamacpp_python/README.md b/playground/README.md → model_servers/llamacpp_python/README.md
diff --git a/model_servers/llamacpp/base/Containerfile → ...ervers/llamacpp_python/base/Containerfile b/model_servers/llamacpp/base/Containerfile → ...ervers/llamacpp_python/base/Containerfile
@@ -4,4 +4,4 @@ COPY src .
 RUN pip install --upgrade pip
 RUN pip install --no-cache-dir --upgrade -r /locallm/requirements.txt
 EXPOSE 8001
-ENTRYPOINT [ "sh", "run.sh" ]
+ENTRYPOINT [ "sh", "run.sh" ]
diff --git a/model_servers/llamacpp/cuda/Containerfile → ...ervers/llamacpp_python/cuda/Containerfile b/model_servers/llamacpp/cuda/Containerfile → ...ervers/llamacpp_python/cuda/Containerfile
diff --git a/model_servers/llamacpp/cuda/README.md → model_servers/llamacpp_python/cuda/README.md b/model_servers/llamacpp/cuda/README.md → model_servers/llamacpp_python/cuda/README.md
diff --git a/model_servers/llamacpp/src/requirements.txt → ...vers/llamacpp_python/src/requirements.txt b/model_servers/llamacpp/src/requirements.txt → ...vers/llamacpp_python/src/requirements.txt
diff --git a/playground/run.sh → model_servers/llamacpp_python/src/run.sh b/playground/run.sh → model_servers/llamacpp_python/src/run.sh
diff --git a/playground/tooling_options.ipynb → ...ers/llamacpp_python/tooling_options.ipynb b/playground/tooling_options.ipynb → ...ers/llamacpp_python/tooling_options.ipynb
diff --git a/model_servers/llamacpp/vulkan/Containerfile → ...vers/llamacpp_python/vulkan/Containerfile b/model_servers/llamacpp/vulkan/Containerfile → ...vers/llamacpp_python/vulkan/Containerfile
diff --git a/playground/Containerfile b/playground/Containerfile
diff --git a/playground/requirements.txt b/playground/requirements.txt
diff --git a/rag/ai-lab.yaml b/rag/ai-lab.yaml
@@ -5,8 +5,8 @@ application:
   description: This is a RAG demo application. 
   containers:
     - name: llamacpp-server
-      contextdir: ../playground
-      containerfile: Containerfile
+      contextdir: ../model_servers/llamacpp_python
+      containerfile: ./base/Containerfile
       model-service: true
       backend: 
         - llama

diff --git a/summarizer-langchain/ai-lab.yaml b/summarizer-langchain/ai-lab.yaml
@@ -5,8 +5,8 @@ application:
   description: This is a Streamlit demo application for summarizing text. 
   containers:
     - name: llamacpp-server
-      contextdir: ../playground
-      containerfile: Containerfile
+      contextdir: ../model_servers/llamacpp_python
+      containerfile: ./base/Containerfile
       model-service: true
       backend: 
         - llama