fix: update Vulkan flag

Signed-off-by: Jeff MAURY <[email protected]> fix: llama.cpp vulkan now requires glslc Signed-off-by: Jeff MAURY <[email protected]> fix: add missing lib for Vulkan AMD64 Signed-off-by: Jeff MAURY <[email protected]> fix: skip tests Signed-off-by: Jeff MAURY <[email protected]>
containers · Sep 23, 2024 · a630569 · a630569
1 parent ad1d9e4
commit a630569
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/chat/requirements.txt b/chat/requirements.txt
@@ -1,2 +1,2 @@
-llama-cpp-python[server]==0.2.88
+llama-cpp-python[server]==0.2.90
 pip==24.2
diff --git a/chat/vulkan/amd64/Containerfile b/chat/vulkan/amd64/Containerfile
@@ -24,13 +24,16 @@ RUN dnf install -y python3-dnf-plugin-versionlock && \
     dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
     dnf install -y git cmake ninja-build gcc gcc-c++ && \
     dnf copr enable -y ligenix/enterprise-sandbox epel-9-x86_64 && \
-    dnf install -y vulkan-headers vulkan-tools && \
+    dnf install -y vulkan-headers vulkan-tools vulkan-loader-devel && \
+    dnf copr enable -y ligenix/enterprise-buildtools epel-9-x86_64 && \
+    dnf copr enable -y jeffmaury/shaderc epel-9-x86_64 && \
+    dnf install -y glslc && \
     dnf clean all
 
 WORKDIR /locallm
 COPY requirements.txt ./
 RUN pip install --upgrade pip
-ENV CMAKE_ARGS="-DLLAMA_VULKAN=on"
+ENV CMAKE_ARGS="-DGGML_VULKAN=on"
 ENV FORCE_CMAKE=1
 RUN pip install --target=/locallm --no-cache-dir --upgrade -r requirements.txt
 

diff --git a/chat/vulkan/arm64/Containerfile b/chat/vulkan/arm64/Containerfile
@@ -26,10 +26,12 @@ https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
     dnf install -y mesa-vulkan-drivers-23.3.3-101.el9.aarch64 && \
     dnf versionlock  mesa-vulkan-drivers-23.3.3-101.el9.aarch64 && \
     dnf install -y git cmake ninja-build gcc gcc-c++ vulkan-loader-devel vulkan-tools && \
+    dnf copr enable -y jeffmaury/shaderc epel-9-aarch64 && \
+    dnf install -y glslc && \
     dnf clean all
 COPY requirements.txt ./
 RUN pip install --upgrade pip
-ENV CMAKE_ARGS="-DLLAMA_VULKAN=on"
+ENV CMAKE_ARGS="-DGGML_VULKAN=on"
 ENV FORCE_CMAKE=1
 RUN pip install --target=/locallm --no-cache-dir --upgrade -r requirements.txt