diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 10320ad1fc137..f3b8130925d48 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -69,6 +69,165 @@ jobs:
cd build
ctest --verbose --timeout 900
+ ubuntu-focal-cmake:
+ runs-on: ubuntu-20.04
+
+ strategy:
+ matrix:
+ include:
+ - build: 'avx2'
+ defines: ''
+ - build: 'avx'
+ defines: '-DLLAMA_AVX2=OFF'
+
+ steps:
+ - name: Clone
+ id: checkout
+ uses: actions/checkout@v1
+
+ - name: Dependencies
+ id: depends
+ run: |
+ sudo apt-get update
+ sudo apt-get install build-essential
+
+ - name: Build
+ id: cmake_build
+ run: |
+ mkdir build
+ cd build
+ cmake .. ${{ matrix.defines }} -DCMAKE_BUILD_RPATH_USE_ORIGIN=ON -DBUILD_SHARED_LIBS=ON
+ cmake --build . --config Release
+
+ - name: Test
+ id: cmake_test
+ run: |
+ cd build
+ ctest --verbose
+
+ - name: Determine tag name
+ id: tag
+ shell: bash
+ run: |
+ BUILD_NUMBER="$(git rev-list --count HEAD)"
+ SHORT_HASH="$(git rev-parse --short=7 HEAD)"
+ if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
+ echo "name=b${BUILD_NUMBER}" >> $GITHUB_OUTPUT
+ else
+ SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
+ echo "name=${SAFE_NAME}-b${BUILD_NUMBER}-${SHORT_HASH}" >> $GITHUB_OUTPUT
+ fi
+
+ - name: Pack artifacts
+ id: pack_artifacts
+ if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' }}
+ run: |
+ 7z a llama-${{ steps.tag.outputs.name }}-bin-ubuntu20.04-${{ matrix.build }}-x64.zip ./build/bin/*
+
+ - name: Upload artifacts
+ if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' }}
+ uses: actions/upload-artifact@v3
+ with:
+ path: |
+ llama-${{ steps.tag.outputs.name }}-bin-ubuntu20.04-${{ matrix.build }}-x64.zip
+
+ ubuntu-focal-cmake-cublas:
+ runs-on: ubuntu-20.04
+
+ strategy:
+ matrix:
+ cuda: ['12.1.0', '11.7.1']
+ build: ['cublas']
+
+ steps:
+ - name: Clone
+ id: checkout
+ uses: actions/checkout@v1
+
+ - name: Dependencies
+ id: depends
+ run: |
+ sudo apt-get update
+ sudo apt-get install build-essential
+
+ - uses: Jimver/cuda-toolkit@v0.2.11
+ id: cuda-toolkit
+ with:
+ cuda: ${{ matrix.cuda }}
+ method: 'network'
+ linux-local-args: '["--toolkit"]'
+ #TODO(green-sky): the action prefixes "cublas-dev" with "cuda-" instead of "lib"
+ #sub-packages: '["nvcc", "cudart", "cublas-dev"]'
+ sub-packages: '["nvcc", "cudart"]'
+ non-cuda-sub-packages: '["libcublas", "libcublas-dev"]'
+
+ - name: Build
+ id: cmake_build
+ run: |
+ mkdir build
+ cd build
+ cmake .. -DLLAMA_CUBLAS=ON -DCMAKE_BUILD_RPATH_USE_ORIGIN=ON -DBUILD_SHARED_LIBS=ON
+ cmake --build . --config Release
+
+ - name: Determine tag name
+ id: tag
+ shell: bash
+ run: |
+ BUILD_NUMBER="$(git rev-list --count HEAD)"
+ SHORT_HASH="$(git rev-parse --short=7 HEAD)"
+ if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
+ echo "name=b${BUILD_NUMBER}" >> $GITHUB_OUTPUT
+ else
+ SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
+ echo "name=${SAFE_NAME}-b${BUILD_NUMBER}-${SHORT_HASH}" >> $GITHUB_OUTPUT
+ fi
+
+ - name: Pack artifacts
+ id: pack_artifacts
+ if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' }}
+ run: |
+ 7z a llama-${{ steps.tag.outputs.name }}-bin-ubuntu20.04-${{ matrix.build }}-cu${{ matrix.cuda }}-x64.zip ./build/bin/*
+
+ - name: Upload artifacts
+ if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' }}
+ uses: actions/upload-artifact@v3
+ with:
+ path: |
+ llama-${{ steps.tag.outputs.name }}-bin-ubuntu20.04-${{ matrix.build }}-cu${{ matrix.cuda }}-x64.zip
+
+ - name: Copy and pack Cuda runtime
+ if: ${{ matrix.cuda == '12.1.0' }}
+ # TODO(green-sky): paths are cuda 12 specific
+ run: |
+ echo "Cuda install location: ${{steps.cuda-toolkit.outputs.CUDA_PATH}}"
+ mkdir './build/bin/cudart/'
+ ls "${{steps.cuda-toolkit.outputs.CUDA_PATH}}"
+ ls "${{steps.cuda-toolkit.outputs.CUDA_PATH}}/bin"
+ ls "${{steps.cuda-toolkit.outputs.CUDA_PATH}}/lib64"
+ cp "${{steps.cuda-toolkit.outputs.CUDA_PATH}}/lib64/libcudart.so.12" './build/bin/cudart/'
+ cp "${{steps.cuda-toolkit.outputs.CUDA_PATH}}/lib64/libcublas.so.12" './build/bin/cudart/'
+ cp "${{steps.cuda-toolkit.outputs.CUDA_PATH}}/lib64/libcublasLt.so.12" './build/bin/cudart/'
+ 7z a cudart-llama-bin-ubuntu20.04-cu${{ matrix.cuda }}-x64.zip ./build/bin/cudart/*
+
+ - name: Copy and pack Cuda runtime
+ if: ${{ matrix.cuda == '11.7.1' }}
+ # TODO(green-sky): paths are cuda 11 specific
+ run: |
+ echo "Cuda install location: ${{steps.cuda-toolkit.outputs.CUDA_PATH}}"
+ mkdir './build/bin/cudart/'
+ ls "${{steps.cuda-toolkit.outputs.CUDA_PATH}}/lib64"
+ cp "${{steps.cuda-toolkit.outputs.CUDA_PATH}}/lib64/libcudart.so.11.0" './build/bin/cudart/'
+ cp "${{steps.cuda-toolkit.outputs.CUDA_PATH}}/lib64/libcublas.so.11" './build/bin/cudart/'
+ cp "${{steps.cuda-toolkit.outputs.CUDA_PATH}}/lib64/libcublasLt.so.11" './build/bin/cudart/'
+ 7z a cudart-llama-bin-ubuntu20.04-cu${{ matrix.cuda }}-x64.zip ./build/bin/cudart/*
+
+ - name: Upload Cuda runtime
+ if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' }}
+ uses: actions/upload-artifact@v3
+ with:
+ path: |
+ cudart-llama-bin-ubuntu20.04-cu${{ matrix.cuda }}-x64.zip
+
ubuntu-latest-cmake-sanitizer:
runs-on: ubuntu-latest
@@ -203,8 +362,8 @@ jobs:
defines: '-DLLAMA_BUILD_SERVER=ON'
- build: 'avx'
defines: '-DLLAMA_BUILD_SERVER=ON -DLLAMA_AVX2=OFF'
- - build: 'avx512'
- defines: '-DLLAMA_BUILD_SERVER=ON -DLLAMA_AVX512=ON -DBUILD_SHARED_LIBS=ON'
+ #- build: 'avx512'
+ #defines: '-DLLAMA_BUILD_SERVER=ON -DLLAMA_AVX512=ON -DBUILD_SHARED_LIBS=ON'
- build: 'clblast'
defines: '-DLLAMA_BUILD_SERVER=ON -DLLAMA_CLBLAST=ON -DCMAKE_PREFIX_PATH="$env:RUNNER_TEMP/clblast"'
- build: 'openblas'
@@ -410,6 +569,8 @@ jobs:
needs:
- ubuntu-focal-make
- ubuntu-latest-cmake
+ - ubuntu-focal-cmake
+ - ubuntu-focal-cmake-cublas
- macOS-latest-make
- macOS-latest-cmake
- windows-latest-cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba008bcc66da5..8e8bd8fe1be04 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,7 @@ if (NOT XCODE AND NOT MSVC AND NOT CMAKE_BUILD_TYPE)
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
endif()
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ca1f39d31b081..994e39349954b 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -17,7 +17,7 @@ function(llama_build_and_test_executable source)
get_filename_component(TEST_TARGET ${source} NAME_WE)
add_executable(${TEST_TARGET} ${source})
install(TARGETS ${TEST_TARGET} RUNTIME)
- target_link_libraries(${TEST_TARGET} PRIVATE llama common)
+ target_link_libraries(${TEST_TARGET} PRIVATE ggml llama common)
add_test(NAME ${TEST_TARGET} COMMAND $<TARGET_FILE:${TEST_TARGET}> ${ARGN})
endfunction()