Skip to content

Commit

Permalink
Merge branch 'gwastro:master' into supervise_fit_coeff_dq_files
Browse files Browse the repository at this point in the history
  • Loading branch information
GarethCabournDavies committed Aug 21, 2024
2 parents 608d845 + 81305b4 commit f313028
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 3 deletions.
9 changes: 7 additions & 2 deletions pycbc/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,13 @@ def makedir(path):
# preserve common state information which we have relied on when using
# multiprocessing based pools.
import multiprocessing
if hasattr(multiprocessing, 'set_start_method'):
multiprocessing.set_start_method('fork')
if multiprocessing.get_start_method(allow_none=True) is None:
if hasattr(multiprocessing, 'set_start_method'):
multiprocessing.set_start_method('fork')
elif multiprocessing.get_start_method() != 'fork':
warnings.warn("PyCBC requires the use of the 'fork' start method"
" for multiprocessing, it is currently set to {}"
.format(multiprocessing.get_start_method()))
else:
HAVE_OMP = True

Expand Down
10 changes: 9 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ conda_deps=
gsl
lapack==3.6.1
conda_channels=conda-forge
setenv =
; Tell the linker to look for shared libs inside the temporary Conda env.
; Needed to build BBHx's wheel, whick links to LAPACK.
LIBRARY_PATH={envdir}/lib:{env:LIBRARY_PATH:}
commands = pytest

# The following are long running or may require
Expand Down Expand Up @@ -81,5 +85,9 @@ conda_deps=
lapack==3.6.1
openmpi
conda_channels=conda-forge
setenv = PYCBC_TEST_TYPE=docs
setenv =
PYCBC_TEST_TYPE=docs
; Tell the linker to look for shared libs inside the temporary Conda env.
; Needed to build BBHx's wheel, whick links to LAPACK.
LIBRARY_PATH={envdir}/lib:{env:LIBRARY_PATH:}
commands = bash tools/pycbc_test_suite.sh

0 comments on commit f313028

Please sign in to comment.