Merge branch 'ggerganov:master' into master

sealad886 · Jun 19, 2024 · 7039c02 · 7039c02
2 parents 9e70ce5 + 9c77ec1
commit 7039c02
Show file tree

Hide file tree

Showing 23 changed files with 10,030 additions and 9,321 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -42,7 +42,6 @@ build:
             - cmake/**
             - CMakeLists.txt
             - CMakePresets.json
-            - codecov.yml
 examples:
     - changed-files:
         - any-glob-to-any-file: examples/**

diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml
@@ -87,8 +87,22 @@ jobs:
             exit 1
           fi
 
+      - name: Build (no OpenMP)
+        id: cmake_build_no_openmp
+        if: ${{ matrix.sanitizer == 'THREAD' }}
+        run: |
+          cmake -B build \
+              -DLLAMA_NATIVE=OFF \
+              -DLLAMA_BUILD_SERVER=ON \
+              -DLLAMA_CURL=ON \
+              -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
+              -DLLAMA_SANITIZE_${{ matrix.sanitizer }}=ON \
+              -DLLAMA_OPENMP=OFF ;
+          cmake --build build --config ${{ matrix.build_type }} -j $(nproc) --target llama-server
+
       - name: Build
         id: cmake_build
+        if: ${{ matrix.sanitizer != 'THREAD' }}
         run: |
           cmake -B build \
               -DLLAMA_NATIVE=OFF \

diff --git a/codecov.yml b/codecov.yml