Skip to content

Commit 0e5da5e

Browse files
author
Olivier Chafik
committed
revert superfluous cmake --parallel flags!
1 parent 64b3e5d commit 0e5da5e

File tree

1 file changed

+27
-27
lines changed

1 file changed

+27
-27
lines changed

.github/workflows/build.yml

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
-DGGML_METAL_USE_BF16=ON \
6969
-DGGML_METAL_EMBED_LIBRARY=ON \
7070
-DGGML_RPC=ON
71-
cmake --parallel --build . --config Release -j $(sysctl -n hw.logicalcpu)
71+
cmake --build . --config Release -j $(sysctl -n hw.logicalcpu)
7272
7373
- name: Test
7474
id: cmake_test
@@ -136,7 +136,7 @@ jobs:
136136
-DLLAMA_CURL=ON \
137137
-DGGML_METAL=OFF \
138138
-DGGML_RPC=ON
139-
cmake --parallel --build build --config Release -j $(sysctl -n hw.logicalcpu)
139+
cmake --build build --config Release -j $(sysctl -n hw.logicalcpu)
140140
141141
- name: Test
142142
id: cmake_test
@@ -201,7 +201,7 @@ jobs:
201201
-DLLAMA_FATAL_WARNINGS=ON \
202202
-DLLAMA_CURL=ON \
203203
-DGGML_RPC=ON
204-
cmake --parallel --build . --config Release -j $(nproc)
204+
cmake --build . --config Release -j $(nproc)
205205
206206
- name: Test
207207
id: cmake_test
@@ -283,7 +283,7 @@ jobs:
283283
-DLLAMA_FATAL_WARNINGS=ON \
284284
-DLLAMA_SANITIZE_${{ matrix.sanitizer }}=ON \
285285
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
286-
cmake --parallel --build . --config ${{ matrix.build_type }} -j $(nproc)
286+
cmake --build . --config ${{ matrix.build_type }} -j $(nproc)
287287
288288
- name: Build (no OpenMP)
289289
id: cmake_build_no_openmp
@@ -296,7 +296,7 @@ jobs:
296296
-DLLAMA_SANITIZE_${{ matrix.sanitizer }}=ON \
297297
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
298298
-DGGML_OPENMP=OFF
299-
cmake --parallel --build . --config ${{ matrix.build_type }} -j $(nproc)
299+
cmake --build . --config ${{ matrix.build_type }} -j $(nproc)
300300
301301
- name: Test
302302
id: cmake_test
@@ -331,7 +331,7 @@ jobs:
331331
cd build
332332
cmake .. \
333333
-DGGML_RPC=ON
334-
cmake --parallel --build . --config Release -j $(nproc)
334+
cmake --build . --config Release -j $(nproc)
335335
336336
- name: Test
337337
id: cmake_test
@@ -366,7 +366,7 @@ jobs:
366366
cd build
367367
cmake .. \
368368
-DGGML_VULKAN=ON
369-
cmake --parallel --build . --config Release -j $(nproc)
369+
cmake --build . --config Release -j $(nproc)
370370
371371
- name: Test
372372
id: cmake_test
@@ -400,7 +400,7 @@ jobs:
400400
cmake -B build -S . \
401401
-DCMAKE_HIP_COMPILER="$(hipconfig -l)/clang" \
402402
-DGGML_HIP=ON
403-
cmake --parallel --build build --config Release -j $(nproc)
403+
cmake --build build --config Release -j $(nproc)
404404
405405
- name: Build with legacy HIP support
406406
id: cmake_build_legacy_hip
@@ -409,7 +409,7 @@ jobs:
409409
-DCMAKE_C_COMPILER=hipcc \
410410
-DCMAKE_CXX_COMPILER=hipcc \
411411
-DGGML_HIP=ON
412-
cmake --parallel --build build2 --config Release -j $(nproc)
412+
cmake --build build2 --config Release -j $(nproc)
413413
414414
ubuntu-22-cmake-musa:
415415
runs-on: ubuntu-22.04
@@ -437,7 +437,7 @@ jobs:
437437
run: |
438438
cmake -B build -S . \
439439
-DGGML_MUSA=ON
440-
cmake --parallel --build build --config Release -j $(nproc)
440+
cmake --build build --config Release -j $(nproc)
441441
442442
ubuntu-22-cmake-sycl:
443443
runs-on: ubuntu-22.04
@@ -487,7 +487,7 @@ jobs:
487487
-DGGML_SYCL=ON \
488488
-DCMAKE_C_COMPILER=icx \
489489
-DCMAKE_CXX_COMPILER=icpx
490-
cmake --parallel --build . --config Release -j $(nproc)
490+
cmake --build . --config Release -j $(nproc)
491491
492492
ubuntu-22-cmake-sycl-fp16:
493493
runs-on: ubuntu-22.04
@@ -538,7 +538,7 @@ jobs:
538538
-DCMAKE_C_COMPILER=icx \
539539
-DCMAKE_CXX_COMPILER=icpx \
540540
-DGGML_SYCL_F16=ON
541-
cmake --parallel --build . --config Release -j $(nproc)
541+
cmake --build . --config Release -j $(nproc)
542542
543543
macOS-latest-cmake-ios:
544544
runs-on: macos-latest
@@ -575,7 +575,7 @@ jobs:
575575
-DCMAKE_SYSTEM_NAME=iOS \
576576
-DCMAKE_OSX_DEPLOYMENT_TARGET=14.0 \
577577
-DCMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM=ggml
578-
cmake --parallel --build . --config Release -j $(sysctl -n hw.logicalcpu) -- CODE_SIGNING_ALLOWED=NO
578+
cmake --build . --config Release -j $(sysctl -n hw.logicalcpu) -- CODE_SIGNING_ALLOWED=NO
579579
580580
macOS-latest-cmake-tvos:
581581
runs-on: macos-latest
@@ -612,7 +612,7 @@ jobs:
612612
-DCMAKE_SYSTEM_NAME=tvOS \
613613
-DCMAKE_OSX_DEPLOYMENT_TARGET=14.0 \
614614
-DCMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM=ggml
615-
cmake --parallel --build . --config Release -j $(sysctl -n hw.logicalcpu) -- CODE_SIGNING_ALLOWED=NO
615+
cmake --build . --config Release -j $(sysctl -n hw.logicalcpu) -- CODE_SIGNING_ALLOWED=NO
616616
617617
macOS-latest-swift:
618618
runs-on: macos-latest
@@ -651,7 +651,7 @@ jobs:
651651
-DLLAMA_BUILD_TESTS=OFF \
652652
-DLLAMA_BUILD_SERVER=OFF \
653653
-DCMAKE_OSX_ARCHITECTURES="arm64;x86_64"
654-
cmake --parallel --build . --config Release -j $(sysctl -n hw.logicalcpu)
654+
cmake --build . --config Release -j $(sysctl -n hw.logicalcpu)
655655
sudo cmake --install . --config Release
656656
657657
- name: xcodebuild for swift package
@@ -695,7 +695,7 @@ jobs:
695695
shell: msys2 {0}
696696
run: |
697697
cmake -B build
698-
cmake --parallel --build build --config ${{ matrix.build }} -j $(nproc)
698+
cmake --build build --config ${{ matrix.build }} -j $(nproc)
699699
700700
- name: Clean after building using CMake
701701
shell: msys2 {0}
@@ -706,7 +706,7 @@ jobs:
706706
shell: msys2 {0}
707707
run: |
708708
cmake -B build -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=OpenBLAS
709-
cmake --parallel --build build --config ${{ matrix.build }} -j $(nproc)
709+
cmake --build build --config ${{ matrix.build }} -j $(nproc)
710710
711711
windows-latest-cmake:
712712
runs-on: windows-latest
@@ -798,21 +798,21 @@ jobs:
798798
-DOPENCL_HEADERS_BUILD_TESTING=OFF `
799799
-DOPENCL_HEADERS_BUILD_CXX_TESTS=OFF `
800800
-DCMAKE_INSTALL_PREFIX="$env:RUNNER_TEMP/opencl-arm64-release"
801-
cmake --parallel --build . --target install
801+
cmake --build . --target install -j
802802
git clone https://github.com/KhronosGroup/OpenCL-ICD-Loader
803803
cd OpenCL-ICD-Loader
804804
mkdir build-arm64-release && cd build-arm64-release
805805
cmake .. `
806806
-A arm64 `
807807
-DCMAKE_PREFIX_PATH="$env:RUNNER_TEMP/opencl-arm64-release" `
808808
-DCMAKE_INSTALL_PREFIX="$env:RUNNER_TEMP/opencl-arm64-release"
809-
cmake --parallel --build . --target install --config release
809+
cmake --build . --target install --config release -j
810810
811811
- name: Build
812812
id: cmake_build
813813
run: |
814814
cmake -S . -B build ${{ matrix.defines }}
815-
cmake --parallel --build build --config Release -j ${env:NUMBER_OF_PROCESSORS}
815+
cmake --build build --config Release -j ${env:NUMBER_OF_PROCESSORS}
816816
817817
- name: Add libopenblas.dll
818818
id: add_libopenblas_dll
@@ -914,7 +914,7 @@ jobs:
914914
-DLLAMA_FATAL_WARNINGS=ON \
915915
-DGGML_NATIVE=OFF \
916916
-DGGML_CUDA=ON
917-
cmake --parallel --build build
917+
cmake --build build
918918
919919
windows-2019-cmake-cuda:
920920
runs-on: windows-2019
@@ -1009,8 +1009,8 @@ jobs:
10091009
-DGGML_CUDA=ON ^
10101010
-DGGML_RPC=ON
10111011
set /A NINJA_JOBS=%NUMBER_OF_PROCESSORS%-1
1012-
cmake --parallel --build build --config Release -j %NINJA_JOBS% -t ggml
1013-
cmake --parallel --build build --config Release
1012+
cmake --build build --config Release -j %NINJA_JOBS% -t ggml
1013+
cmake --build build --config Release
10141014
10151015
- name: Determine tag name
10161016
id: tag
@@ -1173,7 +1173,7 @@ jobs:
11731173
-DCMAKE_BUILD_TYPE=Release `
11741174
-DGGML_HIP=ON `
11751175
-DGGML_RPC=ON
1176-
cmake --parallel --build build -j ${env:NUMBER_OF_PROCESSORS}
1176+
cmake --build build -j ${env:NUMBER_OF_PROCESSORS}
11771177
11781178
windows-latest-cmake-hip-release:
11791179
if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' }}
@@ -1223,7 +1223,7 @@ jobs:
12231223
-DAMDGPU_TARGETS=${{ matrix.gpu_target }} `
12241224
-DGGML_HIP=ON `
12251225
-DGGML_RPC=ON
1226-
cmake --parallel --build build -j ${env:NUMBER_OF_PROCESSORS}
1226+
cmake --build build -j ${env:NUMBER_OF_PROCESSORS}
12271227
md "build\bin\rocblas\library\"
12281228
cp "${env:HIP_PATH}\bin\hipblas.dll" "build\bin\"
12291229
cp "${env:HIP_PATH}\bin\rocblas.dll" "build\bin\"
@@ -1275,7 +1275,7 @@ jobs:
12751275
-DCMAKE_SYSTEM_NAME=iOS \
12761276
-DCMAKE_OSX_DEPLOYMENT_TARGET=14.0 \
12771277
-DCMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM=ggml
1278-
cmake --parallel --build . --config Release -j $(sysctl -n hw.logicalcpu) -- CODE_SIGNING_ALLOWED=NO
1278+
cmake --build . --config Release -j $(sysctl -n hw.logicalcpu) -- CODE_SIGNING_ALLOWED=NO
12791279
sudo cmake --install . --config Release
12801280
12811281
- name: xcodebuild for swift package
@@ -1620,4 +1620,4 @@ jobs:
16201620
-DCMAKE_BUILD_TYPE=${{ matrix.build }} \
16211621
-DGGML_CANN=on \
16221622
-DSOC_TYPE=${{ matrix.device }}
1623-
cmake --parallel --build build -j $(nproc)
1623+
cmake --build build -j $(nproc)

0 commit comments

Comments
 (0)