Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: support blis and other blas implementation #1536

Merged
merged 5 commits into from
May 20, 2023

Conversation

zenixls2
Copy link
Contributor

Reopen to cope with the ci errors
Requested by @ggerganov

@zenixls2
Copy link
Contributor Author

I need to go back to my PC to fix the indent issue in cmake file

@ggerganov
Copy link
Owner

The .github/workflow/build.yml file needs to be updated since it is still using LLAMA_OPENBLAS:

 $ ▶ grep -R -i openblas .github/workflows/*
.github/workflows/build.yml:      OPENBLAS_VERSION: 0.3.23
.github/workflows/build.yml:          - build: 'openblas'
.github/workflows/build.yml:            defines: '-DLLAMA_OPENBLAS=ON -DBLAS_LIBRARIES="/LIBPATH:$env:RUNNER_TEMP/openblas/lib" -DOPENBLAS_INC="$env:RUNNER_TEMP/openblas/include"'
.github/workflows/build.yml:      - name: Download OpenBLAS
.github/workflows/build.yml:        id: get_openblas
.github/workflows/build.yml:        if: ${{ matrix.build == 'openblas' }}
.github/workflows/build.yml:          curl.exe -o $env:RUNNER_TEMP/openblas.zip -L "https://github.com/xianyi/OpenBLAS/releases/download/v${env:OPENBLAS_VERSION}/OpenBLAS-${env:OPENBLAS_VERSION}-x64.zip"
.github/workflows/build.yml:          curl.exe -o $env:RUNNER_TEMP/OpenBLAS.LICENSE.txt -L "https://github.com/xianyi/OpenBLAS/raw/v${env:OPENBLAS_VERSION}/LICENSE"
.github/workflows/build.yml:          mkdir $env:RUNNER_TEMP/openblas
.github/workflows/build.yml:          tar.exe -xvf $env:RUNNER_TEMP/openblas.zip -C $env:RUNNER_TEMP/openblas
.github/workflows/build.yml:          & $lib /machine:x64 "/def:${env:RUNNER_TEMP}/openblas/lib/libopenblas.def" "/out:${env:RUNNER_TEMP}/openblas/lib/openblas.lib" /name:openblas.dll
.github/workflows/build.yml:      - name: Add libopenblas.dll
.github/workflows/build.yml:        id: add_libopenblas_dll
.github/workflows/build.yml:        if: ${{ matrix.build == 'openblas' }}
.github/workflows/build.yml:          cp $env:RUNNER_TEMP/openblas/bin/libopenblas.dll ./build/bin/Release/openblas.dll
.github/workflows/build.yml:          cp $env:RUNNER_TEMP/OpenBLAS.LICENSE.txt ./build/bin/Release/OpenBLAS-${env:OPENBLAS_VERSION}.txt
.github/workflows/build.yml:#            obzip: https://github.com/xianyi/OpenBLAS/releases/download/v0.3.21/OpenBLAS-0.3.21-x86.zip
.github/workflows/build.yml:#            obzip: https://github.com/xianyi/OpenBLAS/releases/download/v0.3.21/OpenBLAS-0.3.21-x64.zip
.github/workflows/build.yml:#      - name: Fetch OpenBLAS
.github/workflows/build.yml:#          copy blas/include/openblas_config.h .
.github/workflows/build.yml:#          -DLLAMA_SUPPORT_OPENBLAS=${{ matrix.blas }}
.github/workflows/build.yml:#      - name: Copy libopenblas.dll
.github/workflows/build.yml:#        run: copy "$env:blasdir/bin/libopenblas.dll" build/bin/${{ matrix.build }}

@zenixls2 zenixls2 force-pushed the feature/blis branch 2 times, most recently from ddf7e2f to 63c8b47 Compare May 20, 2023 14:06
@zenixls2
Copy link
Contributor Author

@ggerganov all resolved

Copy link
Owner

@ggerganov ggerganov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@ggerganov ggerganov merged commit b8ee340 into ggerganov:master May 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants