From 14cfc06b7efbb5dba1b463120d824088f97720dc Mon Sep 17 00:00:00 2001 From: kalmarek Date: Thu, 21 Dec 2017 13:01:38 +0100 Subject: [PATCH] add workers keyword --- AutFN_orbit.jl | 2 +- CPUselect.jl | 10 ++++++---- SL_orbit.jl | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/AutFN_orbit.jl b/AutFN_orbit.jl index 50fae9c..3a5deff 100644 --- a/AutFN_orbit.jl +++ b/AutFN_orbit.jl @@ -43,7 +43,7 @@ parsed_args = parse_commandline() include("CPUselect.jl") -set_parallel_mthread(parsed_args) +set_parallel_mthread(parsed_args, workers=true) include("SAutFNs.jl") include("Orbit.jl") diff --git a/CPUselect.jl b/CPUselect.jl index 5ffd1ea..8321f65 100644 --- a/CPUselect.jl +++ b/CPUselect.jl @@ -9,7 +9,7 @@ function cpuinfo_physicalcores() return maxcore + 1 end -function set_parallel_mthread(parsed_args) +function set_parallel_mthread(parsed_args; workers=false) if parsed_args["cpus"] == nothing N = cpuinfo_physicalcores() @@ -20,11 +20,13 @@ function set_parallel_mthread(parsed_args) end end - info("Using $N cpus in @parallel code.") + if workers + addprocs(N) + info("Using $N cpus in @parallel code.") + end info("Using $(Threads.nthreads()) threads in @threads code.") - - addprocs(N) BLAS.set_num_threads(N) + info("Using $N threads in BLAS.") return N end diff --git a/SL_orbit.jl b/SL_orbit.jl index 4163526..42953c5 100644 --- a/SL_orbit.jl +++ b/SL_orbit.jl @@ -50,7 +50,7 @@ parsed_args = parse_commandline() include("CPUselect.jl") -set_parallel_mthread(parsed_args) +set_parallel_mthread(parsed_args, workers=true) include("SLNs.jl") include("Orbit.jl")