From 83e16ee9a6875d4434bf9d9aff9bc51d1923c6e4 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Mon, 5 Feb 2024 18:24:51 -0800 Subject: [PATCH] CI: 4 Cores Linux/Win, 3 Cores macOS (#4673) Increase build and test parallelism according to new increased core limits on public GH hosted runners. --- .github/workflows/clang_tidy.yml | 6 +++--- .github/workflows/codeql.yml | 4 ++-- .github/workflows/cuda.yml | 6 +++--- .github/workflows/hip.yml | 4 ++-- .github/workflows/insitu.yml | 4 ++-- .github/workflows/intel.yml | 8 ++++---- .github/workflows/ubuntu.yml | 10 +++++----- .github/workflows/windows.yml | 4 ++-- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/clang_tidy.yml b/.github/workflows/clang_tidy.yml index b8b0053adaa..2a30696fb8c 100644 --- a/.github/workflows/clang_tidy.yml +++ b/.github/workflows/clang_tidy.yml @@ -37,7 +37,7 @@ jobs: cmake -S . -B build_clang_tidy \ -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DWarpX_DIMS="1;2;3;RZ" \ + -DWarpX_DIMS="1;2;RZ;3" \ -DWarpX_MPI=ON \ -DWarpX_COMPUTE=OMP \ -DWarpX_PSATD=ON \ @@ -47,10 +47,10 @@ jobs: -DWarpX_PRECISION=SINGLE \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - cmake --build build_clang_tidy -j 2 + cmake --build build_clang_tidy -j 4 ${{github.workspace}}/.github/workflows/source/makeMakefileForClangTidy.py --input ${{github.workspace}}/ccache.log.txt - make -j2 --keep-going -f clang-tidy-ccache-misses.mak \ + make -j4 --keep-going -f clang-tidy-ccache-misses.mak \ CLANG_TIDY=clang-tidy \ CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*" diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 436df798d3b..008d82af239 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -75,7 +75,7 @@ jobs: export CCACHE_MAXSIZE=100M ccache -z - $CMAKE --build build -j 2 + $CMAKE --build build -j 4 ccache -s du -hs ~/.cache/ccache @@ -83,7 +83,7 @@ jobs: # Make sure CodeQL has something to do touch Source/Utils/WarpXVersion.cpp export CCACHE_DISABLE=1 - $CMAKE --build build -j 2 + $CMAKE --build build -j 4 - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v2 diff --git a/.github/workflows/cuda.yml b/.github/workflows/cuda.yml index 5e9f43f639d..ed8b315c4e9 100644 --- a/.github/workflows/cuda.yml +++ b/.github/workflows/cuda.yml @@ -73,7 +73,7 @@ jobs: -DWarpX_PSATD=ON \ -DAMReX_CUDA_ERROR_CROSS_EXECUTION_SPACE_CALL=ON \ -DAMReX_CUDA_ERROR_CAPTURE_THIS=ON - cmake --build build_sp -j 2 + cmake --build build_sp -j 4 python3 -m pip install --upgrade pip python3 -m pip install --upgrade build packaging setuptools wheel @@ -116,7 +116,7 @@ jobs: git clone https://github.com/AMReX-Codes/amrex.git ../amrex cd ../amrex && git checkout --detach 296ed40e16ae1877640f5b78e9162dbd4ba1c279 && cd - - make COMP=gcc QED=FALSE USE_MPI=TRUE USE_GPU=TRUE USE_OMP=FALSE USE_PSATD=TRUE USE_CCACHE=TRUE -j 2 + make COMP=gcc QED=FALSE USE_MPI=TRUE USE_GPU=TRUE USE_OMP=FALSE USE_PSATD=TRUE USE_CCACHE=TRUE -j 4 ccache -s du -hs ~/.cache/ccache @@ -171,7 +171,7 @@ jobs: -DWarpX_PSATD=ON \ -DAMReX_CUDA_ERROR_CROSS_EXECUTION_SPACE_CALL=ON \ -DAMReX_CUDA_ERROR_CAPTURE_THIS=ON - cmake --build build -j 2 + cmake --build build -j 4 # work-around for mpi4py 3.1.1 build system issue with using # a GNU-built Python executable with non-GNU Python modules diff --git a/.github/workflows/hip.yml b/.github/workflows/hip.yml index f7378bfa775..51cadc89604 100644 --- a/.github/workflows/hip.yml +++ b/.github/workflows/hip.yml @@ -56,7 +56,7 @@ jobs: -DWarpX_OPENPMD=ON \ -DWarpX_PRECISION=SINGLE \ -DWarpX_PSATD=ON - cmake --build build_sp -j 2 + cmake --build build_sp -j 4 export WARPX_MPI=OFF export PYWARPX_LIB_DIR=$PWD/build_sp/lib/site-packages/pywarpx/ @@ -116,7 +116,7 @@ jobs: -DWarpX_OPENPMD=ON \ -DWarpX_PRECISION=DOUBLE \ -DWarpX_PSATD=ON - cmake --build build_2d -j 2 + cmake --build build_2d -j 4 export WARPX_MPI=OFF export PYWARPX_LIB_DIR=$PWD/build_2d/lib/site-packages/pywarpx/ diff --git a/.github/workflows/insitu.yml b/.github/workflows/insitu.yml index 57a25ce7629..6006c3e5c5b 100644 --- a/.github/workflows/insitu.yml +++ b/.github/workflows/insitu.yml @@ -28,7 +28,7 @@ jobs: -DWarpX_COMPUTE=NOACC - name: Build run: | - cmake --build build -j 2 + cmake --build build -j 4 ascent: name: Ascent @@ -51,7 +51,7 @@ jobs: - name: Build run: | . /ascent_docker_setup_env.sh - cmake --build build -j 2 + cmake --build build -j 4 - name: Test run: | cp Examples/Physics_applications/laser_acceleration/inputs_3d . diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index 9124715fe18..1731f6e3723 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -53,7 +53,7 @@ jobs: -DWarpX_MPI=OFF \ -DWarpX_OPENPMD=ON \ -DWarpX_openpmd_internal=OFF - cmake --build build_dp -j 2 + cmake --build build_dp -j 4 cmake -S . -B build_sp \ -DCMAKE_VERBOSE_MAKEFILE=ON \ @@ -64,7 +64,7 @@ jobs: -DWarpX_OPENPMD=ON \ -DWarpX_openpmd_internal=OFF \ -DWarpX_PRECISION=SINGLE - cmake --build build_sp -j 2 + cmake --build build_sp -j 4 cmake --build build_sp --target pip_install ccache -s @@ -120,7 +120,7 @@ jobs: -DWarpX_MPI=OFF \ -DWarpX_OPENPMD=ON \ -DWarpX_PRECISION=SINGLE - cmake --build build_sp -j 2 + cmake --build build_sp -j 4 cmake --build build_sp --target pip_install ccache -s @@ -184,7 +184,7 @@ jobs: -DWarpX_MPI=OFF \ -DWarpX_OPENPMD=ON \ -DWarpX_PRECISION=SINGLE - cmake --build build_sp -j 2 + cmake --build build_sp -j 4 ccache -s du -hs ~/.cache/ccache diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 6b8e26111b8..239da17be64 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -38,7 +38,7 @@ jobs: -DWarpX_EB=OFF \ -DWarpX_MPI=OFF \ -DWarpX_QED=OFF - cmake --build build -j 2 + cmake --build build -j 4 ./build/bin/warpx.3d Examples/Physics_applications/laser_acceleration/inputs_3d ./build/bin/warpx.rz Examples/Physics_applications/laser_acceleration/inputs_rz @@ -79,7 +79,7 @@ jobs: -DWarpX_EB=OFF \ -DWarpX_PSATD=ON \ -DWarpX_QED_TABLE_GEN=ON - cmake --build build -j 2 + cmake --build build -j 4 ./build/bin/warpx.1d Examples/Physics_applications/laser_acceleration/inputs_1d ./build/bin/warpx.2d Examples/Physics_applications/laser_acceleration/inputs_2d @@ -126,7 +126,7 @@ jobs: -DWarpX_PARTICLE_PRECISION=SINGLE \ -DWarpX_QED_TABLE_GEN=ON - cmake --build build -j 2 + cmake --build build -j 4 ./build/bin/warpx.3d Examples/Physics_applications/laser_acceleration/inputs_3d ./build/bin/warpx.rz Examples/Physics_applications/laser_acceleration/inputs_rz @@ -164,7 +164,7 @@ jobs: -DCMAKE_VERBOSE_MAKEFILE=ON \ -DWarpX_APP=OFF \ -DWarpX_LIB=OFF - cmake --build build -j 2 + cmake --build build -j 4 ccache -s du -hs ~/.cache/ccache @@ -208,7 +208,7 @@ jobs: -DWarpX_PSATD=ON \ -DWarpX_PYTHON=ON \ -DWarpX_QED_TABLE_GEN=ON - cmake --build build -j 2 --target pip_install + cmake --build build -j 4 --target pip_install ccache -s du -hs ~/.cache/ccache diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 8e2bb00f1db..eee40e72965 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -38,7 +38,7 @@ jobs: -DWarpX_MPI=OFF ` -DWarpX_PYTHON=ON if(!$?) { Exit $LASTEXITCODE } - cmake --build build --config Debug --parallel 2 + cmake --build build --config Debug --parallel 4 if(!$?) { Exit $LASTEXITCODE } python3 -m pip install --upgrade pip @@ -96,7 +96,7 @@ jobs: -DWarpX_MPI=OFF ^ -DWarpX_OPENPMD=ON if errorlevel 1 exit 1 - cmake --build build --config Release --parallel 2 + cmake --build build --config Release --parallel 4 if errorlevel 1 exit 1 cmake --build build --config Release --target install