From 5144018e7be5b82d5a48bf51e48082415dc9f50f Mon Sep 17 00:00:00 2001 From: Georgi Gerganov Date: Sat, 7 Feb 2026 14:50:05 +0200 Subject: [PATCH] cont : simplify --- .github/workflows/build.yml | 12 ++---------- .github/workflows/server.yml | 6 +----- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 89e64f70be..6c7ab71143 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -296,11 +296,7 @@ jobs: -DGGML_SANITIZE_${{ matrix.sanitizer }}=ON \ -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} - J=$(( ($(nproc) + 1) / 2 )) - if [ $J -lt 1 ]; then J=1; fi - echo "Using -j $J" - - cmake --build build --config ${{ matrix.build_type }} -j $J + cmake --build build --config ${{ matrix.build_type }} -j $(nproc) - name: Build (no OpenMP) id: cmake_build_no_openmp @@ -313,11 +309,7 @@ jobs: -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \ -DGGML_OPENMP=OFF - J=$(( ($(nproc) + 1) / 2 )) - if [ $J -lt 1 ]; then J=1; fi - echo "Using -j $J" - - cmake --build build --config ${{ matrix.build_type }} -j $J + cmake --build build --config ${{ matrix.build_type }} -j $(nproc) - name: Test id: cmake_test diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml index ab22d7fc3f..f44a9e739c 100644 --- a/.github/workflows/server.yml +++ b/.github/workflows/server.yml @@ -72,10 +72,6 @@ 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 \ @@ -85,7 +81,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 $J --target llama-server + cmake --build build --config ${{ matrix.build_type }} -j $(nproc) --target llama-server - name: Python setup id: setup_python