Skip to content

Update scaling code #66

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
AymericGaudin wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Update scaling code #66

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
61bc709
tools/scaling/scaling.py: Remove the extra derivatives folder
AymericGaudin Sep 24, 2026
0805414
tools/scaling/scaling.py: bind actual output directory
AymericGaudin Sep 24, 2026
5f8d7d4
tools/scaling/scaling.py: Rename output_dir to config_dir to match it…
AymericGaudin Sep 24, 2026
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
18 changes: 9 additions & 9 deletions tools/scaling/scaling_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ def collect_config(
print(f"- name: {workflow_name}")
print(f"- type: {workflow_type}")
print(f"- parameters: {workflow_parameters}")
output_dir = (
config_dir = (
working_dir /
f"{workflow_name}_{workflow_type}_{modality}"
)
Expand Down Expand Up @@ -609,7 +609,7 @@ def collect_config(
workflow_parameters = workflow_parameters.format_map(
SafeDict({
"mod_names": ",".join(set(dfs.keys()) - {"mod"}),
"outdir": working_dir / "derivatives",
"outdir": working_dir,
"fsdir": working_dir / "derivatives" / "sbm"
})
)
Expand All @@ -618,15 +618,15 @@ def collect_config(
confs = workflow_resource[workflow_name]
selected_conf = confs.get(workflow_type, confs["default"])

hopla_dir = output_dir / "hopla"
home_dir = output_dir / "home"
hopla_dir = config_dir / "hopla"
home_dir = config_dir / "home"
for dir_ in (hopla_dir, home_dir):
dir_.mkdir(parents=True, exist_ok=True)

if infra == "slurm":
image_parameters = (
f"--cleanenv --home {home_dir} --bind {bind_dir} "
f"--bind {output_dir} "
f"--bind {working_dir} "
)
else:
image_parameters = ""
Expand All @@ -644,7 +644,7 @@ def collect_config(

if df is not None:
df.to_csv(
output_dir / "data.tsv",
config_dir / "data.tsv",
sep="\t",
index=False,
)
Expand All @@ -670,15 +670,15 @@ def collect_config(
hopla_dir=hopla_dir,
)
config_path = (
output_dir /
config_dir /
f"config.toml"
)
with config_path.open("w") as of:
of.write(config_str)
print(f"- configuration file: {config_path}")

instructions_path = (
output_dir /
config_dir /
f"commands.txt"
)
hopla_cmd = (
Expand Down Expand Up @@ -730,7 +730,7 @@ def scan_configs(
Default None.
with_hash : bool
If True, compute a SHA-256 hash of each parsed file.
Dafault False.
Default False.
with_longitudinal : bool
If True, configure longitudinal workflows.
Default True.
Expand Down
Loading