From fc220cce87e6e5c2436b668c034d5defc4a65fd8 Mon Sep 17 00:00:00 2001
From: Martin Reinecke <martin@mpa-garching.mpg.de>
Date: Mon, 25 Feb 2019 11:52:20 +0100
Subject: [PATCH] tweaking
---
nifty5/__init__.py | 4 ++--
nifty5/dobj.py | 4 ++--
.../{parallelization_scheme.py => internal_config.py} | 10 +++++++---
3 files changed, 11 insertions(+), 7 deletions(-)
rename nifty5/{parallelization_scheme.py => internal_config.py} (79%)
diff --git a/nifty5/__init__.py b/nifty5/__init__.py
index 88161cd34..0617f1a3e 100644
--- a/nifty5/__init__.py
+++ b/nifty5/__init__.py
@@ -94,8 +94,8 @@ from .logger import logger
from .linearization import Linearization
-from . import parallelization_scheme
-_scheme = parallelization_scheme.scheme()
+from . import internal_config
+_scheme = internal_config.parallelization_scheme()
if _scheme == "Samples":
from .minimization.metric_gaussian_kl_mpi import MetricGaussianKL_MPI
diff --git a/nifty5/dobj.py b/nifty5/dobj.py
index c4b5e08e1..9f3d3dc7e 100644
--- a/nifty5/dobj.py
+++ b/nifty5/dobj.py
@@ -15,10 +15,10 @@
#
# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik.
-from . import parallelization_scheme
+from . import internal_config
-_scheme = parallelization_scheme.scheme()
+_scheme = internal_config.parallelization_scheme()
if _scheme in ("Samples", "None"):
from .data_objects.numpy_do import *
diff --git a/nifty5/parallelization_scheme.py b/nifty5/internal_config.py
similarity index 79%
rename from nifty5/parallelization_scheme.py
rename to nifty5/internal_config.py
index c2a4f5896..c6c157aa0 100644
--- a/nifty5/parallelization_scheme.py
+++ b/nifty5/internal_config.py
@@ -15,7 +15,11 @@
#
# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik.
-def scheme():
- # return "Standard"
- return "Samples"
+
+# Internal configuration switches, typically for experimental features.
+# Leave unchanged unless you know what you are doing!
+
+def parallelization_scheme():
+ return "Standard"
+ # return "Samples"
# return "None"
--
GitLab