From 8d930a06cc054d6cc3ad6dab9cf5ce34bd2b7888 Mon Sep 17 00:00:00 2001 From: Saurav Sachidanand Date: Fri, 3 Feb 2017 14:27:35 +0000 Subject: [PATCH 1/2] Set default value for nthreads in montecarlo to 0 This ensures to that, if nthreads isn't specified, the value of the OMP_NUM_THREADS environment variable is used by OpenMP instead of 1. --- tardis/io/schemas/montecarlo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tardis/io/schemas/montecarlo.yml b/tardis/io/schemas/montecarlo.yml index f7424c3e3e7..c9766218424 100644 --- a/tardis/io/schemas/montecarlo.yml +++ b/tardis/io/schemas/montecarlo.yml @@ -4,7 +4,7 @@ properties: nthreads: type: number multipleOf: 1.0 - default: 1 + default: 0 description: The number of OpenMP threads. seed: type: number From 429147fb8118765ea5598c2421f477af3b62cdf3 Mon Sep 17 00:00:00 2001 From: Saurav Sachidanand Date: Fri, 3 Feb 2017 14:35:12 +0000 Subject: [PATCH 2/2] Fix typos in command options in setup.py --- setup.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 24ace215f7a..d4d23588281 100755 --- a/setup.py +++ b/setup.py @@ -60,11 +60,11 @@ # invoking any other functionality from distutils since it can potentially # modify distutils' behavior. cmdclassd = register_commands(PACKAGENAME, VERSION, RELEASE) -add_command_option('install', 'with-openmp', 'compile TARDIS without OpenMP', +add_command_option('install', 'with-openmp', 'compile TARDIS with OpenMP', is_bool=True) -add_command_option('build', 'with-openmp', 'compile TARDIS without OpenMP', +add_command_option('build', 'with-openmp', 'compile TARDIS with OpenMP', is_bool=True) -add_command_option('develop', 'with-openmp', 'compile TARDIS without OpenMP', +add_command_option('develop', 'with-openmp', 'compile TARDIS with OpenMP', is_bool=True) add_command_option('install', 'with-vpacket-logging', 'compile TARDIS with virtual packet logging', is_bool=True) @@ -140,4 +140,3 @@ entry_points=entry_points, **package_info ) -