From 1cf44541531541088198bd4599d467df3e1acbcf Mon Sep 17 00:00:00 2001 From: Deepak Mallubhotla Date: Thu, 13 Apr 2023 20:21:17 -0500 Subject: [PATCH] fix: avoids redefinition of core count in loop --- deepdog/real_spectrum_run.py | 7 ++++--- deepdog/temp_aware_real_spectrum_run.py | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/deepdog/real_spectrum_run.py b/deepdog/real_spectrum_run.py index c70c0ce..5b682dd 100644 --- a/deepdog/real_spectrum_run.py +++ b/deepdog/real_spectrum_run.py @@ -143,13 +143,14 @@ class RealSpectrumRun: results = [] _logger.debug("Going to iterate over models now") + core_count = multiprocessing.cpu_count() - 1 or 1 + if (self.cap_core_count >= 1) and (self.cap_core_count < core_count): + core_count = self.cap_core_count + _logger.info(f"Using {core_count} cores") for model_count, (model, model_name) in enumerate( zip(self.models, self.model_names) ): _logger.debug(f"Doing model #{model_count}: {model_name}") - core_count = multiprocessing.cpu_count() - 1 or 1 - if (self.cap_core_count >= 1) and (self.cap_core_count < core_count): - core_count = self.cap_core_count with multiprocessing.Pool(core_count) as pool: cycle_count = 0 cycle_success = 0 diff --git a/deepdog/temp_aware_real_spectrum_run.py b/deepdog/temp_aware_real_spectrum_run.py index 0d6c5de..fd08b9d 100644 --- a/deepdog/temp_aware_real_spectrum_run.py +++ b/deepdog/temp_aware_real_spectrum_run.py @@ -149,13 +149,14 @@ class TempAwareRealSpectrumRun: results = [] _logger.debug("Going to iterate over models now") + core_count = multiprocessing.cpu_count() - 1 or 1 + if (self.cap_core_count >= 1) and (self.cap_core_count < core_count): + core_count = self.cap_core_count + _logger.info(f"Using {core_count} cores") for model_count, (model, model_name) in enumerate( zip(self.models, self.model_names) ): _logger.debug(f"Doing model #{model_count}: {model_name}") - core_count = multiprocessing.cpu_count() - 1 or 1 - if (self.cap_core_count >= 1) and (self.cap_core_count < core_count): - core_count = self.cap_core_count with multiprocessing.Pool(core_count) as pool: cycle_count = 0 cycle_success = 0