Merge pull request #2367 from willend/main

willend · web-flow · commit 402732ba34c4 · 2026-03-23T21:27:08.000+01:00
On Windows use psutil for probing number of available cores in MPI
diff --git a/.github/workflows/mcstas-basictest.yml b/.github/workflows/mcstas-basictest.yml
@@ -81,7 +81,7 @@ jobs:
         choco install winflexbison3
         choco install wget
         if [ "$CC" == "gcc.exe" ]; then choco install mingw; fi
-        pip install mslex PyYAML ply ncrystal mcpl mcpl-extra
+        pip install mslex PyYAML ply ncrystal mcpl mcpl-extra psutil
 
     - name: Setup (Windows Intel)
       id: setup-Windows-intel
@@ -240,11 +240,11 @@ jobs:
            set -x
            if [ "$RUNNER_OS" == "macOS" ];
            then
-             python3 -mpip install PyYAML pyaml ply McStasScript ncrystal mcpl mcpl-extra jinja2 --break-system-packages
+             python3 -mpip install PyYAML pyaml ply McStasScript ncrystal mcpl mcpl-extra jinja2 psutil --break-system-packages
            fi
            if [ "$RUNNER_OS" == "Linux" ];
            then
-             python3 -mpip install PyYAML ply McStasscript ncrystal mcpl mcpl-extra jinja2
+             python3 -mpip install PyYAML ply McStasscript ncrystal mcpl mcpl-extra jinja2 psutil
            fi
 
     # Start of Unix tests
diff --git a/.github/workflows/mcxtrace-basictest.yml b/.github/workflows/mcxtrace-basictest.yml
@@ -89,7 +89,7 @@ jobs:
         choco install winflexbison3
         choco install wget
         if [ "$CC" == "gcc.exe" ]; then choco install mingw; fi
-        pip install mslex PyYAML ply mcpl mcpl-extra
+        pip install mslex PyYAML ply mcpl mcpl-extra psutil
 
     - name: Setup (Windows Intel)
       id: setup-Windows-intel
@@ -248,11 +248,11 @@ jobs:
            set -x
            if [ "$RUNNER_OS" == "macOS" ];
            then
-             python3 -mpip install PyYAML pyaml ply McStasScript mcpl mcpl-extra jinja2 --break-system-packages
+             python3 -mpip install PyYAML pyaml ply McStasScript mcpl mcpl-extra jinja2 psutil --break-system-packages
            fi
            if [ "$RUNNER_OS" == "Linux" ];
            then
-             python3 -mpip install PyYAML ply McStasscript mcpl mcpl-extra jinja2
+             python3 -mpip install PyYAML ply McStasscript mcpl mcpl-extra jinja2 psutil
            fi
 
     # Start of Unix tests
diff --git a/devel/bin/mccode-create-conda-yml b/devel/bin/mccode-create-conda-yml
@@ -21,7 +21,7 @@ def create_deplist( cfg ):
         return deps
 
     #The rest are run-time deps:
-    deps += ['python','c-compiler','pyaml','numpy']
+    deps += ['python','c-compiler','pyaml','numpy','psutil']
     if cfg.is_unix:
         deps += ['bash']
     if cfg.is_win:
diff --git a/environment.yml b/environment.yml
@@ -15,6 +15,7 @@ dependencies:
   - compilers
   - gsl
   - pyaml
+  - psutil
   - ply
   - matplotlib-base
   - numpy
diff --git a/mcstas-environment.yml b/mcstas-environment.yml
@@ -15,6 +15,7 @@ dependencies:
   - compilers
   - gsl
   - pyaml
+  - psutil
   - ply
   - matplotlib-base
   - numpy
diff --git a/mcxtrace-environment.yml b/mcxtrace-environment.yml
@@ -15,6 +15,7 @@ dependencies:
   - compilers
   - gsl
   - pyaml
+  - psutil
   - ply
   - matplotlib-base
   - numpy
diff --git a/meta-pkgs/windows/environment.yml b/meta-pkgs/windows/environment.yml
@@ -15,6 +15,7 @@ dependencies:
   - m2w64-gsl
   - msmpi
   - pyaml
+  - psutil
   - ply
   - numpy
   - tornado
diff --git a/meta-pkgs/windows/mcstas-environment.yml b/meta-pkgs/windows/mcstas-environment.yml
@@ -14,6 +14,7 @@ dependencies:
   - gsl
   - msmpi
   - pyaml
+  - psutil
   - ply
   - numpy
   - tornado
diff --git a/meta-pkgs/windows/mcxtrace-environment.yml b/meta-pkgs/windows/mcxtrace-environment.yml
@@ -14,6 +14,7 @@ dependencies:
   - gsl
   - msmpi
   - pyaml
+  - psutil
   - ply
   - numpy
   - tornado
diff --git a/tools/Python/mcrun/CMakeLists.txt b/tools/Python/mcrun/CMakeLists.txt
@@ -51,7 +51,7 @@ set(CPACK_NSIS_DISPLAY_NAME "${NSIS_NAME}")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${NSIS_NAME}")
 
 # Debian
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}, python3-yaml, python3-numpy")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}, python3-yaml, python3-numpy, python3-psutil")
 set(CPACK_DEBIAN_PACKAGE_REPLACES "${FLAVOR}-tools-python-${P}run-3.5.1")
 
 # RPM
diff --git a/tools/Python/mcrun/mccode.py b/tools/Python/mcrun/mccode.py
@@ -3,6 +3,7 @@
 import sys
 import re
 import shutil
+import psutil
 
 if not os.name == 'nt':
     import shlex as lexer
@@ -441,6 +442,7 @@ def runMPI(self, args, pipe=False, override_mpi=None):
                 LOG.info('Using system default number of mpirun -np processes')
                 if os.name == 'nt':
                     mpi_flags = [''] # msmpi mpiexec.exe does not accept --
+                    mpi_flags = ['-np', str(psutil.cpu_count(logical=False))] # probe number of available (non-logical) CPU's
                 else:
                     mpi_flags = ['--'] # ... whereas openmpi mpirun does.
             elif int(self.options.mpi) >= 1:
diff --git a/tools/Python/mctest/CMakeLists.txt b/tools/Python/mctest/CMakeLists.txt
@@ -52,7 +52,7 @@ set(CPACK_NSIS_DISPLAY_NAME "${NSIS_NAME}")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${NSIS_NAME}")
 
 # Debian
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}, ${FLAVOR}-comps, python3-jinja2")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}, ${FLAVOR}-comps, python3-jinja2, python3-psutil")
 set(CPACK_DEBIAN_PACKAGE_REPLACES "${FLAVOR}-tools-python-${P}test-3.5.1")
 
 # RPM

-Original file line number
+Diff line change
   - m2w64-gsl
   - msmpi
   - pyaml
 +  - psutil
   - ply
   - numpy
   - tornado