diff --git a/inferelator/__init__.py b/inferelator/__init__.py index 7ccd029..ccaebd5 100644 --- a/inferelator/__init__.py +++ b/inferelator/__init__.py @@ -1,11 +1,3 @@ -# Set threading control variables if they're not already set - -import os -os.environ["MKL_NUM_THREADS"] = os.environ.get("MKL_NUM_THREADS", "1") -os.environ["NUMEXPR_NUM_THREADS"] = os.environ.get("NUMEXPR_NUM_THREADS", "1") -os.environ["OMP_NUM_THREADS"] = os.environ.get("OMP_NUM_THREADS", "1") -os.environ["OPENBLAS_NUM_THREADS"] = os.environ.get("OPENBLAS_NUM_THREADS", "1") - from inferelator.workflow import inferelator_workflow from inferelator.crossvalidation_workflow import CrossValidationManager from inferelator.utils import inferelator_verbose_level diff --git a/inferelator/distributed/dask_cluster_controller.py b/inferelator/distributed/dask_cluster_controller.py index 3044ee8..269e1f8 100644 --- a/inferelator/distributed/dask_cluster_controller.py +++ b/inferelator/distributed/dask_cluster_controller.py @@ -29,7 +29,7 @@ 'export MKL_NUM_THREADS={t}', 'export OPENBLAS_NUM_THREADS={t}', 'export NUMEXPR_NUM_THREADS={t}' - ] +] _DEFAULT_CONTROLLER_EXTRA = [ '--nodes 1',