Skip to content

Commit 9eadc1f

Browse files
authored
BLD: Fix build (#111)
1 parent a0829ea commit 9eadc1f

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

.github/workflows/build-wheel-cuda-hip.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
docker exec rocm-container bash -c '
8484
df -ha
8585
apt-get update
86-
apt-get install -y build-essential git cmake libcurl4-openssl-dev patchelf rocblas-dev hipblas-dev rocwmma-dev curl
86+
apt-get install -y build-essential git cmake libcurl4-openssl-dev libssl-dev patchelf rocblas-dev hipblas-dev rocwmma-dev curl
8787
apt-get clean
8888
df -ha
8989
hipconfig --full
@@ -199,7 +199,7 @@ jobs:
199199
sudo wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add -
200200
sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-jammy.list https://packages.lunarg.com/vulkan/lunarg-vulkan-jammy.list
201201
sudo apt-get update -y
202-
sudo apt-get install -y build-essential git cmake libcurl4-openssl-dev patchelf vulkan-sdk mesa-vulkan-drivers
202+
sudo apt-get install -y build-essential git cmake libcurl4-openssl-dev libssl-dev patchelf vulkan-sdk mesa-vulkan-drivers
203203
204204
- name: System Dependencies (Windows)
205205
if: runner.os == 'Windows'
@@ -339,7 +339,7 @@ jobs:
339339
340340
# First install basic build tools
341341
sudo apt-get update
342-
sudo apt-get install -y build-essential
342+
sudo apt-get install -y build-essential libssl-dev
343343
344344
# Initialize conda for shell
345345
source $CONDA/etc/profile.d/conda.sh

.github/workflows/build-wheel.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@ jobs:
6464
# Build only cp310 for abi3 wheel (compatible with all Python 3.10+)
6565
CIBW_BUILD: cp310-*
6666
CIBW_TEST_REQUIRES: pytest requests pytest-asyncio pytest-timeout
67-
CIBW_BEFORE_ALL_LINUX: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && source $HOME/.cargo/env
67+
CIBW_BEFORE_ALL_LINUX: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && source $HOME/.cargo/env && (yum install -y openssl-devel 2>/dev/null || apk add openssl-dev 2>/dev/null)
6868
CIBW_BEFORE_BUILD: pip install -r requirements.txt && make
6969
CIBW_BUILD_VERBOSITY: 1
7070
CIBW_ENVIRONMENT_LINUX: "PATH=$HOME/.cargo/bin:$PATH XLLAMACPP_BUILD_AARCH64=${{ matrix.arch == 'aarch64' && '1' || '' }}"
7171
CIBW_ENVIRONMENT_MACOS: "XLLAMACPP_BUILD_AARCH64=${{ matrix.arch == 'aarch64' && '1' || '' }}"
72-
CIBW_ENVIRONMENT_WINDOWS: "XLLAMACPP_BUILD_AARCH64=${{ matrix.arch == 'aarch64' && '1' || '' }} LLAMA_BUILD_BORINGSSL=ON"
72+
CIBW_ENVIRONMENT_WINDOWS: "XLLAMACPP_BUILD_AARCH64=${{ matrix.arch == 'aarch64' && '1' || '' }}"
7373
with:
7474
package-dir: ./
7575

.github/workflows/ci.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ jobs:
8080
- name: Install dependencies
8181
env:
8282
OS: ${{ matrix.os }}
83-
LLAMA_BUILD_BORINGSSL: ${{ matrix.os == 'windows-latest' && 'ON' || '' }}
8483
run: |
8584
pip install -r requirements.txt
8685
pip install pytest pytest-timeout requests gguf orjson

0 commit comments

Comments
 (0)