Commit e6c0e8ea authored by Thomas Vincent's avatar Thomas Vincent

Merge branch 'fix-omp' into 'master'

Avoid issue with silx compiled with OpenMP

See merge request !114
parents 550fd4b7 316a4ba4
Pipeline #12173 passed with stages
in 8 minutes and 20 seconds
......@@ -47,3 +47,6 @@ try:
from ._version import version, version_info, hexversion, strictversion # noqa
except ImportError:
raise RuntimeError("Do NOT use %s from its sources: build it and use the built version" % project)
# Set OpenMP to use a single thread (for median filter)
_os.environ["OMP_NUM_THREADS"] = "1"
......@@ -1375,9 +1375,6 @@ def _to_qspace(th_idx,
img = np.ascontiguousarray(np.zeros(img_size), dtype=img_dtype)
# Set OpenMP to use a single thread (for median filter)
os.environ["OMP_NUM_THREADS"] = "1"
rc = None
errMsg = None
try:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment