From 2fda32901b440cdf777148056fd408ba4b77d177 Mon Sep 17 00:00:00 2001 From: Tanushree Tunstall Date: Sat, 2 Jul 2022 10:25:13 +0100 Subject: [PATCH] change more hardcoded CPU counts to os.cpu_count() --- scripts/ml/combined_model/cm_logo_skf.py | 2 +- scripts/ml/ml_functions/FS.py | 2 +- scripts/ml/ml_functions/MultClfs_logo.py | 2 +- scripts/ml/ml_functions/MultClfs_logo_skf.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/ml/combined_model/cm_logo_skf.py b/scripts/ml/combined_model/cm_logo_skf.py index 24d6af9..28d8730 100755 --- a/scripts/ml/combined_model/cm_logo_skf.py +++ b/scripts/ml/combined_model/cm_logo_skf.py @@ -185,7 +185,7 @@ def CMLogoSkf(combined_df , run_blind_test = True , return_formatted_output = True , random_state = 42 - , n_jobs = 10 + , n_jobs = os.cpu_count() # the number of jobs should equal the number of CPU cores ) cD3_v2.to_csv(outFile) diff --git a/scripts/ml/ml_functions/FS.py b/scripts/ml/ml_functions/FS.py index 16d4ac2..0b78179 100755 --- a/scripts/ml/ml_functions/FS.py +++ b/scripts/ml/ml_functions/FS.py @@ -112,7 +112,7 @@ def fsgs_rfecv(input_df , resampling_type = 'none' , verbose = 3 , random_state = 42 - , n_jobs = 10 + , n_jobs = os.cpu_count() ): ''' returns diff --git a/scripts/ml/ml_functions/MultClfs_logo.py b/scripts/ml/ml_functions/MultClfs_logo.py index c99f3ec..aa9bb4e 100755 --- a/scripts/ml/ml_functions/MultClfs_logo.py +++ b/scripts/ml/ml_functions/MultClfs_logo.py @@ -78,7 +78,7 @@ import itertools from sklearn.model_selection import LeaveOneGroupOut #%% GLOBALS rs = {'random_state': 42} -njobs = {'n_jobs': 10} +njobs = {'n_jobs': os.cpu_count() } # the number of jobs should equal the number of CPU cores scoring_fn = ({ 'mcc' : make_scorer(matthews_corrcoef) , 'fscore' : make_scorer(f1_score) diff --git a/scripts/ml/ml_functions/MultClfs_logo_skf.py b/scripts/ml/ml_functions/MultClfs_logo_skf.py index e18c4c8..afebe94 100755 --- a/scripts/ml/ml_functions/MultClfs_logo_skf.py +++ b/scripts/ml/ml_functions/MultClfs_logo_skf.py @@ -152,7 +152,7 @@ def MultModelsCl_logo_skf(input_df , run_blind_test = True , return_formatted_output = True , random_state = 42 - , n_jobs = 10 + , n_jobs = os.cpu_count() # the number of jobs should equal the number of CPU cores , ): '''