Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,12 @@ jobs:
-DLLAMA_SANITIZE_${{ matrix.sanitizer }}=ON \
-DGGML_SANITIZE_${{ matrix.sanitizer }}=ON \
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
cmake --build build --config ${{ matrix.build_type }} -j $(nproc)

J=$(( $(nproc) / 2 ))
Comment thread
CISC marked this conversation as resolved.
Outdated
if [ $J -lt 1 ]; then J=1; fi
echo "Using -j $J"

cmake --build build --config ${{ matrix.build_type }} -j $J

- name: Build (no OpenMP)
id: cmake_build_no_openmp
Expand All @@ -307,7 +312,12 @@ jobs:
-DGGML_SANITIZE_${{ matrix.sanitizer }}=ON \
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
-DGGML_OPENMP=OFF
cmake --build build --config ${{ matrix.build_type }} -j $(nproc)

J=$(( $(nproc) / 2 ))
Comment thread
CISC marked this conversation as resolved.
Outdated
if [ $J -lt 1 ]; then J=1; fi
echo "Using -j $J"

cmake --build build --config ${{ matrix.build_type }} -j $J

- name: Test
id: cmake_test
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ jobs:
- name: Build
id: cmake_build
run: |
J=$(( ($(nproc) + 1) / 2 ))
if [ $J -lt 1 ]; then J=1; fi
echo "Using -j $J"

cmake -B build \
-DLLAMA_BUILD_BORINGSSL=ON \
-DGGML_SCHED_NO_REALLOC=ON \
Expand All @@ -81,7 +85,7 @@ jobs:
-DLLAMA_SANITIZE_ADDRESS=${{ matrix.sanitizer == 'ADDRESS' }} \
-DLLAMA_SANITIZE_THREAD=${{ matrix.sanitizer == 'THREAD' }} \
-DLLAMA_SANITIZE_UNDEFINED=${{ matrix.sanitizer == 'UNDEFINED' }}
cmake --build build --config ${{ matrix.build_type }} -j ${env:NUMBER_OF_PROCESSORS} --target llama-server

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think this was actually the problem, it looks like this is not defined, thus running the build with just -j...

cmake --build build --config ${{ matrix.build_type }} -j $J --target llama-server

- name: Python setup
id: setup_python
Expand Down Expand Up @@ -117,7 +121,7 @@ jobs:
id: cmake_build
run: |
cmake -B build -DLLAMA_BUILD_BORINGSSL=ON -DGGML_SCHED_NO_REALLOC=ON
cmake --build build --config Release -j ${env:NUMBER_OF_PROCESSORS} --target llama-server
cmake --build build --config Release -j $(nproc) --target llama-server
Comment thread
CISC marked this conversation as resolved.
Outdated

- name: Python setup
id: setup_python
Expand Down
Loading