From c846a7fe350da0a71cb8aa91ec60bc2f77615cc9 Mon Sep 17 00:00:00 2001
From: leufen1 <l.leufen@fz-juelich.de>
Date: Fri, 28 May 2021 12:59:13 +0200
Subject: [PATCH] adjusted preprocessing tests
---
conftest.py | 2 +-
mlair/run_modules/pre_processing.py | 2 +-
test/test_run_modules/test_pre_processing.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/conftest.py b/conftest.py
index abb0c0f5..b63d3efb 100644
--- a/conftest.py
+++ b/conftest.py
@@ -66,5 +66,5 @@ def default_session_fixture(request):
# request.addfinalizer(unpatch)
- with mock.patch("multiprocessing.cpu_count", return_value=1):
+ with mock.patch("psutil.cpu_count", return_value=1):
yield
diff --git a/mlair/run_modules/pre_processing.py b/mlair/run_modules/pre_processing.py
index 11d73276..c7d7f920 100644
--- a/mlair/run_modules/pre_processing.py
+++ b/mlair/run_modules/pre_processing.py
@@ -245,7 +245,7 @@ class PreProcessing(RunEnvironment):
max_process = self.data_store.get("max_number_multiprocessing")
n_process = min([psutil.cpu_count(logical=False), len(set_stations), max_process]) # use only physical cpus
- if n_process > 1 and use_multiprocessing: # parallel solution
+ if n_process > 1 and use_multiprocessing is True: # parallel solution
logging.info("use parallel validate station approach")
pool = multiprocessing.Pool(n_process)
logging.info(f"running {getattr(pool, '_processes')} processes in parallel")
diff --git a/test/test_run_modules/test_pre_processing.py b/test/test_run_modules/test_pre_processing.py
index 5ae64bf3..0f2ee7a1 100644
--- a/test/test_run_modules/test_pre_processing.py
+++ b/test/test_run_modules/test_pre_processing.py
@@ -109,7 +109,7 @@ class TestPreProcessing:
assert caplog.record_tuples[-1] == ('root', 20, PyTestRegex(r'run for \d+:\d+:\d+ \(hh:mm:ss\) to check 6 '
r'station\(s\). Found 5/6 valid stations.'))
- @mock.patch("multiprocessing.cpu_count", return_value=3)
+ @mock.patch("psutil.cpu_count", return_value=3)
@mock.patch("multiprocessing.Pool", return_value=multiprocessing.Pool(3))
def test_validate_station_parallel(self, mock_pool, mock_cpu, caplog, obj_with_exp_setup):
pre = obj_with_exp_setup
--
GitLab