CI: 4 Cores Linux/Win, 3 Cores macOS

.github/workflows/codeql.yml

@@ -62,7 +62,7 @@ jobs:
       - name: Build (C++)
         if: ${{ matrix.language == 'cpp' }}
         run: |
-          $CMAKE --build build -j 2
+          $CMAKE --build build -j 4
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v2

.github/workflows/cuda.yml

@@ -52,4 +52,4 @@ jobs:
           -DImpactX_PRECISION=SINGLE   \
           -DAMReX_CUDA_ERROR_CROSS_EXECUTION_SPACE_CALL=ON \
           -DAMReX_CUDA_ERROR_CAPTURE_THIS=ON
-        cmake --build build -j 2
+        cmake --build build -j 4

.github/workflows/hip.yml

@@ -54,4 +54,4 @@ jobs:
           -DAMReX_AMD_ARCH=gfx900     \
           -DImpactX_COMPUTE=HIP       \
           -DImpactX_PYTHON=ON
-        cmake --build build -j 2
+        cmake --build build -j 4

.github/workflows/tooling.yml

@@ -44,8 +44,9 @@ jobs:
         cmake -S . -B build                  \
           -DImpactX_PYTHON=ON                \
           -DCMAKE_BUILD_TYPE=RelWithDebInfo  \
-          -DCMAKE_VERBOSE_MAKEFILE=ON
-        cmake --build build --parallel 2
+          -DCMAKE_VERBOSE_MAKEFILE=ON        \
+          -DMPIEXEC_POSTFLAGS="--use-hwthread-cpus"
+        cmake --build build --parallel 4
 
     - name: run tests
       run: |

.github/workflows/ubuntu.yml

@@ -14,7 +14,7 @@ jobs:
     env:
       CMAKE_GENERATOR: Ninja
       CXXFLAGS: "-Werror"
-      OMP_NUM_THREADS: 2
+      OMP_NUM_THREADS: 4
     steps:
     - uses: actions/checkout@v3
 
@@ -35,15 +35,21 @@ jobs:
           ccache-openmp-gcc-${{ hashFiles('.github/workflows/ubuntu.yml') }}-
           ccache-openmp-gcc-
 
+    - name: system info
+      run: |
+        cat /proc/cpuinfo
+        lscpu
+
     - name: build ImpactX
       run: |
         cmake -S . -B build            \
           -DCMAKE_BUILD_TYPE=Debug     \
           -DBUILD_SHARED_LIBS=ON       \
           -DCMAKE_INSTALL_PREFIX=/usr  \
           -DCMAKE_VERBOSE_MAKEFILE=ON  \
-          -DImpactX_PYTHON=ON
-        cmake --build build -j 2
+          -DImpactX_PYTHON=ON          \
+          -DMPIEXEC_POSTFLAGS="--use-hwthread-cpus"
+        cmake --build build -j 4
 
     - name: run tests
       run: |
@@ -76,7 +82,7 @@ jobs:
     env:
       CMAKE_GENERATOR: Ninja
       CXXFLAGS: "-Werror"
-      OMP_NUM_THREADS: 2
+      OMP_NUM_THREADS: 4
     steps:
     - uses: actions/checkout@v3
 
@@ -106,7 +112,7 @@ jobs:
           -DCMAKE_VERBOSE_MAKEFILE=ON  \
           -DImpactX_MPI=OFF            \
           -DImpactX_PYTHON=ON
-        cmake --build build -j 2
+        cmake --build build -j 4
 
     - name: run tests
       run: |

.github/workflows/windows.yml

@@ -46,7 +46,7 @@ jobs:
               -DHDF5_ENABLE_SZIP_SUPPORT=OFF     `
               -DHDF5_ENABLE_Z_LIB_SUPPORT=OFF
         if(!$?) { Exit $LASTEXITCODE }
-        cmake --build build_hdf5 --config RelWithDebInfo --target install --parallel 2
+        cmake --build build_hdf5 --config RelWithDebInfo --target install --parallel 4
         if(!$?) { Exit $LASTEXITCODE }
 
         $env:HDF5_DIR = "C:/Program Files/HDF_Group/HDF5/1.12.2/cmake/"
@@ -71,7 +71,7 @@ jobs:
               -DopenPMD_USE_HDF5=ON       `
               -DPython_EXECUTABLE=python3
         if(!$?) { Exit $LASTEXITCODE }
-        cmake --build build --config RelWithDebInfo --parallel 2
+        cmake --build build --config RelWithDebInfo --parallel 4
         if(!$?) { Exit $LASTEXITCODE }
     - name: Test
       run: |
@@ -132,7 +132,7 @@ jobs:
             -DHDF5_ENABLE_SZIP_SUPPORT=OFF      ^
             -DHDF5_ENABLE_Z_LIB_SUPPORT=OFF
         if errorlevel 1 exit 1
-        cmake --build build_hdf5 --config Release --target install --parallel 2
+        cmake --build build_hdf5 --config Release --target install --parallel 4
         if errorlevel 1 exit 1
 
         set "HDF5_DIR=C:/Program Files/HDF_Group/HDF5/1.12.2/cmake/"
@@ -163,7 +163,7 @@ jobs:
               -DopenPMD_USE_HDF5=ON          ^
               -DPython_EXECUTABLE=python3
         if errorlevel 1 exit 1
-        cmake --build build --parallel 2
+        cmake --build build --parallel 4
         if errorlevel 1 exit 1
     - name: Test
       shell: cmd

examples/CMakeLists.txt

@@ -14,7 +14,9 @@ if(ImpactX_MPI)
     set(MPI_TEST_EXE
         ${MPIEXEC_EXECUTABLE}
         ${MPI_ALLOW_ROOT}
-        ${MPIEXEC_NUMPROC_FLAG} 2
+        ${MPIEXEC_NUMPROC_FLAG} 3
+        ${MPIEXEC_POSTFLAGS}
+        ${MPIEXEC_PREFLAGS}
     )
 endif()
 
@@ -81,7 +83,7 @@ function(add_impactx_test name input is_mpi is_python analysis_script plot_scrip
     if(is_mpi)
         set_property(TEST ${name}.run APPEND PROPERTY ENVIRONMENT "OMP_NUM_THREADS=1")
     else()
-        set_property(TEST ${name}.run APPEND PROPERTY ENVIRONMENT "OMP_NUM_THREADS=2")
+        set_property(TEST ${name}.run APPEND PROPERTY ENVIRONMENT "OMP_NUM_THREADS=3")
     endif()
 
     # analysis and plots

examples/apochromatic/analysis_apochromatic.py

@@ -102,7 +102,7 @@ def get_moments(beam):
 )
 
 atol = 0.0  # ignored
-rtol = 19.0 * num_particles**-0.5  # from random sampling of a smooth distribution
+rtol = 26.0 * num_particles**-0.5  # from random sampling of a smooth distribution
 print(f"  rtol={rtol} (ignored: atol~={atol})")
 
 assert np.allclose(

examples/epac2004_benchmarks/analysis_bithermal.py

@@ -53,7 +53,7 @@ def get_moments(beam):
 )
 
 atol = 0.0  # ignored
-rtol = 3.5 * num_particles**-0.5  # from random sampling of a smooth distribution
+rtol = 4.0 * num_particles**-0.5  # from random sampling of a smooth distribution
 print(f"  rtol={rtol} (ignored: atol~={atol})")
 
 assert np.allclose(

examples/positron_channel/analysis_positron.py

@@ -53,7 +53,7 @@ def get_moments(beam):
 )
 
 atol = 0.0  # ignored
-rtol = 1.8 * num_particles**-0.5  # from random sampling of a smooth distribution
+rtol = 2.1 * num_particles**-0.5  # from random sampling of a smooth distribution
 print(f"  rtol={rtol} (ignored: atol~={atol})")
 
 assert np.allclose(

tests/python/CMakeLists.txt

@@ -18,7 +18,7 @@ add_test(NAME ${pytest_name}
 )
 
 #   limit threads
-set_property(TEST ${pytest_name} APPEND PROPERTY ENVIRONMENT "OMP_NUM_THREADS=2")
+set_property(TEST ${pytest_name} APPEND PROPERTY ENVIRONMENT "OMP_NUM_THREADS=3")
 
 #   set PYTHONPATH and PATH (for .dll files)
 impactx_test_set_pythonpath(${pytest_name})