Skip to content

Commit 9bf42cd

Browse files
committed
fix windows-latest-cmake*
1 parent 21c423e commit 9bf42cd

File tree

1 file changed

+33
-4
lines changed

1 file changed

+33
-4
lines changed

.github/workflows/build.yml

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -898,10 +898,17 @@ jobs:
898898
-DCMAKE_INSTALL_PREFIX="$env:RUNNER_TEMP/opencl-arm64-release"
899899
cmake --build build-arm64-release --target install --config release
900900
901+
- name: libCURL
902+
id: get_libcurl
903+
uses: ./.github/actions/windows-setup-curl
904+
901905
- name: Build
902906
id: cmake_build
907+
env:
908+
CURL_PATH: ${{ steps.get_libcurl.outputs.curl_path }}
903909
run: |
904-
cmake -S . -B build ${{ matrix.defines }}
910+
cmake -S . -B build ${{ matrix.defines }} `
911+
-DCURL_LIBRARY="$env:CURL_PATH/lib/libcurl.dll.a" -DCURL_INCLUDE_DIR="$env:CURL_PATH/include"
905912
cmake --build build --config Release -j ${env:NUMBER_OF_PROCESSORS}
906913
907914
- name: Add libopenblas.dll
@@ -1091,16 +1098,23 @@ jobs:
10911098
run: |
10921099
choco install ninja
10931100
1101+
- name: libCURL
1102+
id: get_libcurl
1103+
uses: ./.github/actions/windows-setup-curl
1104+
10941105
- name: Build
10951106
id: cmake_build
10961107
shell: cmd
1108+
env:
1109+
CURL_PATH: ${{ steps.get_libcurl.outputs.curl_path }}
10971110
run: |
10981111
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
10991112
cmake -S . -B build -G "Ninja Multi-Config" ^
11001113
-DLLAMA_BUILD_SERVER=ON ^
11011114
-DGGML_NATIVE=OFF ^
11021115
-DGGML_CUDA=ON ^
1103-
-DGGML_RPC=ON
1116+
-DGGML_RPC=ON ^
1117+
-DCURL_LIBRARY="%CURL_PATH%/lib/libcurl.dll.a" -DCURL_INCLUDE_DIR="%CURL_PATH%/include"
11041118
set /A NINJA_JOBS=%NUMBER_OF_PROCESSORS%-1
11051119
cmake --build build --config Release -j %NINJA_JOBS% -t ggml
11061120
cmake --build build --config Release
@@ -1261,8 +1275,14 @@ jobs:
12611275
key: ${{ github.job }}
12621276
evict-old-files: 1d
12631277

1278+
- name: libCURL
1279+
id: get_libcurl
1280+
uses: ./.github/actions/windows-setup-curl
1281+
12641282
- name: Build
12651283
id: cmake_build
1284+
env:
1285+
CURL_PATH: ${{ steps.get_libcurl.outputs.curl_path }}
12661286
run: |
12671287
$env:HIP_PATH=$(Resolve-Path 'C:\Program Files\AMD\ROCm\*\bin\clang.exe' | split-path | split-path)
12681288
$env:CMAKE_PREFIX_PATH="${env:HIP_PATH}"
@@ -1273,9 +1293,11 @@ jobs:
12731293
-DCMAKE_BUILD_TYPE=Release `
12741294
-DGGML_HIP=ON `
12751295
-DGGML_HIP_ROCWMMA_FATTN=ON `
1276-
-DGGML_RPC=ON
1296+
-DGGML_RPC=ON `
1297+
-DCURL_LIBRARY="$env:CURL_PATH/lib/libcurl.dll.a" -DCURL_INCLUDE_DIR="$env:CURL_PATH/include"
12771298
cmake --build build -j ${env:NUMBER_OF_PROCESSORS}
12781299
1300+
# TODO: reuse windows-latest-cmake-hip instead of duplicating this job
12791301
windows-latest-cmake-hip-release:
12801302
if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' }}
12811303
runs-on: windows-latest
@@ -1317,8 +1339,14 @@ jobs:
13171339
run: |
13181340
& 'C:\Program Files\AMD\ROCm\*\bin\clang.exe' --version
13191341
1342+
- name: libCURL
1343+
id: get_libcurl
1344+
uses: ./.github/actions/windows-setup-curl
1345+
13201346
- name: Build
13211347
id: cmake_build
1348+
env:
1349+
CURL_PATH: ${{ steps.get_libcurl.outputs.curl_path }}
13221350
run: |
13231351
$env:HIP_PATH=$(Resolve-Path 'C:\Program Files\AMD\ROCm\*\bin\clang.exe' | split-path | split-path)
13241352
$env:CMAKE_PREFIX_PATH="${env:HIP_PATH}"
@@ -1330,7 +1358,8 @@ jobs:
13301358
-DAMDGPU_TARGETS=${{ matrix.gpu_target }} `
13311359
-DGGML_HIP_ROCWMMA_FATTN=ON `
13321360
-DGGML_HIP=ON `
1333-
-DGGML_RPC=ON
1361+
-DGGML_RPC=ON `
1362+
-DCURL_LIBRARY="$env:CURL_PATH/lib/libcurl.dll.a" -DCURL_INCLUDE_DIR="$env:CURL_PATH/include"
13341363
cmake --build build -j ${env:NUMBER_OF_PROCESSORS}
13351364
md "build\bin\rocblas\library\"
13361365
cp "${env:HIP_PATH}\bin\hipblas.dll" "build\bin\"

0 commit comments

Comments
 (0)