From 3523c65ede68f5be3dc3ffb8ee06b1eb91f97aa0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 00:53:52 +0000 Subject: [PATCH 1/5] build(deps): Bump llama-cpp-python[server] from 0.2.79 to 0.2.88 Bumps [llama-cpp-python[server]](https://github.com/abetlen/llama-cpp-python) from 0.2.79 to 0.2.88. - [Release notes](https://github.com/abetlen/llama-cpp-python/releases) - [Changelog](https://github.com/abetlen/llama-cpp-python/blob/main/CHANGELOG.md) - [Commits](https://github.com/abetlen/llama-cpp-python/compare/v0.2.79...v0.2.88) --- updated-dependencies: - dependency-name: llama-cpp-python[server] dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- chat/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chat/requirements.txt b/chat/requirements.txt index 9ae297f..f670f86 100644 --- a/chat/requirements.txt +++ b/chat/requirements.txt @@ -1,2 +1,2 @@ -llama-cpp-python[server]==0.2.79 +llama-cpp-python[server]==0.2.88 pip==24.2 From 69f414a3be694ea8d919396b9f939a03475cae01 Mon Sep 17 00:00:00 2001 From: Jeff MAURY Date: Tue, 20 Aug 2024 08:48:40 +0200 Subject: [PATCH 2/5] fix: update Vulkan flag Signed-off-by: Jeff MAURY --- chat/vulkan/amd64/Containerfile | 2 +- chat/vulkan/arm64/Containerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chat/vulkan/amd64/Containerfile b/chat/vulkan/amd64/Containerfile index 8cc796d..31c9097 100644 --- a/chat/vulkan/amd64/Containerfile +++ b/chat/vulkan/amd64/Containerfile @@ -30,7 +30,7 @@ RUN dnf install -y python3-dnf-plugin-versionlock && \ 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 index 6456b0f..104bea2 100644 --- a/chat/vulkan/arm64/Containerfile +++ b/chat/vulkan/arm64/Containerfile @@ -29,7 +29,7 @@ https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \ 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 From 3ec5282d7cc84a6430849f23d1231f16715c3690 Mon Sep 17 00:00:00 2001 From: Jeff MAURY Date: Tue, 20 Aug 2024 10:04:20 +0200 Subject: [PATCH 3/5] fix: llama.cpp vulkan now requires glslc Signed-off-by: Jeff MAURY --- chat/vulkan/amd64/Containerfile | 10 ++++++++++ chat/vulkan/arm64/Containerfile | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/chat/vulkan/amd64/Containerfile b/chat/vulkan/amd64/Containerfile index 31c9097..e5b06fd 100644 --- a/chat/vulkan/amd64/Containerfile +++ b/chat/vulkan/amd64/Containerfile @@ -28,6 +28,16 @@ RUN dnf install -y python3-dnf-plugin-versionlock && \ dnf clean all WORKDIR /locallm +RUN git clone https://github.com/google/shaderc +WORKDIR shaderc +RUN ./utils/git-sync-deps +WORKDIR build +RUN cmake -GNinja \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr/local \ + .. \ + && ninja install +WORKDIR /locallm COPY requirements.txt ./ RUN pip install --upgrade pip ENV CMAKE_ARGS="-DGGML_VULKAN=on" diff --git a/chat/vulkan/arm64/Containerfile b/chat/vulkan/arm64/Containerfile index 104bea2..39e158d 100644 --- a/chat/vulkan/arm64/Containerfile +++ b/chat/vulkan/arm64/Containerfile @@ -27,6 +27,16 @@ https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \ 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 clean all +RUN git clone https://github.com/google/shaderc +WORKDIR shaderc +RUN ./utils/git-sync-deps +WORKDIR build +RUN cmake -GNinja \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr/local \ + .. \ + && ninja install +WORKDIR /locallm COPY requirements.txt ./ RUN pip install --upgrade pip ENV CMAKE_ARGS="-DGGML_VULKAN=on" From 2728c6f73cd366fc1ebb4cad067f9287433704f3 Mon Sep 17 00:00:00 2001 From: Jeff MAURY Date: Tue, 20 Aug 2024 12:46:36 +0200 Subject: [PATCH 4/5] fix: add missing lib for Vulkan AMD64 Signed-off-by: Jeff MAURY --- chat/vulkan/amd64/Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chat/vulkan/amd64/Containerfile b/chat/vulkan/amd64/Containerfile index e5b06fd..990cd7b 100644 --- a/chat/vulkan/amd64/Containerfile +++ b/chat/vulkan/amd64/Containerfile @@ -24,7 +24,7 @@ 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 clean all WORKDIR /locallm From 687688d263b03a7e9c6908f877fea294cd92a5c1 Mon Sep 17 00:00:00 2001 From: Jeff MAURY Date: Tue, 20 Aug 2024 15:51:45 +0200 Subject: [PATCH 5/5] fix: skip tests Signed-off-by: Jeff MAURY --- chat/vulkan/amd64/Containerfile | 1 + chat/vulkan/arm64/Containerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/chat/vulkan/amd64/Containerfile b/chat/vulkan/amd64/Containerfile index 990cd7b..126e63e 100644 --- a/chat/vulkan/amd64/Containerfile +++ b/chat/vulkan/amd64/Containerfile @@ -34,6 +34,7 @@ RUN ./utils/git-sync-deps WORKDIR build RUN cmake -GNinja \ -DCMAKE_BUILD_TYPE=Release \ + -DSHADERC_SKIP_TESTS=ON \ -DCMAKE_INSTALL_PREFIX=/usr/local \ .. \ && ninja install diff --git a/chat/vulkan/arm64/Containerfile b/chat/vulkan/arm64/Containerfile index 39e158d..16cb98a 100644 --- a/chat/vulkan/arm64/Containerfile +++ b/chat/vulkan/arm64/Containerfile @@ -33,6 +33,7 @@ RUN ./utils/git-sync-deps WORKDIR build RUN cmake -GNinja \ -DCMAKE_BUILD_TYPE=Release \ + -DSHADERC_SKIP_TESTS=ON \ -DCMAKE_INSTALL_PREFIX=/usr/local \ .. \ && ninja install