fix windows blas build - don't copy dll

This commit is contained in:
James Ravenscroft 2023-05-28 18:13:14 +01:00
parent 6723f61311
commit e22d561065

View File

@ -159,7 +159,7 @@ jobs:
- build: 'avx512' - build: 'avx512'
defines: '-DGGML_AVX512=ON' defines: '-DGGML_AVX512=ON'
- build: 'openblas' - build: 'openblas'
defines: '-DGGML_OPENBLAS=ON -DBLAS_INCLUDE_DIRS="$env:RUNNER_TEMP/openblas/include" -DBLAS_LIBRARIES="$env:RUNNER_TEMP/openblas/lib/libopenblas.lib"' defines: '-DGGML_OPENBLAS=ON -DBLAS_INCLUDE_DIRS="$env:RUNNER_TEMP/openblas/include" -DBLAS_LIBRARIES="$env:RUNNER_TEMP/openblas/lib/openblas.lib"'
steps: steps:
@ -199,7 +199,6 @@ jobs:
$msvc = $(join-path $vcdir $('VC\Tools\MSVC\'+$(gc -raw $(join-path $vcdir 'VC\Auxiliary\Build\Microsoft.VCToolsVersion.default.txt')).Trim())) $msvc = $(join-path $vcdir $('VC\Tools\MSVC\'+$(gc -raw $(join-path $vcdir 'VC\Auxiliary\Build\Microsoft.VCToolsVersion.default.txt')).Trim()))
$lib = $(join-path $msvc 'bin\Hostx64\x64\lib.exe') $lib = $(join-path $msvc 'bin\Hostx64\x64\lib.exe')
& $lib /machine:x64 "/def:${env:RUNNER_TEMP}/openblas/lib/libopenblas.def" "/out:${env:RUNNER_TEMP}/openblas/lib/openblas.lib" /name:openblas.dll & $lib /machine:x64 "/def:${env:RUNNER_TEMP}/openblas/lib/libopenblas.def" "/out:${env:RUNNER_TEMP}/openblas/lib/openblas.lib" /name:openblas.dll
- name: Build - name: Build
id: cmake_build id: cmake_build
env: env:
@ -213,12 +212,12 @@ jobs:
cmake --build . --config Release -t codegen-serve cmake --build . --config Release -t codegen-serve
cmake --build . --config Release -t codegen-quantize cmake --build . --config Release -t codegen-quantize
- name: Add libopenblas.dll # - name: Add libopenblas.dll
id: add_libopenblas_dll # id: add_libopenblas_dll
if: ${{ matrix.build == 'openblas' }} # if: ${{ matrix.build == 'openblas' }}
run: | # run: |
cp $env:RUNNER_TEMP/openblas/bin/libopenblas.dll ./build/bin/Release/openblas.dll # cp $env:RUNNER_TEMP/openblas/bin/libopenblas.dll ./build/bin/Release/openblas.dll
cp $env:RUNNER_TEMP/OpenBLAS.LICENSE.txt ./build/bin/Release/OpenBLAS-${env:OPENBLAS_VERSION}.txt # cp $env:RUNNER_TEMP/OpenBLAS.LICENSE.txt ./build/bin/Release/OpenBLAS-${env:OPENBLAS_VERSION}.txt
- name: Check AVX512F support - name: Check AVX512F support
id: check_avx512f id: check_avx512f