From ee5bce807400fbb0a65819076b7183966afccec2 Mon Sep 17 00:00:00 2001 From: Weiqun Zhang Date: Wed, 17 Jan 2024 17:32:17 -0800 Subject: [PATCH 1/2] GitHub Actions: 4 vCPUs are available now on Ubuntu and Windows --- .github/workflows/apps.yml | 4 +-- .github/workflows/ascent.yml | 2 +- .github/workflows/bittree.yml | 16 +++++----- .github/workflows/clang.yml | 12 ++++---- .github/workflows/codeql.yml | 4 +-- .github/workflows/cuda.yml | 8 ++--- .github/workflows/gcc.yml | 56 +++++++++++++++++----------------- .github/workflows/hip.yml | 8 ++--- .github/workflows/hypre.yml | 20 ++++++------ .github/workflows/intel.yml | 18 +++++------ .github/workflows/petsc.yml | 8 ++--- .github/workflows/sensei.yml | 2 +- .github/workflows/smoke.yml | 8 ++--- .github/workflows/sundials.yml | 10 +++--- .github/workflows/windows.yml | 6 ++-- 15 files changed, 91 insertions(+), 91 deletions(-) diff --git a/.github/workflows/apps.yml b/.github/workflows/apps.yml index 45afcab4d77..5e6ae7731ba 100644 --- a/.github/workflows/apps.yml +++ b/.github/workflows/apps.yml @@ -52,7 +52,7 @@ jobs: export AMREX_HOME=${PWD} export MICROPHYSICS_HOME=${PWD}/Microphysics cd Castro/Exec/hydro_tests/Sedov/ - make -j2 CCACHE=ccache USE_MPI=FALSE + make -j4 CCACHE=ccache USE_MPI=FALSE ccache -s du -hs ~/.cache/ccache @@ -97,7 +97,7 @@ jobs: -DWarpX_OPENPMD=OFF \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - cmake --build WarpX/build -j 2 + cmake --build WarpX/build -j 4 ccache -s du -hs ~/.cache/ccache diff --git a/.github/workflows/ascent.yml b/.github/workflows/ascent.yml index d8217621a1b..7b0808bf18d 100644 --- a/.github/workflows/ascent.yml +++ b/.github/workflows/ascent.yml @@ -31,5 +31,5 @@ jobs: - name: Build run: | . /ascent_docker_setup_env.sh - cmake --build build -j 2 + cmake --build build -j 4 diff --git a/.github/workflows/bittree.yml b/.github/workflows/bittree.yml index 687bf07c00d..b7f5564f7b6 100644 --- a/.github/workflows/bittree.yml +++ b/.github/workflows/bittree.yml @@ -34,7 +34,7 @@ jobs: cd ${{ github.workspace }}/bittree python setup.py library --dim 2 --prefix ${{ github.workspace }}/libbittree cd build - make -j2 + make -j4 make install - name: Build and Run Test run: | @@ -47,12 +47,12 @@ jobs: export AMREX_BITTREE_HOME=${{ github.workspace }}/libbittree cd ${{ github.workspace }}/Tests/Amr/Advection_AmrCore/Exec - make -j2 USE_MPI=TRUE USE_BITTREE=TRUE DIM=2 TEST=TRUE \ + make -j4 USE_MPI=TRUE USE_BITTREE=TRUE DIM=2 TEST=TRUE \ CCACHE=ccache - mpiexec -n 2 ./main2d.gnu.TEST.MPI.ex inputs_bittree amr.plot_int=1000 + mpiexec -n 4 ./main2d.gnu.TEST.MPI.ex inputs_bittree amr.plot_int=1000 ${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt - make -j2 -k -f clang-tidy-ccache-misses.mak \ + make -j4 -k -f clang-tidy-ccache-misses.mak \ CLANG_TIDY=clang-tidy-15 \ CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*" @@ -86,7 +86,7 @@ jobs: cd ${{ github.workspace }}/bittree python setup.py library --dim 3 --prefix ${{ github.workspace }}/libbittree cd build - make -j2 + make -j4 make install - name: Build and Run Test run: | @@ -99,12 +99,12 @@ jobs: export AMREX_BITTREE_HOME=${{ github.workspace }}/libbittree cd ${{ github.workspace }}/Tests/Amr/Advection_AmrCore/Exec - make -j2 USE_MPI=TRUE USE_BITTREE=TRUE DIM=3 TEST=TRUE BL_NO_FORT=TRUE\ + make -j4 USE_MPI=TRUE USE_BITTREE=TRUE DIM=3 TEST=TRUE BL_NO_FORT=TRUE\ CCACHE=ccache - mpiexec -n 2 ./main3d.gnu.TEST.MPI.ex inputs_bittree max_step=10 + mpiexec -n 4 ./main3d.gnu.TEST.MPI.ex inputs_bittree max_step=10 ${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt - make -j2 -k -f clang-tidy-ccache-misses.mak \ + make -j4 -k -f clang-tidy-ccache-misses.mak \ CLANG_TIDY=clang-tidy-15 \ CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*" diff --git a/.github/workflows/clang.yml b/.github/workflows/clang.yml index a343832b510..8063119fa0f 100644 --- a/.github/workflows/clang.yml +++ b/.github/workflows/clang.yml @@ -54,12 +54,12 @@ jobs: -DCMAKE_CXX_COMPILER=$(which clang++-7) \ -DCMAKE_Fortran_COMPILER=$(which gfortran) \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - make -j 2 + make -j 4 make install make test_install ${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt - make -j2 -k -f clang-tidy-ccache-misses.mak \ + make -j4 -k -f clang-tidy-ccache-misses.mak \ CLANG_TIDY=clang-tidy-12 \ CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*" @@ -114,10 +114,10 @@ jobs: -DCMAKE_CXX_COMPILER=$(which clang++-14) \ -DCMAKE_Fortran_COMPILER=$(which gfortran) \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - make -j 2 + make -j 4 ${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt - make -j2 -k -f clang-tidy-ccache-misses.mak \ + make -j4 -k -f clang-tidy-ccache-misses.mak \ CLANG_TIDY=clang-tidy-14 \ CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*" @@ -154,12 +154,12 @@ jobs: ccache -z ./configure --dim 2 --with-fortran no --comp llvm --with-mpi no - make -j2 WARN_ALL=TRUE WARN_ERROR=TRUE XTRA_CXXFLAGS="-fno-operator-names" \ + make -j4 WARN_ALL=TRUE WARN_ERROR=TRUE XTRA_CXXFLAGS="-fno-operator-names" \ CCACHE=ccache make install ${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt - make -j2 -k -f clang-tidy-ccache-misses.mak \ + make -j4 -k -f clang-tidy-ccache-misses.mak \ CLANG_TIDY=clang-tidy-14 \ 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 f240930bd8b..9b1668f26b6 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -77,7 +77,7 @@ jobs: export CCACHE_MAXSIZE=30M ccache -z - cmake --build build -j 2 + cmake --build build -j 4 ccache -s du -hs ~/.cache/ccache @@ -86,7 +86,7 @@ jobs: touch Src/Base/AMReX.cpp export CCACHE_DISABLE=1 cd build - make -j 2 + make -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 3fe50a5a02d..9e55007b5cf 100644 --- a/.github/workflows/cuda.yml +++ b/.github/workflows/cuda.yml @@ -52,7 +52,7 @@ jobs: -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - cmake --build build -j 2 + cmake --build build -j 4 ccache -s du -hs ~/.cache/ccache @@ -104,7 +104,7 @@ jobs: -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - cmake --build build -j 2 + cmake --build build -j 4 ccache -s du -hs ~/.cache/ccache @@ -165,7 +165,7 @@ jobs: -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - cmake --build build -j 2 + cmake --build build -j 4 ccache -s du -hs ~/.cache/ccache @@ -200,7 +200,7 @@ jobs: # /home/runner/work/amrex/amrex/Src/Base/AMReX_GpuLaunchGlobal.H:16:41: error: unused parameter ‘f0’ [-Werror=unused-parameter] # 16 | AMREX_GPU_GLOBAL void launch_global (L f0) { f0(); } # - make -j2 WARN_ALL=TRUE WARN_ERROR=TRUE XTRA_CXXFLAGS="-fno-operator-names -Wno-unused-parameter" CCACHE=ccache CUDA_ARCH="7.0 7.2" + make -j4 WARN_ALL=TRUE WARN_ERROR=TRUE XTRA_CXXFLAGS="-fno-operator-names -Wno-unused-parameter" CCACHE=ccache CUDA_ARCH="7.0 7.2" make install ccache -s diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml index aca7a9c8723..bcbfe0fe95d 100644 --- a/.github/workflows/gcc.yml +++ b/.github/workflows/gcc.yml @@ -50,12 +50,12 @@ jobs: -DCMAKE_CXX_COMPILER=$(which g++-8) \ -DCMAKE_Fortran_COMPILER=$(which gfortran-8) \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - make -j 2 + make -j 4 make install make test_install ${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt - make -j2 -k -f clang-tidy-ccache-misses.mak \ + make -j4 -k -f clang-tidy-ccache-misses.mak \ CLANG_TIDY=clang-tidy-12 \ CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*" @@ -104,10 +104,10 @@ jobs: -DAMReX_FORTRAN=ON \ -DAMReX_SPACEDIM=3 \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - cmake --build build -j 2 + cmake --build build -j 4 ${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt - make -j2 -k -f clang-tidy-ccache-misses.mak \ + make -j4 -k -f clang-tidy-ccache-misses.mak \ CLANG_TIDY=clang-tidy-12 \ CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*" @@ -152,10 +152,10 @@ jobs: -DAMReX_FORTRAN=ON \ -DAMReX_SPACEDIM=2 \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - cmake --build build -j 2 + cmake --build build -j 4 ${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt - make -j2 -k -f clang-tidy-ccache-misses.mak \ + make -j4 -k -f clang-tidy-ccache-misses.mak \ CLANG_TIDY=clang-tidy-12 \ CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*" @@ -201,10 +201,10 @@ jobs: -DAMReX_FORTRAN=ON \ -DAMReX_SPACEDIM=1 \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - cmake --build build -j 2 + cmake --build build -j 4 ${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt - make -j2 -k -f clang-tidy-ccache-misses.mak \ + make -j4 -k -f clang-tidy-ccache-misses.mak \ CLANG_TIDY=clang-tidy-12 \ CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*" @@ -259,11 +259,11 @@ jobs: -DCMAKE_CXX_COMPILER=$(which g++-10) \ -DCMAKE_Fortran_COMPILER=$(which gfortran-10) \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - make -j 2 + make -j 4 # Let's not use clang-tidy for this test because it wants to use C++20. # ${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt - # make -j2 -k -f clang-tidy-ccache-misses.mak \ + # make -j4 -k -f clang-tidy-ccache-misses.mak \ # CLANG_TIDY=clang-tidy-12 \ # CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*" @@ -317,10 +317,10 @@ jobs: -DCMAKE_CXX_COMPILER=$(which g++-8) \ -DCMAKE_Fortran_COMPILER=$(which gfortran-8) \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - make -j 2 + make -j 4 ${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt - make -j2 -k -f clang-tidy-ccache-misses.mak \ + make -j4 -k -f clang-tidy-ccache-misses.mak \ CLANG_TIDY=clang-tidy-12 \ CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*" @@ -381,10 +381,10 @@ jobs: -DCMAKE_CXX_COMPILER=$(which g++-12) \ -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - make -j 2 + make -j 4 ${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt - make -j2 -k -f clang-tidy-ccache-misses.mak \ + make -j4 -k -f clang-tidy-ccache-misses.mak \ CLANG_TIDY=clang-tidy-14 \ CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*" @@ -421,12 +421,12 @@ jobs: ccache -z ./configure --dim 1 - make -j2 XTRA_CXXFLAGS=-fno-operator-names \ + make -j4 XTRA_CXXFLAGS=-fno-operator-names \ CCACHE=ccache make install ${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt - make -j2 -k -f clang-tidy-ccache-misses.mak \ + make -j4 -k -f clang-tidy-ccache-misses.mak \ CLANG_TIDY=clang-tidy-12 \ CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*" @@ -461,12 +461,12 @@ jobs: ccache -z ./configure --dim 3 --enable-eb yes --enable-xsdk-defaults yes - make -j2 WARN_ALL=TRUE WARN_ERROR=TRUE XTRA_CXXFLAGS=-fno-operator-names \ + make -j4 WARN_ALL=TRUE WARN_ERROR=TRUE XTRA_CXXFLAGS=-fno-operator-names \ CCACHE=ccache make install ${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt - make -j2 -k -f clang-tidy-ccache-misses.mak \ + make -j4 -k -f clang-tidy-ccache-misses.mak \ CLANG_TIDY=clang-tidy-15 \ CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*" @@ -501,12 +501,12 @@ jobs: ccache -z ./configure --dim 3 --enable-eb no --enable-xsdk-defaults no --single-precision yes --single-precision-particles yes --enable-tiny-profile yes - make -j2 WARN_ALL=TRUE WARN_ERROR=TRUE XTRA_CXXFLAGS=-fno-operator-names \ + make -j4 WARN_ALL=TRUE WARN_ERROR=TRUE XTRA_CXXFLAGS=-fno-operator-names \ CCACHE=ccache make install ${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt - make -j2 -k -f clang-tidy-ccache-misses.mak \ + make -j4 -k -f clang-tidy-ccache-misses.mak \ CLANG_TIDY=clang-tidy-12 \ CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*" @@ -541,12 +541,12 @@ jobs: ccache -z ./configure --dim 3 --enable-eb yes --enable-xsdk-defaults yes --with-omp yes --debug yes - make -j2 WARN_ALL=TRUE WARN_ERROR=TRUE XTRA_CXXFLAGS=-fno-operator-names \ + make -j4 WARN_ALL=TRUE WARN_ERROR=TRUE XTRA_CXXFLAGS=-fno-operator-names \ CCACHE=ccache make install ${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt - make -j2 -k -f clang-tidy-ccache-misses.mak \ + make -j4 -k -f clang-tidy-ccache-misses.mak \ CLANG_TIDY=clang-tidy-12 \ CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*" @@ -581,11 +581,11 @@ jobs: ccache -z cd Tools/Plotfile - make -j2 USE_MPI=FALSE USE_OMP=FALSE WARN_ALL=TRUE WARN_ERROR=TRUE XTRA_CXXFLAGS=-fno-operator-names \ + make -j4 USE_MPI=FALSE USE_OMP=FALSE WARN_ALL=TRUE WARN_ERROR=TRUE XTRA_CXXFLAGS=-fno-operator-names \ CCACHE=ccache ${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt - make -j2 -k -f clang-tidy-ccache-misses.mak \ + make -j4 -k -f clang-tidy-ccache-misses.mak \ CLANG_TIDY=clang-tidy-12 \ CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*" @@ -627,10 +627,10 @@ jobs: -DCMAKE_VERBOSE_MAKEFILE=ON \ -DAMReX_ENABLE_TESTS=ON \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - make -j 2 + make -j 4 ${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt - make -j2 -k -f clang-tidy-ccache-misses.mak \ + make -j4 -k -f clang-tidy-ccache-misses.mak \ CLANG_TIDY=clang-tidy-12 \ CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*" @@ -659,8 +659,8 @@ jobs: run: | cd Tests/HDF5Benchmark export OLCF_HDF5_ROOT=/usr/lib/x86_64-linux-gnu/hdf5/openmpi - make -j 2 - mpirun -np 2 ./main3d.gnu.TPROF.MPI.ex ./inputs + make -j 4 + mpirun -np 4 ./main3d.gnu.TPROF.MPI.ex ./inputs h5dump -d "level_0/data:offsets=0" -s "1" -c "1" ./plt00000.h5 h5dump -d "level_0/data:datatype=1" -s "1" -c "1" ./plt00000/particle0/particle0.h5 diff --git a/.github/workflows/hip.yml b/.github/workflows/hip.yml index 0c0e59a96c4..0c566633bf3 100644 --- a/.github/workflows/hip.yml +++ b/.github/workflows/hip.yml @@ -66,7 +66,7 @@ jobs: -DCMAKE_Fortran_COMPILER=$(which flang) \ -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - cmake --build build -j 2 + cmake --build build -j 4 ccache -s du -hs ~/.cache/ccache @@ -128,7 +128,7 @@ jobs: -DCMAKE_Fortran_COMPILER=$(which gfortran) \ -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - cmake --build build_full_legacywrapper -j 2 + cmake --build build_full_legacywrapper -j 4 ccache -s du -hs ~/.cache/ccache @@ -158,7 +158,7 @@ jobs: ccache -z ./configure --dim 2 --with-hip yes --enable-eb yes --enable-xsdk-defaults yes --with-mpi no --with-omp no --single-precision yes --single-precision-particles yes - make -j2 WARN_ALL=TRUE XTRA_CXXFLAGS="-fno-operator-names" AMD_ARCH=gfx90a CCACHE=ccache + make -j4 WARN_ALL=TRUE XTRA_CXXFLAGS="-fno-operator-names" AMD_ARCH=gfx90a CCACHE=ccache make install ccache -s @@ -189,7 +189,7 @@ jobs: ccache -z cd Tests/LinearSolvers/NodeEB - make -j2 USE_HIP=TRUE USE_MPI=FALSE BL_NO_FORT=TRUE WARN_ALL=TRUE WARN_ERROR=TRUE XTRA_CXXFLAGS=-fno-operator-names AMD_ARCH=gfx90a CCACHE=ccache + make -j4 USE_HIP=TRUE USE_MPI=FALSE BL_NO_FORT=TRUE WARN_ALL=TRUE WARN_ERROR=TRUE XTRA_CXXFLAGS=-fno-operator-names AMD_ARCH=gfx90a CCACHE=ccache ccache -s du -hs ~/.cache/ccache diff --git a/.github/workflows/hypre.yml b/.github/workflows/hypre.yml index 871224fc79c..21c5750941c 100644 --- a/.github/workflows/hypre.yml +++ b/.github/workflows/hypre.yml @@ -38,7 +38,7 @@ jobs: ./configure --with-cxxstandard=17 --with-cuda --enable-unified-memory \ --with-cuda-home=/usr/local/cuda --with-gpu-arch="80" \ --prefix=${{ env.AMREX_HYPRE_HOME }} - make -j 2 + make -j 4 make install cd ../../ fi @@ -53,7 +53,7 @@ jobs: export CUDA_PATH=/usr/local/cuda export PATH=${PATH}:/usr/local/cuda/bin cd Tests/LinearSolvers/CellEB - make -j2 USE_MPI=TRUE USE_HYPRE=TRUE DIM=2 USE_CUDA=TRUE CCACHE=ccache + make -j4 USE_MPI=TRUE USE_HYPRE=TRUE DIM=2 USE_CUDA=TRUE CCACHE=ccache ccache -s du -h -d1 ~/.cache @@ -81,7 +81,7 @@ jobs: tar xfz v2.21.0.tar.gz cd hypre-2.21.0/src ./configure --with-cxxstandard=17 --enable-bigint - make -j 2 + make -j 4 make install cd ../../ - name: Build and Run Test @@ -95,12 +95,12 @@ jobs: export AMREX_HYPRE_HOME=${PWD}/hypre-2.21.0/src/hypre cd Tests/LinearSolvers/ABecLaplacian_C - make -j2 USE_MPI=TRUE USE_HYPRE=TRUE DIM=3 \ + make -j4 USE_MPI=TRUE USE_HYPRE=TRUE DIM=3 \ CCACHE=ccache - mpiexec -n 2 ./main3d.gnu.MPI.ex inputs.hypre + mpiexec -n 4 ./main3d.gnu.MPI.ex inputs.hypre ${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt - make -j2 -k -f clang-tidy-ccache-misses.mak \ + make -j4 -k -f clang-tidy-ccache-misses.mak \ CLANG_TIDY=clang-tidy-14 \ CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*" @@ -130,7 +130,7 @@ jobs: tar xfz v2.28.0.tar.gz cd hypre-2.28.0/src ./configure --with-cxxstandard=17 - make -j 2 + make -j 4 make install cd ../../ - name: Build and Run Test @@ -144,11 +144,11 @@ jobs: export AMREX_HYPRE_HOME=${PWD}/hypre-2.28.0/src/hypre cd Tests/LinearSolvers/Hypre - make -j2 USE_MPI=TRUE USE_HYPRE=TRUE DIM=2 CCACHE=ccache - mpiexec -n 2 ./main2d.gnu.MPI.ex inputs.2d + make -j4 USE_MPI=TRUE USE_HYPRE=TRUE DIM=2 CCACHE=ccache + mpiexec -n 4 ./main2d.gnu.MPI.ex inputs.2d ${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt - make -j2 -k -f clang-tidy-ccache-misses.mak \ + make -j4 -k -f clang-tidy-ccache-misses.mak \ CLANG_TIDY=clang-tidy-14 \ CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*" diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index aa1036ddf94..d14318ccb41 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -45,8 +45,8 @@ jobs: -DCMAKE_CXX_COMPILER=$(which icpx) \ -DCMAKE_Fortran_COMPILER=$(which ifx) \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ - -DAMReX_PARALLEL_LINK_JOBS=2 - cmake --build build --parallel 2 + -DAMReX_PARALLEL_LINK_JOBS=4 + cmake --build build --parallel 4 ccache -s du -hs ~/.cache/ccache @@ -88,8 +88,8 @@ jobs: -DCMAKE_C_COMPILER=$(which icx) \ -DCMAKE_CXX_COMPILER=$(which icpx) \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ - -DAMReX_PARALLEL_LINK_JOBS=2 - cmake --build build --parallel 2 + -DAMReX_PARALLEL_LINK_JOBS=4 + cmake --build build --parallel 4 ccache -s du -hs ~/.cache/ccache @@ -134,8 +134,8 @@ jobs: -DCMAKE_C_COMPILER=$(which icx) \ -DCMAKE_CXX_COMPILER=$(which clang++) \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ - -DAMReX_PARALLEL_LINK_JOBS=2 - cmake --build build --parallel 2 + -DAMReX_PARALLEL_LINK_JOBS=4 + cmake --build build --parallel 4 ccache -s du -hs ~/.cache/ccache @@ -180,8 +180,8 @@ jobs: -DCMAKE_C_COMPILER=$(which icx) \ -DCMAKE_CXX_COMPILER=$(which clang++) \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ - -DAMReX_PARALLEL_LINK_JOBS=2 - cmake --build build --parallel 2 + -DAMReX_PARALLEL_LINK_JOBS=4 + cmake --build build --parallel 4 ccache -s du -hs ~/.cache/ccache @@ -224,7 +224,7 @@ jobs: -DCMAKE_C_COMPILER=$(which icc) \ -DCMAKE_CXX_COMPILER=$(which icpc) \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - cmake --build build --parallel 2 + cmake --build build --parallel 4 cmake --build build --target install cmake --build build --target test_install diff --git a/.github/workflows/petsc.yml b/.github/workflows/petsc.yml index eaddf1c2489..321ea485f88 100644 --- a/.github/workflows/petsc.yml +++ b/.github/workflows/petsc.yml @@ -31,7 +31,7 @@ jobs: cd petsc-3.18.1 export PETSC_DIR=${PWD} ./configure --prefix=${PWD}/petsc - make -j 2 + make -j 4 make install cd ../ - name: Build and Run Test @@ -45,12 +45,12 @@ jobs: export AMREX_PETSC_HOME=${PWD}/petsc-3.18.1/petsc cd Tests/LinearSolvers/CellEB - make -j2 USE_MPI=TRUE USE_PETSC=TRUE DIM=2 TEST=TRUE \ + make -j4 USE_MPI=TRUE USE_PETSC=TRUE DIM=2 TEST=TRUE \ CCACHE=ccache - mpiexec -n 2 ./main2d.gnu.TEST.MPI.ex inputs.rt.2d.petsc + mpiexec -n 4 ./main2d.gnu.TEST.MPI.ex inputs.rt.2d.petsc ${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt - make -j2 -k -f clang-tidy-ccache-misses.mak \ + make -j4 -k -f clang-tidy-ccache-misses.mak \ CLANG_TIDY=clang-tidy-14 \ CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*" diff --git a/.github/workflows/sensei.yml b/.github/workflows/sensei.yml index fc5a0db3059..e571c23b79d 100644 --- a/.github/workflows/sensei.yml +++ b/.github/workflows/sensei.yml @@ -35,4 +35,4 @@ jobs: - name: Build run: | cd build - cmake --build . -j 2 + cmake --build . -j 4 diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml index d907b485261..fe5b9b8a067 100644 --- a/.github/workflows/smoke.yml +++ b/.github/workflows/smoke.yml @@ -42,12 +42,12 @@ jobs: -DAMReX_EB=ON \ -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - make -j 2 + make -j 4 make install make test_install ${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt - make -j2 -k -f clang-tidy-ccache-misses.mak \ + make -j4 -k -f clang-tidy-ccache-misses.mak \ CLANG_TIDY=clang-tidy-15 \ CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*" @@ -58,8 +58,8 @@ jobs: -DAMReX_ROOT=../../../installdir \ -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - make -j 2 - mpiexec -n 2 ./install_test ../../Amr/Advection_AmrCore/Exec/inputs-ci + make -j 4 + mpiexec -n 4 ./install_test ../../Amr/Advection_AmrCore/Exec/inputs-ci ccache -s du -hs ~/.cache/ccache diff --git a/.github/workflows/sundials.yml b/.github/workflows/sundials.yml index a890e10fad3..8c20379f33b 100644 --- a/.github/workflows/sundials.yml +++ b/.github/workflows/sundials.yml @@ -41,7 +41,7 @@ jobs: -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_C_COMPILER_LAUNCHER=ccache - make -j2 + make -j4 make install cd ../.. - name: Compile Test @@ -57,10 +57,10 @@ jobs: -DSUNDIALS_ROOT=${PWD}/sundials-6.5.0/instdir \ -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - cmake --build build -j 2 + cmake --build build -j 4 ${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt - make -j2 -k -f clang-tidy-ccache-misses.mak \ + make -j4 -k -f clang-tidy-ccache-misses.mak \ CLANG_TIDY=clang-tidy-14 \ CLANG_TIDY_ARGS="--config-file=${{github.workspace}}/.clang-tidy --warnings-as-errors=*" @@ -110,7 +110,7 @@ jobs: -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache - make -j2 + make -j4 make install cd ../.. - name: Compile Test @@ -129,7 +129,7 @@ jobs: -DSUNDIALS_ROOT=${PWD}/sundials-6.5.0/instdir \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache - cmake --build build -j 2 + cmake --build build -j 4 ccache -s du -hs ~/.cache/ccache diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 18dbce32b5b..88b0fc0de77 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -47,7 +47,7 @@ jobs: -DAMReX_FORTRAN=OFF ` -DAMReX_MPI=OFF #-DCMAKE_CXX_COMPILER_LAUNCHER=ccache - cmake --build build --config Debug -j 2 + cmake --build build --config Debug -j 4 #ccache -s @@ -89,7 +89,7 @@ jobs: -DAMReX_FORTRAN=OFF ` -DAMReX_MPI=OFF #-DCMAKE_CXX_COMPILER_LAUNCHER=ccache - cmake --build build --config RelWithDebInfo -j 2 + cmake --build build --config RelWithDebInfo -j 4 #ccache -s @@ -114,7 +114,7 @@ jobs: -DAMReX_FORTRAN=OFF ^ -DAMReX_MPI=OFF ^ -DAMReX_OMP=ON - cmake --build build --config Release -j 2 + cmake --build build --config Release -j 4 # If we add ccache back, don't forget to update cleanup-cache.yml #save_pr_number: From 1e0c6ba0f718eb812775d97aef08aed24792cc7a Mon Sep 17 00:00:00 2001 From: Weiqun Zhang Date: Wed, 17 Jan 2024 18:47:16 -0800 Subject: [PATCH 2/2] Use 2 processes for MPI jobs --- .github/workflows/bittree.yml | 4 ++-- .github/workflows/gcc.yml | 2 +- .github/workflows/hypre.yml | 4 ++-- .github/workflows/petsc.yml | 2 +- .github/workflows/smoke.yml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/bittree.yml b/.github/workflows/bittree.yml index b7f5564f7b6..f35f35a68d4 100644 --- a/.github/workflows/bittree.yml +++ b/.github/workflows/bittree.yml @@ -49,7 +49,7 @@ jobs: cd ${{ github.workspace }}/Tests/Amr/Advection_AmrCore/Exec make -j4 USE_MPI=TRUE USE_BITTREE=TRUE DIM=2 TEST=TRUE \ CCACHE=ccache - mpiexec -n 4 ./main2d.gnu.TEST.MPI.ex inputs_bittree amr.plot_int=1000 + mpiexec -n 2 ./main2d.gnu.TEST.MPI.ex inputs_bittree amr.plot_int=1000 ${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt make -j4 -k -f clang-tidy-ccache-misses.mak \ @@ -101,7 +101,7 @@ jobs: cd ${{ github.workspace }}/Tests/Amr/Advection_AmrCore/Exec make -j4 USE_MPI=TRUE USE_BITTREE=TRUE DIM=3 TEST=TRUE BL_NO_FORT=TRUE\ CCACHE=ccache - mpiexec -n 4 ./main3d.gnu.TEST.MPI.ex inputs_bittree max_step=10 + mpiexec -n 2 ./main3d.gnu.TEST.MPI.ex inputs_bittree max_step=10 ${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt make -j4 -k -f clang-tidy-ccache-misses.mak \ diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml index bcbfe0fe95d..e74c8bbd70a 100644 --- a/.github/workflows/gcc.yml +++ b/.github/workflows/gcc.yml @@ -660,7 +660,7 @@ jobs: cd Tests/HDF5Benchmark export OLCF_HDF5_ROOT=/usr/lib/x86_64-linux-gnu/hdf5/openmpi make -j 4 - mpirun -np 4 ./main3d.gnu.TPROF.MPI.ex ./inputs + mpirun -np 2 ./main3d.gnu.TPROF.MPI.ex ./inputs h5dump -d "level_0/data:offsets=0" -s "1" -c "1" ./plt00000.h5 h5dump -d "level_0/data:datatype=1" -s "1" -c "1" ./plt00000/particle0/particle0.h5 diff --git a/.github/workflows/hypre.yml b/.github/workflows/hypre.yml index 21c5750941c..8d37a775155 100644 --- a/.github/workflows/hypre.yml +++ b/.github/workflows/hypre.yml @@ -97,7 +97,7 @@ jobs: cd Tests/LinearSolvers/ABecLaplacian_C make -j4 USE_MPI=TRUE USE_HYPRE=TRUE DIM=3 \ CCACHE=ccache - mpiexec -n 4 ./main3d.gnu.MPI.ex inputs.hypre + mpiexec -n 2 ./main3d.gnu.MPI.ex inputs.hypre ${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt make -j4 -k -f clang-tidy-ccache-misses.mak \ @@ -145,7 +145,7 @@ jobs: export AMREX_HYPRE_HOME=${PWD}/hypre-2.28.0/src/hypre cd Tests/LinearSolvers/Hypre make -j4 USE_MPI=TRUE USE_HYPRE=TRUE DIM=2 CCACHE=ccache - mpiexec -n 4 ./main2d.gnu.MPI.ex inputs.2d + mpiexec -n 2 ./main2d.gnu.MPI.ex inputs.2d ${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt make -j4 -k -f clang-tidy-ccache-misses.mak \ diff --git a/.github/workflows/petsc.yml b/.github/workflows/petsc.yml index 321ea485f88..5dcd584e321 100644 --- a/.github/workflows/petsc.yml +++ b/.github/workflows/petsc.yml @@ -47,7 +47,7 @@ jobs: cd Tests/LinearSolvers/CellEB make -j4 USE_MPI=TRUE USE_PETSC=TRUE DIM=2 TEST=TRUE \ CCACHE=ccache - mpiexec -n 4 ./main2d.gnu.TEST.MPI.ex inputs.rt.2d.petsc + mpiexec -n 2 ./main2d.gnu.TEST.MPI.ex inputs.rt.2d.petsc ${{github.workspace}}/Tools/C_scripts/mmclt.py --input ${{github.workspace}}/ccache.log.txt make -j4 -k -f clang-tidy-ccache-misses.mak \ diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml index fe5b9b8a067..153c8120fd7 100644 --- a/.github/workflows/smoke.yml +++ b/.github/workflows/smoke.yml @@ -59,7 +59,7 @@ jobs: -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache make -j 4 - mpiexec -n 4 ./install_test ../../Amr/Advection_AmrCore/Exec/inputs-ci + mpiexec -n 2 ./install_test ../../Amr/Advection_AmrCore/Exec/inputs-ci ccache -s du -hs ~/.cache/ccache