Merge pull request #2167 from kif/2162_openmp

Disable openmp via environment variable

.github/workflows/release.yml

@@ -113,8 +113,7 @@ jobs:
         env:
           # Use silx wheelhouse: needed for ppc64le
           CIBW_ENVIRONMENT_LINUX: "PIP_FIND_LINKS=https://www.silx.org/pub/wheelhouse/ PIP_TRUSTED_HOST=www.silx.org"
-          # diable OpenMP under windows
-          CIBW_BEFORE_BUILD_WINDOWS: echo False > PYFAI_WITH_OPENMP
+          CIBW_ENVIRONMENT_WINDOWS: "PYFAI_WITH_OPENMP=False"
           CIBW_BUILD: cp37-* cp38-* cp39-* cp310-* cp311-* cp312-*
           # Do not build for pypy and muslinux
           CIBW_SKIP: pp* *-musllinux_*

meson.build

@@ -7,22 +7,28 @@ project('pyFAI',
   default_options: ['buildtype=plain', ],
 )
 
+py_mod = import('python')
+py = py_mod.find_installation()
+os = import('fs')
 
 # Seek the backend
 if meson.backend() != 'ninja'
   error('Ninja backend required')
 endif
 
-# Read configuration files to disable OpenMP:
-# 'PYFAI_WITH_OPENMP' file should contain 'False'
-os = import('fs')
+# How to disable OpenMP:
+# The 'PYFAI_WITH_OPENMP' file should contain 'False'
 if os.is_file('PYFAI_WITH_OPENMP')
   openmp_var = os.read('PYFAI_WITH_OPENMP').strip()
 else
-  openmp_var = ''
+  res = run_command(py, '-c', 'import os; print(os.environ["PYFAI_WITH_OPENMP"])')
+  if res.returncode() == 0
+    openmp_var = res.stdout().strip()
+  else
+    openmp_var = ''
+  endif
 endif
 
-
 cc = meson.get_compiler('c')
 cpp = meson.get_compiler('cpp')
 cy = meson.get_compiler('cython')
@@ -34,8 +40,6 @@ if m_dep.found()
 endif
 
 # https://mesonbuild.com/Python-module.html
-py_mod = import('python')
-py = py_mod.find_installation()
 py_dep = py.dependency()
 
 py.install_sources([