Skip to content

Commit 60ab4f2

Browse files
committed
upd dependencies
1 parent 1c0cca3 commit 60ab4f2

1 file changed

Lines changed: 7 additions & 13 deletions

File tree

dependencies.py

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,8 @@ def InstallKokkosScriptModfile(settings: Settings) -> tuple[str, str]:
134134
modules_in_module = "\n".join(
135135
[f"module load {module}" for module in settings.module_loads]
136136
)
137-
src_path = f"{prefix}/src/kokkos"
138-
install_path = (
139-
f"{prefix}/kokkos/{version}/{backend}{f'_{arch}' if arch else ''}"
140-
)
137+
src_path = os.path.join(prefix, "src", "kokkos")
138+
install_path = os.path.join(prefix, "kokkos", version, backend, arch.lower() if arch else "")
141139
if os.path.exists(install_path) and not settings.overwrite:
142140
raise FileExistsError(
143141
f"Kokkos install path {install_path} already exists and overwrite is disabled"
@@ -205,8 +203,8 @@ def InstallAdios2Script(settings: Settings) -> tuple[str, str]:
205203
modules_in_module = "\n".join(
206204
[f"module load {module}" for module in settings.module_loads]
207205
)
208-
src_path = f"{prefix}/src/adios2"
209-
install_path = f"{prefix}/adios2/{version}/{mpi_mode}"
206+
src_path = os.path.join(prefix, "src", "adios2")
207+
install_path = os.path.join(prefix, "adios2", version, mpi_mode)
210208
if os.path.exists(install_path) and not settings.overwrite:
211209
raise FileExistsError(
212210
f"Adios2 install path {install_path} already exists and overwrite is disabled"
@@ -367,13 +365,9 @@ def on_install_confirmed(settings: Settings) -> None:
367365
settings.install_prefix,
368366
"modules",
369367
"kokkos",
370-
settings.kokkos_backend
371-
+ (
372-
f"_{settings.kokkos_arch.strip()}"
373-
if settings.kokkos_arch.strip()
374-
else ""
375-
),
376368
settings.kokkos_version,
369+
settings.kokkos_backend,
370+
settings.kokkos_arch.strip().lower(),
377371
)
378372
os.makedirs(os.path.dirname(kokkos_modfile_file), exist_ok=True)
379373
if os.path.exists(kokkos_modfile_file) and not settings.overwrite:
@@ -387,8 +381,8 @@ def on_install_confirmed(settings: Settings) -> None:
387381
settings.install_prefix,
388382
"modules",
389383
"adios2",
390-
settings.adios2_mpi,
391384
settings.adios2_version,
385+
settings.adios2_mpi,
392386
)
393387
os.makedirs(os.path.dirname(adios2_modfile_file), exist_ok=True)
394388
if os.path.exists(adios2_modfile_file) and not settings.overwrite:

0 commit comments

Comments
 (0)