Skip to content

Commit

Permalink
add polaris env; remove rebalance GIO option; update lock file
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelbuehlmann committed Feb 12, 2024
1 parent d9f1984 commit 687f04e
Show file tree
Hide file tree
Showing 6 changed files with 902 additions and 968 deletions.
6 changes: 6 additions & 0 deletions env/bashrc.polaris
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module load PrgEnv-gnu
module load gcc/10.3.0
module load cudatoolkit-standalone
module load cray-python
export CC=cc
export CXX=CC
11 changes: 0 additions & 11 deletions haccytrees/mergertrees/assemble/catalogs2trees.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ def _read_data(
filename: str,
logger: Callable,
fields_config: FieldsConfig,
rebalance: bool,
verbose: Union[bool, int],
):
fields_xyz = [
Expand All @@ -140,7 +139,6 @@ def _read_data(
filename,
fields_config.read_fields,
method=pygio.PyGenericIO.FileIO.FileIOMPI,
rebalance_sourceranks=rebalance,
)

# mask invalid data
Expand Down Expand Up @@ -201,7 +199,6 @@ def _catalog2tree_step(
fields_config: FieldsConfig,
do_all2all_exchange: bool,
fail_on_desc_not_found: bool,
rebalance_gio_read: bool,
verbose: Union[bool, int],
logger: Callable[[str], None],
):
Expand All @@ -219,7 +216,6 @@ def _catalog2tree_step(
filename=treenode_filename,
logger=logger,
fields_config=fields_config,
rebalance=rebalance_gio_read,
verbose=verbose,
)

Expand Down Expand Up @@ -285,7 +281,6 @@ def catalog2tree(
do_all2all_exchange: bool = False,
split_output: bool = False,
fail_on_desc_not_found: bool = True,
rebalance_gio_read: bool = False,
mpi_waittime: float = 0,
logger: Callable[[str], None] = None,
verbose: Union[bool, int] = False,
Expand Down Expand Up @@ -327,10 +322,6 @@ def catalog2tree(
ranks. If ``False``, the orphaned halo will become the root of the
subtree.
rebalance_gio_read
if ``True``, will reassign the reading ranks for the treenode files. Can
be slower or faster.
mpi_waittime
time in seconds for which the code will wait for the MPI to be
initialized. Can help with some MPI errors (on cooley)
Expand Down Expand Up @@ -397,7 +388,6 @@ def logger(x, **kwargs):
treenode_filename,
logger,
fields_config,
rebalance=rebalance_gio_read,
verbose=verbose,
)

Expand Down Expand Up @@ -436,7 +426,6 @@ def logger(x, **kwargs):
fields_config,
do_all2all_exchange,
fail_on_desc_not_found,
rebalance_gio_read,
verbose,
logger,
)
Expand Down
4 changes: 0 additions & 4 deletions haccytrees/scripts/treenodes2forest.example.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ treenode_base = ./treenodes/m000p-
# alternatively, you can specify it like this: (useful for galaxymergertrees!)
# treenode_base = ./treenodes/m000p-#.treenodes

# this flag will try to rebalance the GenericIO reading of each rank. Can be
# faster or much slower – test!
rebalance_gio_read = no


[columns]
# how the fields in the treenode catalogs are named – can change from simulation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ simulation = simulation_example.cfg
# the base-path of the treenode catalogs. The files are assumed to be named e.g.
# ./treenodes/m000p-499.treenodes
treenode_base = ../trees/m000p-#.galaxytreenodes
# this flag will try to rebalance the GenericIO reading of each rank. Can be
# faster or much slower – test!
rebalance_gio_read = no


[columns]
Expand Down
5 changes: 0 additions & 5 deletions haccytrees/scripts/treenodes2forest.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@ def parse_config(config_path: Path) -> Dict[str, Any]:
if not treenode_base.is_absolute():
treenode_base = base_path / treenode_base

rebalance_gio_read = config["simulation"].getboolean(
"rebalance_gio_read", fallback=False
)

# Output
output_base = Path(config["output"]["output_base"])
Expand Down Expand Up @@ -103,7 +100,6 @@ def parse_config(config_path: Path) -> Dict[str, Any]:
return {
"simulation": simulation,
"treenode_base": str(treenode_base),
"rebalance_gio_read": rebalance_gio_read,
"output_base": output_base,
"split_output": split_output,
"temporary_path": temporary_path,
Expand Down Expand Up @@ -139,7 +135,6 @@ def cli(config_path: Path):
do_all2all_exchange=config["do_all2all_exchange"],
split_output=config["split_output"],
fail_on_desc_not_found=config["fail_on_desc_not_found"],
rebalance_gio_read=config["rebalance_gio_read"],
mpi_waittime=config["mpi_waittime"],
verbose=config["verbose"],
)
Expand Down
Loading

0 comments on commit 687f04e

Please sign in to comment.