From cabc2a028dc746cd6a4b7188febca7e1d3489b5c Mon Sep 17 00:00:00 2001 From: Matt Drozt Date: Wed, 26 Jun 2024 16:38:27 -0500 Subject: [PATCH] Env: dict -> Mapping --- smartsim/settings/builders/launch/alps.py | 2 +- smartsim/settings/builders/launch/dragon.py | 2 +- smartsim/settings/builders/launch/local.py | 2 +- smartsim/settings/builders/launch/lsf.py | 2 +- smartsim/settings/builders/launch/mpi.py | 6 +++--- smartsim/settings/builders/launch/pals.py | 2 +- smartsim/settings/builders/launch/slurm.py | 2 +- smartsim/settings/builders/launchArgBuilder.py | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/smartsim/settings/builders/launch/alps.py b/smartsim/settings/builders/launch/alps.py index 8f425dacca..f1a196e7c7 100644 --- a/smartsim/settings/builders/launch/alps.py +++ b/smartsim/settings/builders/launch/alps.py @@ -220,7 +220,7 @@ def set(self, key: str, value: str | None) -> None: self._launch_args[key] = value def finalize( - self, exe: ExecutableLike, env: dict[str, str | None] + self, exe: ExecutableLike, env: t.Mapping[str, str | None] ) -> t.Sequence[str]: return ( "aprun", diff --git a/smartsim/settings/builders/launch/dragon.py b/smartsim/settings/builders/launch/dragon.py index 1c8f1ac781..0d0062bf21 100644 --- a/smartsim/settings/builders/launch/dragon.py +++ b/smartsim/settings/builders/launch/dragon.py @@ -69,7 +69,7 @@ def set(self, key: str, value: str | None) -> None: self._launch_args[key] = value def finalize( - self, exe: ExecutableLike, env: dict[str, str | None] + self, exe: ExecutableLike, env: t.Mapping[str, str | None] ) -> DragonRunRequest: exe_, *args = exe.as_program_arguments() return DragonRunRequest( diff --git a/smartsim/settings/builders/launch/local.py b/smartsim/settings/builders/launch/local.py index 23c5d75f05..64770f696e 100644 --- a/smartsim/settings/builders/launch/local.py +++ b/smartsim/settings/builders/launch/local.py @@ -79,6 +79,6 @@ def set(self, key: str, value: str | None) -> None: self._launch_args[key] = value def finalize( - self, exe: ExecutableLike, env: dict[str, str | None] + self, exe: ExecutableLike, env: t.Mapping[str, str | None] ) -> t.Sequence[str]: return exe.as_program_arguments() diff --git a/smartsim/settings/builders/launch/lsf.py b/smartsim/settings/builders/launch/lsf.py index e7b22cb478..e1a03ef3b2 100644 --- a/smartsim/settings/builders/launch/lsf.py +++ b/smartsim/settings/builders/launch/lsf.py @@ -122,7 +122,7 @@ def set(self, key: str, value: str | None) -> None: self._launch_args[key] = value def finalize( - self, exe: ExecutableLike, env: dict[str, str | None] + self, exe: ExecutableLike, env: t.Mapping[str, str | None] ) -> t.Sequence[str]: return ( "jsrun", diff --git a/smartsim/settings/builders/launch/mpi.py b/smartsim/settings/builders/launch/mpi.py index 6bcde18da3..6eac12a244 100644 --- a/smartsim/settings/builders/launch/mpi.py +++ b/smartsim/settings/builders/launch/mpi.py @@ -225,7 +225,7 @@ def launcher_str(self) -> str: return LauncherType.Mpirun.value def finalize( - self, exe: ExecutableLike, env: dict[str, str | None] + self, exe: ExecutableLike, env: t.Mapping[str, str | None] ) -> t.Sequence[str]: return ("mpirun", *self.format_launch_args(), "--", *exe.as_program_arguments()) @@ -237,7 +237,7 @@ def launcher_str(self) -> str: return LauncherType.Mpiexec.value def finalize( - self, exe: ExecutableLike, env: dict[str, str | None] + self, exe: ExecutableLike, env: t.Mapping[str, str | None] ) -> t.Sequence[str]: return ( "mpiexec", @@ -254,7 +254,7 @@ def launcher_str(self) -> str: return LauncherType.Orterun.value def finalize( - self, exe: ExecutableLike, env: dict[str, str | None] + self, exe: ExecutableLike, env: t.Mapping[str, str | None] ) -> t.Sequence[str]: return ( "orterun", diff --git a/smartsim/settings/builders/launch/pals.py b/smartsim/settings/builders/launch/pals.py index c8bdf2432f..d21edc8bd0 100644 --- a/smartsim/settings/builders/launch/pals.py +++ b/smartsim/settings/builders/launch/pals.py @@ -156,7 +156,7 @@ def set(self, key: str, value: str | None) -> None: self._launch_args[key] = value def finalize( - self, exe: ExecutableLike, env: dict[str, str | None] + self, exe: ExecutableLike, env: t.Mapping[str, str | None] ) -> t.Sequence[str]: return ( "mpiexec", diff --git a/smartsim/settings/builders/launch/slurm.py b/smartsim/settings/builders/launch/slurm.py index 11e9a7b15a..1125c2611c 100644 --- a/smartsim/settings/builders/launch/slurm.py +++ b/smartsim/settings/builders/launch/slurm.py @@ -322,7 +322,7 @@ def set(self, key: str, value: str | None) -> None: self._launch_args[key] = value def finalize( - self, exe: ExecutableLike, env: dict[str, str | None] + self, exe: ExecutableLike, env: t.Mapping[str, str | None] ) -> t.Sequence[str]: return ( "srun", diff --git a/smartsim/settings/builders/launchArgBuilder.py b/smartsim/settings/builders/launchArgBuilder.py index 8a839a5c89..b125046cd6 100644 --- a/smartsim/settings/builders/launchArgBuilder.py +++ b/smartsim/settings/builders/launchArgBuilder.py @@ -59,7 +59,7 @@ def set(self, arg: str, val: str | None) -> None: """Set the launch arguments""" @abstractmethod - def finalize(self, exe: ExecutableLike, env: dict[str, str | None]) -> _T: + def finalize(self, exe: ExecutableLike, env: t.Mapping[str, str | None]) -> _T: """Prepare an entity for launch using the built options""" def format_launch_args(self) -> t.Union[t.List[str], None]: