Skip to content

Add optional comm parameter for custom MPI communicators #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
williamjameshandley wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add optional comm parameter for custom MPI communicators #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions binminpy/BinMinBottomUp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,34 +25,36 @@ class BinMinBottomUp(BinMinBase):
RESULT_TAG = 2
TERMINATE_TAG = 3

def __init__(self, target_function, binning_tuples, args=(),
guide_function=None, bin_check_function=None,
def __init__(self, target_function, binning_tuples, args=(),
guide_function=None, bin_check_function=None,
callback=None, callback_on_rank_0=True,
sampler="latinhypercube",
sampler="latinhypercube",
optimizer="minimize", optimizer_kwargs={},
sampled_parameters=(),
sampled_parameters=(),
set_eval_points=None, set_eval_points_on_rank_0=True,
initial_optimizer="minimize", n_initial_points=10,
initial_optimizer_kwargs={},
initial_optimizer_kwargs={},
n_sampler_points_per_bin=10,
inherit_best_init_point_within_bin=False,
accept_target_below=np.inf, accept_delta_target_below=np.inf,
accept_guide_below=np.inf, accept_delta_guide_below=np.inf,
save_evals=False, return_evals=False,
return_bin_results=True, return_bin_centers=True,
save_evals=False, return_evals=False,
return_bin_results=True, return_bin_centers=True,
optima_comparison_rtol=1e-9, optima_comparison_atol=0.0,
neighborhood_distance=1,
n_optim_restarts_per_bin=1, n_tasks_per_batch=1,
n_optim_restarts_per_bin=1, n_tasks_per_batch=1,
print_progress_every_n_batch=100,
max_tasks_per_worker=np.inf, max_n_bins=np.inf,
max_tasks_in_memory=np.inf, task_dump_file=None,
skip_initial_optimization=False, initial_points=None,
comm=None,
):
"""Constructor."""

self.print_prefix = "BinMinBottomUp:"

comm = MPI.COMM_WORLD
self.comm = comm if comm is not None else MPI.COMM_WORLD
comm = self.comm
rank = comm.Get_rank()
size = comm.Get_size()
self.n_workers = size - 1
Expand Down Expand Up @@ -729,7 +731,7 @@ def run(self):
global _y_points_per_rank
global _g_points_per_rank

comm = MPI.COMM_WORLD
comm = self.comm
rank = comm.Get_rank()
size = comm.Get_size()

Expand Down
15 changes: 8 additions & 7 deletions binminpy/BinMinMPI.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@

class BinMinMPI(BinMin):

def __init__(self, target_function, binning_tuples, optimizer="minimize", optimizer_kwargs={},
def __init__(self, target_function, binning_tuples, optimizer="minimize", optimizer_kwargs={},
return_evals=False, return_bin_results=True, return_bin_centers=True, optima_comparison_rtol=1e-9, optima_comparison_atol=0.0,
n_restarts_per_bin=1, task_distribution="even", n_tasks_per_batch=1, max_tasks_per_worker=np.inf,
bin_masking=None, options={}):
n_restarts_per_bin=1, task_distribution="even", n_tasks_per_batch=1, max_tasks_per_worker=np.inf,
bin_masking=None, options={}, comm=None):
"""Constructor."""

comm = MPI.COMM_WORLD
self.comm = comm if comm is not None else MPI.COMM_WORLD
comm = self.comm
rank = comm.Get_rank()
size = comm.Get_size()

Expand Down Expand Up @@ -69,7 +70,7 @@ def run_even_task_distribution(self):
"""

"""Distribute the optimization tasks via MPI and collect results on rank 0."""
comm = MPI.COMM_WORLD
comm = self.comm
rank = comm.Get_rank()
size = comm.Get_size()

Expand Down Expand Up @@ -173,7 +174,7 @@ def run_dynamic_task_distribution(self):
On rank 0: a dictionary containing global optimization results.
On other ranks: None.
"""
comm = MPI.COMM_WORLD
comm = self.comm
rank = comm.Get_rank()
size = comm.Get_size()

Expand Down Expand Up @@ -316,7 +317,7 @@ def run_mcmc_task_distribution(self):
"""
from scipy.stats.qmc import LatinHypercube

comm = MPI.COMM_WORLD
comm = self.comm
rank = comm.Get_rank()
size = comm.Get_size()

Expand Down
Loading