From f9d44fbff19ff179ef15b9c8ae96193f3938b92c Mon Sep 17 00:00:00 2001 From: Amanda Richardson Date: Wed, 18 Sep 2024 09:46:24 -0700 Subject: [PATCH 1/5] initial push --- conftest.py | 4 ++-- smartsim/_core/commands/__init__.py | 4 ++-- .../commands/{commandList.py => command_list.py} | 0 .../{launchCommands.py => launch_commands.py} | 2 +- smartsim/_core/entrypoints/dragon.py | 14 +++++++------- smartsim/_core/entrypoints/dragon_client.py | 2 +- smartsim/_core/launcher/__init__.py | 2 +- .../dragon/{dragonBackend.py => dragon_backend.py} | 6 +++--- .../{dragonConnector.py => dragon_connector.py} | 12 ++++++------ .../{dragonLauncher.py => dragon_launcher.py} | 4 ++-- .../dragon/{dragonSockets.py => dragon_sockets.py} | 0 smartsim/_core/utils/telemetry/telemetry.py | 2 +- smartsim/launchable/basejob.py | 2 +- smartsim/launchable/job.py | 2 +- smartsim/launchable/mpmdjob.py | 2 +- tests/_legacy/on_wlm/test_dragon.py | 2 +- tests/_legacy/test_dragon_launcher.py | 4 ++-- tests/_legacy/test_dragon_run_policy.py | 2 +- tests/_legacy/test_dragon_run_request.py | 6 +++--- .../test_core/test_commands/test_commandList.py | 2 +- .../test_core/test_commands/test_launchCommands.py | 4 ++-- .../test_settings/test_dragonLauncher.py | 2 +- 22 files changed, 40 insertions(+), 40 deletions(-) rename smartsim/_core/commands/{commandList.py => command_list.py} (100%) rename smartsim/_core/commands/{launchCommands.py => launch_commands.py} (97%) rename smartsim/_core/launcher/dragon/{dragonBackend.py => dragon_backend.py} (99%) rename smartsim/_core/launcher/dragon/{dragonConnector.py => dragon_connector.py} (98%) rename smartsim/_core/launcher/dragon/{dragonLauncher.py => dragon_launcher.py} (99%) rename smartsim/_core/launcher/dragon/{dragonSockets.py => dragon_sockets.py} (100%) diff --git a/conftest.py b/conftest.py index 3facd09a95..c407681d76 100644 --- a/conftest.py +++ b/conftest.py @@ -51,8 +51,8 @@ from smartsim import Experiment from smartsim._core.config import CONFIG from smartsim._core.config.config import Config -from smartsim._core.launcher.dragon.dragonConnector import DragonConnector -from smartsim._core.launcher.dragon.dragonLauncher import DragonLauncher +from smartsim._core.launcher.dragon.dragon_connector import DragonConnector +from smartsim._core.launcher.dragon.dragon_launcher import DragonLauncher from smartsim._core.utils.telemetry.telemetry import JobEntity from smartsim.database import FeatureStore from smartsim.entity import Application diff --git a/smartsim/_core/commands/__init__.py b/smartsim/_core/commands/__init__.py index 72ef1f674a..a35efc62f8 100644 --- a/smartsim/_core/commands/__init__.py +++ b/smartsim/_core/commands/__init__.py @@ -25,5 +25,5 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. from .command import Command -from .commandList import CommandList -from .launchCommands import LaunchCommands +from .command_list import CommandList +from .launch_commands import LaunchCommands diff --git a/smartsim/_core/commands/commandList.py b/smartsim/_core/commands/command_list.py similarity index 100% rename from smartsim/_core/commands/commandList.py rename to smartsim/_core/commands/command_list.py diff --git a/smartsim/_core/commands/launchCommands.py b/smartsim/_core/commands/launch_commands.py similarity index 97% rename from smartsim/_core/commands/launchCommands.py rename to smartsim/_core/commands/launch_commands.py index c62186671b..74303ac942 100644 --- a/smartsim/_core/commands/launchCommands.py +++ b/smartsim/_core/commands/launch_commands.py @@ -1,4 +1,4 @@ -from .commandList import CommandList +from .command_list import CommandList class LaunchCommands: diff --git a/smartsim/_core/entrypoints/dragon.py b/smartsim/_core/entrypoints/dragon.py index 2bfde74f23..b0b941d104 100644 --- a/smartsim/_core/entrypoints/dragon.py +++ b/smartsim/_core/entrypoints/dragon.py @@ -40,8 +40,8 @@ import zmq.auth.thread from smartsim._core.config import get_config -from smartsim._core.launcher.dragon import dragonSockets -from smartsim._core.launcher.dragon.dragonBackend import DragonBackend +from smartsim._core.launcher.dragon import dragon_sockets +from smartsim._core.launcher.dragon.dragon_backend import DragonBackend from smartsim._core.schemas import ( DragonBootstrapRequest, DragonBootstrapResponse, @@ -164,12 +164,12 @@ def run( dragon_pid: int, ) -> None: logger.debug(f"Opening socket {dragon_head_address}") - dragon_head_socket = dragonSockets.get_secure_socket(zmq_context, zmq.REP, True) + dragon_head_socket = dragon_sockets.get_secure_socket(zmq_context, zmq.REP, True) dragon_head_socket.bind(dragon_head_address) dragon_backend = DragonBackend(pid=dragon_pid) backend_updater = start_updater(dragon_backend, None) - server = dragonSockets.as_server(dragon_head_socket) + server = dragon_sockets.as_server(dragon_head_socket) logger.debug(f"Listening to {dragon_head_address}") @@ -236,14 +236,14 @@ def execute_entrypoint(args: DragonEntrypointArgs) -> int: else: dragon_head_address += ":5555" - zmq_authenticator = dragonSockets.get_authenticator(zmq_context, timeout=-1) + zmq_authenticator = dragon_sockets.get_authenticator(zmq_context, timeout=-1) logger.debug("Getting launcher socket") - launcher_socket = dragonSockets.get_secure_socket(zmq_context, zmq.REQ, False) + launcher_socket = dragon_sockets.get_secure_socket(zmq_context, zmq.REQ, False) logger.debug(f"Connecting launcher socket to: {args.launching_address}") launcher_socket.connect(args.launching_address) - client = dragonSockets.as_client(launcher_socket) + client = dragon_sockets.as_client(launcher_socket) logger.debug( f"Sending bootstrap request to launcher_socket with {dragon_head_address}" diff --git a/smartsim/_core/entrypoints/dragon_client.py b/smartsim/_core/entrypoints/dragon_client.py index e998ddce19..0131124121 100644 --- a/smartsim/_core/entrypoints/dragon_client.py +++ b/smartsim/_core/entrypoints/dragon_client.py @@ -37,7 +37,7 @@ import zmq -from smartsim._core.launcher.dragon.dragonConnector import DragonConnector +from smartsim._core.launcher.dragon.dragon_connector import DragonConnector from smartsim._core.schemas import ( DragonHandshakeRequest, DragonRequest, diff --git a/smartsim/_core/launcher/__init__.py b/smartsim/_core/launcher/__init__.py index c6584ee3d9..7300b35d63 100644 --- a/smartsim/_core/launcher/__init__.py +++ b/smartsim/_core/launcher/__init__.py @@ -24,7 +24,7 @@ # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -from .dragon.dragonLauncher import DragonLauncher +from .dragon.dragon_launcher import DragonLauncher from .launcher import Launcher from .local.local import LocalLauncher from .lsf.lsfLauncher import LSFLauncher diff --git a/smartsim/_core/launcher/dragon/dragonBackend.py b/smartsim/_core/launcher/dragon/dragon_backend.py similarity index 99% rename from smartsim/_core/launcher/dragon/dragonBackend.py rename to smartsim/_core/launcher/dragon/dragon_backend.py index ec38e53eb4..a0d6e71f25 100644 --- a/smartsim/_core/launcher/dragon/dragonBackend.py +++ b/smartsim/_core/launcher/dragon/dragon_backend.py @@ -45,8 +45,8 @@ # pylint: enable=import-error # isort: on -from ...._core.config import get_config -from ...._core.schemas import ( +from ...config import get_config +from ...schemas import ( DragonHandshakeRequest, DragonHandshakeResponse, DragonRequest, @@ -60,7 +60,7 @@ DragonUpdateStatusRequest, DragonUpdateStatusResponse, ) -from ...._core.utils.helpers import create_short_id_str +from ...utils.helpers import create_short_id_str from ....log import get_logger from ....status import TERMINAL_STATUSES, JobStatus diff --git a/smartsim/_core/launcher/dragon/dragonConnector.py b/smartsim/_core/launcher/dragon/dragon_connector.py similarity index 98% rename from smartsim/_core/launcher/dragon/dragonConnector.py rename to smartsim/_core/launcher/dragon/dragon_connector.py index 60fbf3ce7b..c493c7f897 100644 --- a/smartsim/_core/launcher/dragon/dragonConnector.py +++ b/smartsim/_core/launcher/dragon/dragon_connector.py @@ -42,7 +42,7 @@ import zmq import zmq.auth.thread -from ...._core.launcher.dragon import dragonSockets +from . import dragon_sockets from ....error.errors import SmartSimError from ....log import get_logger from ...config import get_config @@ -113,7 +113,7 @@ def can_monitor(self) -> bool: return self._dragon_head_pid is not None def _handshake(self, address: str) -> None: - self._dragon_head_socket = dragonSockets.get_secure_socket( + self._dragon_head_socket = dragon_sockets.get_secure_socket( self._context, zmq.REQ, False ) self._dragon_head_socket.connect(address) @@ -176,7 +176,7 @@ def _get_new_authenticator( except zmq.Again: logger.debug("Could not stop authenticator") try: - self._authenticator = dragonSockets.get_authenticator( + self._authenticator = dragon_sockets.get_authenticator( self._context, timeout ) return @@ -224,7 +224,7 @@ def _start_connector_socket(self, socket_addr: str) -> zmq.Socket[t.Any]: connector_socket: t.Optional[zmq.Socket[t.Any]] = None self._reset_timeout(config.dragon_server_startup_timeout) self._get_new_authenticator(-1) - connector_socket = dragonSockets.get_secure_socket(self._context, zmq.REP, True) + connector_socket = dragon_sockets.get_secure_socket(self._context, zmq.REP, True) logger.debug(f"Binding connector to {socket_addr}") connector_socket.bind(socket_addr) if connector_socket is None: @@ -353,7 +353,7 @@ def connect_to_dragon(self) -> None: start_new_session=True, ) - server = dragonSockets.as_server(connector_socket) + server = dragon_sockets.as_server(connector_socket) logger.debug(f"Listening to {socket_addr}") request = _assert_schema_type(server.recv(), DragonBootstrapRequest) server.send( @@ -460,7 +460,7 @@ def _send_req_with_socket( send_flags: int = 0, recv_flags: int = 0, ) -> DragonResponse: - client = dragonSockets.as_client(socket) + client = dragon_sockets.as_client(socket) with DRG_LOCK: logger.debug(f"Sending {type(request).__name__}: {request}") client.send(request, send_flags) diff --git a/smartsim/_core/launcher/dragon/dragonLauncher.py b/smartsim/_core/launcher/dragon/dragon_launcher.py similarity index 99% rename from smartsim/_core/launcher/dragon/dragonLauncher.py rename to smartsim/_core/launcher/dragon/dragon_launcher.py index 398596049e..8926ce6547 100644 --- a/smartsim/_core/launcher/dragon/dragonLauncher.py +++ b/smartsim/_core/launcher/dragon/dragon_launcher.py @@ -34,7 +34,7 @@ from smartsim.error import errors from smartsim.types import LaunchedJobID -from ...._core.launcher.stepMapping import StepMap +from ..stepMapping import StepMap from ....error import LauncherError, SmartSimError from ....log import get_logger from ....settings import ( @@ -59,7 +59,7 @@ from ..slurm.slurmLauncher import SlurmLauncher from ..step import DragonBatchStep, DragonStep, LocalStep, Step from ..stepInfo import StepInfo -from .dragonConnector import DragonConnector, _SchemaT +from .dragon_connector import DragonConnector, _SchemaT if t.TYPE_CHECKING: from typing_extensions import Self diff --git a/smartsim/_core/launcher/dragon/dragonSockets.py b/smartsim/_core/launcher/dragon/dragon_sockets.py similarity index 100% rename from smartsim/_core/launcher/dragon/dragonSockets.py rename to smartsim/_core/launcher/dragon/dragon_sockets.py diff --git a/smartsim/_core/utils/telemetry/telemetry.py b/smartsim/_core/utils/telemetry/telemetry.py index 8a9a99aedc..381abb4936 100644 --- a/smartsim/_core/utils/telemetry/telemetry.py +++ b/smartsim/_core/utils/telemetry/telemetry.py @@ -42,7 +42,7 @@ from smartsim._core.config import CONFIG from smartsim._core.control.job import JobEntity, _JobKey from smartsim._core.control.jobmanager import JobManager -from smartsim._core.launcher.dragon.dragonLauncher import DragonLauncher +from smartsim._core.launcher.dragon.dragon_launcher import DragonLauncher from smartsim._core.launcher.launcher import Launcher from smartsim._core.launcher.local.local import LocalLauncher from smartsim._core.launcher.lsf.lsfLauncher import LSFLauncher diff --git a/smartsim/launchable/basejob.py b/smartsim/launchable/basejob.py index eedf9f6ffb..878a59e532 100644 --- a/smartsim/launchable/basejob.py +++ b/smartsim/launchable/basejob.py @@ -30,7 +30,7 @@ from smartsim.launchable.launchable import Launchable if t.TYPE_CHECKING: - from smartsim._core.commands.launchCommands import LaunchCommands + from smartsim._core.commands.launch_commands import LaunchCommands class BaseJob(ABC, Launchable): diff --git a/smartsim/launchable/job.py b/smartsim/launchable/job.py index a433319ac4..d020e6e575 100644 --- a/smartsim/launchable/job.py +++ b/smartsim/launchable/job.py @@ -30,7 +30,7 @@ import typing as t from copy import deepcopy -from smartsim._core.commands.launchCommands import LaunchCommands +from smartsim._core.commands.launch_commands import LaunchCommands from smartsim._core.utils.helpers import check_name from smartsim.launchable.basejob import BaseJob from smartsim.log import get_logger diff --git a/smartsim/launchable/mpmdjob.py b/smartsim/launchable/mpmdjob.py index 7426d91368..314653498c 100644 --- a/smartsim/launchable/mpmdjob.py +++ b/smartsim/launchable/mpmdjob.py @@ -36,7 +36,7 @@ from smartsim.settings.launchSettings import LaunchSettings if t.TYPE_CHECKING: - from smartsim._core.commands.launchCommands import LaunchCommands + from smartsim._core.commands.launch_commands import LaunchCommands from smartsim.entity.entity import SmartSimEntity diff --git a/tests/_legacy/on_wlm/test_dragon.py b/tests/_legacy/on_wlm/test_dragon.py index 56264c1e14..b685b65020 100644 --- a/tests/_legacy/on_wlm/test_dragon.py +++ b/tests/_legacy/on_wlm/test_dragon.py @@ -26,7 +26,7 @@ import pytest from smartsim import Experiment -from smartsim._core.launcher.dragon.dragonLauncher import DragonLauncher +from smartsim._core.launcher.dragon.dragon_launcher import DragonLauncher from smartsim.status import JobStatus # retrieved from pytest fixtures diff --git a/tests/_legacy/test_dragon_launcher.py b/tests/_legacy/test_dragon_launcher.py index 4fe8bf71b4..a2266964f8 100644 --- a/tests/_legacy/test_dragon_launcher.py +++ b/tests/_legacy/test_dragon_launcher.py @@ -39,11 +39,11 @@ import smartsim._core.config from smartsim._core._cli.scripts.dragon_install import create_dotenv from smartsim._core.config.config import get_config -from smartsim._core.launcher.dragon.dragonLauncher import ( +from smartsim._core.launcher.dragon.dragon_launcher import ( DragonConnector, DragonLauncher, ) -from smartsim._core.launcher.dragon.dragonSockets import ( +from smartsim._core.launcher.dragon.dragon_sockets import ( get_authenticator, get_secure_socket, ) diff --git a/tests/_legacy/test_dragon_run_policy.py b/tests/_legacy/test_dragon_run_policy.py index 1d8d069fab..16b1c468bd 100644 --- a/tests/_legacy/test_dragon_run_policy.py +++ b/tests/_legacy/test_dragon_run_policy.py @@ -36,7 +36,7 @@ from dragon.infrastructure.policy import Policy import smartsim._core.entrypoints.dragon as drg - from smartsim._core.launcher.dragon.dragonBackend import DragonBackend + from smartsim._core.launcher.dragon.dragon_backend import DragonBackend dragon_loaded = True except: diff --git a/tests/_legacy/test_dragon_run_request.py b/tests/_legacy/test_dragon_run_request.py index 3228bdee79..dade022dad 100644 --- a/tests/_legacy/test_dragon_run_request.py +++ b/tests/_legacy/test_dragon_run_request.py @@ -50,7 +50,7 @@ from smartsim.status import TERMINAL_STATUSES, InvalidJobStatus, JobStatus if t.TYPE_CHECKING: - from smartsim._core.launcher.dragon.dragonBackend import ( + from smartsim._core.launcher.dragon.dragon_backend import ( DragonBackend, ProcessGroupInfo, ) @@ -149,7 +149,7 @@ def get_mock_backend( **{"System.return_value": system_mock, "Node.return_value": node_mock} ), ) - from smartsim._core.launcher.dragon.dragonBackend import DragonBackend + from smartsim._core.launcher.dragon.dragon_backend import DragonBackend dragon_backend = DragonBackend(pid=99999) monkeypatch.setattr( @@ -167,7 +167,7 @@ def set_mock_group_infos( process_mock.configure_mock(**{"returncode": 0}) dragon_mock.configure_mock(**{"native.process.Process.return_value": process_mock}) monkeypatch.setitem(sys.modules, "dragon", dragon_mock) - from smartsim._core.launcher.dragon.dragonBackend import ProcessGroupInfo + from smartsim._core.launcher.dragon.dragon_backend import ProcessGroupInfo running_group = MagicMock(status="Running") error_group = MagicMock(status="Error") diff --git a/tests/temp_tests/test_core/test_commands/test_commandList.py b/tests/temp_tests/test_core/test_commands/test_commandList.py index 79d6f7e78b..9fd041dd89 100644 --- a/tests/temp_tests/test_core/test_commands/test_commandList.py +++ b/tests/temp_tests/test_core/test_commands/test_commandList.py @@ -27,7 +27,7 @@ import pytest from smartsim._core.commands.command import Command -from smartsim._core.commands.commandList import CommandList +from smartsim._core.commands.command_list import CommandList from smartsim.settings.launchCommand import LauncherType pytestmark = pytest.mark.group_a diff --git a/tests/temp_tests/test_core/test_commands/test_launchCommands.py b/tests/temp_tests/test_core/test_commands/test_launchCommands.py index 0c5e719ccf..c4c19c6f81 100644 --- a/tests/temp_tests/test_core/test_commands/test_launchCommands.py +++ b/tests/temp_tests/test_core/test_commands/test_launchCommands.py @@ -27,8 +27,8 @@ import pytest from smartsim._core.commands.command import Command -from smartsim._core.commands.commandList import CommandList -from smartsim._core.commands.launchCommands import LaunchCommands +from smartsim._core.commands.command_list import CommandList +from smartsim._core.commands.launch_commands import LaunchCommands from smartsim.settings.launchCommand import LauncherType pytestmark = pytest.mark.group_a diff --git a/tests/temp_tests/test_settings/test_dragonLauncher.py b/tests/temp_tests/test_settings/test_dragonLauncher.py index 1026765cfe..bd2c6f4927 100644 --- a/tests/temp_tests/test_settings/test_dragonLauncher.py +++ b/tests/temp_tests/test_settings/test_dragonLauncher.py @@ -25,7 +25,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import pytest -from smartsim._core.launcher.dragon.dragonLauncher import ( +from smartsim._core.launcher.dragon.dragon_launcher import ( _as_run_request_args_and_policy, ) from smartsim._core.schemas.dragonRequests import DragonRunPolicy, DragonRunRequestView From 8934b3e8886aedcd0c9dd977fd6da7eb92bb8bf8 Mon Sep 17 00:00:00 2001 From: Amanda Richardson Date: Wed, 18 Sep 2024 13:47:44 -0700 Subject: [PATCH 2/5] camel to snake --- .../experiment_doc_examples/exp.py | 2 +- smartsim/_core/__init__.py | 4 +- smartsim/_core/control/controller.py | 2 +- .../control/{jobmanager.py => job_manager.py} | 2 +- ...previewrenderer.py => preview_renderer.py} | 4 +- ...lemetrymonitor.py => telemetry_monitor.py} | 0 smartsim/_core/launcher/__init__.py | 8 +-- .../_core/launcher/dragon/dragon_launcher.py | 10 ++-- .../_core/launcher/dragon/dragon_sockets.py | 4 +- smartsim/_core/launcher/launcher.py | 8 +-- smartsim/_core/launcher/local/local.py | 6 +- .../lsf/{lsfCommands.py => lsf_commands.py} | 0 .../lsf/{lsfLauncher.py => lsf_launcher.py} | 6 +- .../lsf/{lsfParser.py => lsf_parser.py} | 0 .../pbs/{pbsCommands.py => pbs_commands.py} | 0 .../pbs/{pbsLauncher.py => pbs_launcher.py} | 6 +- .../pbs/{pbsParser.py => pbs_parser.py} | 0 .../sge/{sgeCommands.py => sge_commands.py} | 0 .../sge/{sgeLauncher.py => sge_launcher.py} | 6 +- .../sge/{sgeParser.py => sge_parser.py} | 0 .../{slurmCommands.py => slurm_commands.py} | 0 .../{slurmLauncher.py => slurm_launcher.py} | 6 +- .../slurm/{slurmParser.py => slurm_parser.py} | 0 smartsim/_core/launcher/step/__init__.py | 16 +++--- .../step/{alpsStep.py => alps_step.py} | 0 .../step/{dragonStep.py => dragon_step.py} | 2 +- .../step/{localStep.py => local_step.py} | 0 .../launcher/step/{lsfStep.py => lsf_step.py} | 0 .../launcher/step/{mpiStep.py => mpi_step.py} | 0 .../launcher/step/{pbsStep.py => pbs_step.py} | 0 .../launcher/step/{sgeStep.py => sge_step.py} | 0 .../step/{slurmStep.py => slurm_step.py} | 0 .../launcher/{stepInfo.py => step_info.py} | 0 .../{stepMapping.py => step_mapping.py} | 0 .../{taskManager.py => task_manager.py} | 0 .../{launcherUtil.py => launcher_util.py} | 0 smartsim/_core/schemas/__init__.py | 4 +- .../{dragonRequests.py => dragon_requests.py} | 0 ...dragonResponses.py => dragon_responses.py} | 0 .../{shellLauncher.py => shell_launcher.py} | 2 +- smartsim/_core/utils/telemetry/telemetry.py | 10 ++-- smartsim/_core/utils/telemetry/util.py | 2 +- smartsim/experiment.py | 8 +-- smartsim/settings/arguments/launch/alps.py | 4 +- smartsim/settings/arguments/launch/local.py | 4 +- smartsim/settings/arguments/launch/lsf.py | 4 +- smartsim/settings/arguments/launch/mpi.py | 4 +- smartsim/settings/arguments/launch/pals.py | 4 +- smartsim/settings/arguments/launch/slurm.py | 4 +- smartsim/wlm/pbs.py | 2 +- smartsim/wlm/slurm.py | 6 +- tests/_legacy/on_wlm/test_preview_wlm.py | 18 +++--- tests/_legacy/on_wlm/test_slurm_commands.py | 2 +- tests/_legacy/test_collectors.py | 2 +- tests/_legacy/test_controller_errors.py | 2 +- tests/_legacy/test_dragon_client.py | 6 +- tests/_legacy/test_dragon_launcher.py | 6 +- tests/_legacy/test_dragon_run_policy.py | 6 +- tests/_legacy/test_dragon_run_request.py | 4 +- .../_legacy/test_dragon_run_request_nowlm.py | 4 +- tests/_legacy/test_dragon_step.py | 6 +- tests/_legacy/test_lsf_parser.py | 16 +++--- tests/_legacy/test_pals_settings.py | 2 +- tests/_legacy/test_pbs_parser.py | 14 ++--- tests/_legacy/test_preview.py | 56 +++++++++---------- tests/_legacy/test_sge_batch_settings.py | 2 +- tests/_legacy/test_slurm_parser.py | 42 +++++++------- tests/_legacy/test_slurm_settings.py | 6 +- tests/_legacy/test_step_info.py | 2 +- tests/_legacy/test_telemetry_monitor.py | 8 +-- .../test_settings/test_alpsLauncher.py | 4 +- .../test_settings/test_dragonLauncher.py | 4 +- .../test_settings/test_localLauncher.py | 4 +- .../test_settings/test_mpiLauncher.py | 4 +- .../test_settings/test_palsLauncher.py | 4 +- .../test_settings/test_slurmLauncher.py | 4 +- tests/test_shell_launcher.py | 2 +- 77 files changed, 190 insertions(+), 190 deletions(-) rename smartsim/_core/control/{jobmanager.py => job_manager.py} (99%) rename smartsim/_core/control/{previewrenderer.py => preview_renderer.py} (98%) rename smartsim/_core/entrypoints/{telemetrymonitor.py => telemetry_monitor.py} (100%) rename smartsim/_core/launcher/lsf/{lsfCommands.py => lsf_commands.py} (100%) rename smartsim/_core/launcher/lsf/{lsfLauncher.py => lsf_launcher.py} (98%) rename smartsim/_core/launcher/lsf/{lsfParser.py => lsf_parser.py} (100%) rename smartsim/_core/launcher/pbs/{pbsCommands.py => pbs_commands.py} (100%) rename smartsim/_core/launcher/pbs/{pbsLauncher.py => pbs_launcher.py} (98%) rename smartsim/_core/launcher/pbs/{pbsParser.py => pbs_parser.py} (100%) rename smartsim/_core/launcher/sge/{sgeCommands.py => sge_commands.py} (100%) rename smartsim/_core/launcher/sge/{sgeLauncher.py => sge_launcher.py} (97%) rename smartsim/_core/launcher/sge/{sgeParser.py => sge_parser.py} (100%) rename smartsim/_core/launcher/slurm/{slurmCommands.py => slurm_commands.py} (100%) rename smartsim/_core/launcher/slurm/{slurmLauncher.py => slurm_launcher.py} (98%) rename smartsim/_core/launcher/slurm/{slurmParser.py => slurm_parser.py} (100%) rename smartsim/_core/launcher/step/{alpsStep.py => alps_step.py} (100%) rename smartsim/_core/launcher/step/{dragonStep.py => dragon_step.py} (99%) rename smartsim/_core/launcher/step/{localStep.py => local_step.py} (100%) rename smartsim/_core/launcher/step/{lsfStep.py => lsf_step.py} (100%) rename smartsim/_core/launcher/step/{mpiStep.py => mpi_step.py} (100%) rename smartsim/_core/launcher/step/{pbsStep.py => pbs_step.py} (100%) rename smartsim/_core/launcher/step/{sgeStep.py => sge_step.py} (100%) rename smartsim/_core/launcher/step/{slurmStep.py => slurm_step.py} (100%) rename smartsim/_core/launcher/{stepInfo.py => step_info.py} (100%) rename smartsim/_core/launcher/{stepMapping.py => step_mapping.py} (100%) rename smartsim/_core/launcher/{taskManager.py => task_manager.py} (100%) rename smartsim/_core/launcher/util/{launcherUtil.py => launcher_util.py} (100%) rename smartsim/_core/schemas/{dragonRequests.py => dragon_requests.py} (100%) rename smartsim/_core/schemas/{dragonResponses.py => dragon_responses.py} (100%) rename smartsim/_core/shell/{shellLauncher.py => shell_launcher.py} (99%) diff --git a/doc/tutorials/doc_examples/experiment_doc_examples/exp.py b/doc/tutorials/doc_examples/experiment_doc_examples/exp.py index b5374e7bd0..b4b4e01003 100644 --- a/doc/tutorials/doc_examples/experiment_doc_examples/exp.py +++ b/doc/tutorials/doc_examples/experiment_doc_examples/exp.py @@ -1,5 +1,5 @@ from smartsim import Experiment -from smartsim._core.control.previewrenderer import Verbosity +from smartsim._core.control.preview_renderer import Verbosity from smartsim.log import get_logger # Initialize an Experiment diff --git a/smartsim/_core/__init__.py b/smartsim/_core/__init__.py index 4900787704..958f8e2979 100644 --- a/smartsim/_core/__init__.py +++ b/smartsim/_core/__init__.py @@ -24,7 +24,7 @@ # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -from .control import Controller, Manifest, previewrenderer +from .control import Controller, Manifest, preview_renderer from .generation import Generator -__all__ = ["Controller", "Manifest", "Generator", "previewrenderer"] +__all__ = ["Controller", "Manifest", "Generator", "preview_renderer"] diff --git a/smartsim/_core/control/controller.py b/smartsim/_core/control/controller.py index 5c1a4da3e0..dd7e32b315 100644 --- a/smartsim/_core/control/controller.py +++ b/smartsim/_core/control/controller.py @@ -72,7 +72,7 @@ from ..utils import serialize from .controller_utils import _AnonymousBatchJob, _look_up_launched_data from .job import Job -from .jobmanager import JobManager +from .job_manager import JobManager from .manifest import LaunchedManifest, LaunchedManifestBuilder, Manifest if t.TYPE_CHECKING: diff --git a/smartsim/_core/control/jobmanager.py b/smartsim/_core/control/job_manager.py similarity index 99% rename from smartsim/_core/control/jobmanager.py rename to smartsim/_core/control/job_manager.py index 69bf015d1a..7fe3d558be 100644 --- a/smartsim/_core/control/jobmanager.py +++ b/smartsim/_core/control/job_manager.py @@ -32,7 +32,7 @@ from threading import RLock, Thread from types import FrameType -from ..._core.launcher.step import Step +from ..launcher.step import Step from ...database import FeatureStore from ...entity import EntitySequence, FSNode, SmartSimEntity from ...log import ContextThread, get_logger diff --git a/smartsim/_core/control/previewrenderer.py b/smartsim/_core/control/preview_renderer.py similarity index 98% rename from smartsim/_core/control/previewrenderer.py rename to smartsim/_core/control/preview_renderer.py index d3e4f6be2c..5d06a12a07 100644 --- a/smartsim/_core/control/previewrenderer.py +++ b/smartsim/_core/control/preview_renderer.py @@ -33,8 +33,8 @@ import jinja2.utils as u from jinja2 import pass_eval_context -from ..._core.config import CONFIG -from ..._core.control import Manifest +from ..config import CONFIG +from . import Manifest from ...error.errors import PreviewFormatError from ...log import get_logger from .job import Job diff --git a/smartsim/_core/entrypoints/telemetrymonitor.py b/smartsim/_core/entrypoints/telemetry_monitor.py similarity index 100% rename from smartsim/_core/entrypoints/telemetrymonitor.py rename to smartsim/_core/entrypoints/telemetry_monitor.py diff --git a/smartsim/_core/launcher/__init__.py b/smartsim/_core/launcher/__init__.py index 7300b35d63..3047aaed48 100644 --- a/smartsim/_core/launcher/__init__.py +++ b/smartsim/_core/launcher/__init__.py @@ -27,10 +27,10 @@ from .dragon.dragon_launcher import DragonLauncher from .launcher import Launcher from .local.local import LocalLauncher -from .lsf.lsfLauncher import LSFLauncher -from .pbs.pbsLauncher import PBSLauncher -from .sge.sgeLauncher import SGELauncher -from .slurm.slurmLauncher import SlurmLauncher +from .lsf.lsf_launcher import LSFLauncher +from .pbs.pbs_launcher import PBSLauncher +from .sge.sge_launcher import SGELauncher +from .slurm.slurm_launcher import SlurmLauncher __all__ = [ "Launcher", diff --git a/smartsim/_core/launcher/dragon/dragon_launcher.py b/smartsim/_core/launcher/dragon/dragon_launcher.py index 8926ce6547..552c2f1053 100644 --- a/smartsim/_core/launcher/dragon/dragon_launcher.py +++ b/smartsim/_core/launcher/dragon/dragon_launcher.py @@ -30,11 +30,11 @@ import pathlib import typing as t -from smartsim._core.schemas.dragonRequests import DragonRunPolicy +from smartsim._core.schemas.dragon_requests import DragonRunPolicy from smartsim.error import errors from smartsim.types import LaunchedJobID -from ..stepMapping import StepMap +from ..step_mapping import StepMap from ....error import LauncherError, SmartSimError from ....log import get_logger from ....settings import ( @@ -55,10 +55,10 @@ DragonUpdateStatusResponse, ) from ..launcher import WLMLauncher -from ..pbs.pbsLauncher import PBSLauncher -from ..slurm.slurmLauncher import SlurmLauncher +from ..pbs.pbs_launcher import PBSLauncher +from ..slurm.slurm_launcher import SlurmLauncher from ..step import DragonBatchStep, DragonStep, LocalStep, Step -from ..stepInfo import StepInfo +from ..step_info import StepInfo from .dragon_connector import DragonConnector, _SchemaT if t.TYPE_CHECKING: diff --git a/smartsim/_core/launcher/dragon/dragon_sockets.py b/smartsim/_core/launcher/dragon/dragon_sockets.py index 80acd61a2a..0ffe857e6d 100644 --- a/smartsim/_core/launcher/dragon/dragon_sockets.py +++ b/smartsim/_core/launcher/dragon/dragon_sockets.py @@ -30,8 +30,8 @@ import zmq.auth.thread from smartsim._core.config.config import get_config -from smartsim._core.schemas import dragonRequests as _dragonRequests -from smartsim._core.schemas import dragonResponses as _dragonResponses +from smartsim._core.schemas import dragon_requests as _dragonRequests +from smartsim._core.schemas import dragon_responses as _dragonResponses from smartsim._core.schemas import utils as _utils from smartsim._core.utils.security import KeyManager from smartsim.log import get_logger diff --git a/smartsim/_core/launcher/launcher.py b/smartsim/_core/launcher/launcher.py index bbc9b59d62..722c64904e 100644 --- a/smartsim/_core/launcher/launcher.py +++ b/smartsim/_core/launcher/launcher.py @@ -27,14 +27,14 @@ import abc import typing as t -from ..._core.launcher.stepMapping import StepMap +from .step_mapping import StepMap from ...entity import SmartSimEntity from ...error import AllocationError, LauncherError, SSUnsupportedError from ...settings import SettingsBase from .step import Step -from .stepInfo import StepInfo, UnmanagedStepInfo -from .stepMapping import StepMapping -from .taskManager import TaskManager +from .step_info import StepInfo, UnmanagedStepInfo +from .step_mapping import StepMapping +from .task_manager import TaskManager class Launcher(abc.ABC): # pragma: no cover diff --git a/smartsim/_core/launcher/local/local.py b/smartsim/_core/launcher/local/local.py index 2b3f479971..9a902f003d 100644 --- a/smartsim/_core/launcher/local/local.py +++ b/smartsim/_core/launcher/local/local.py @@ -30,9 +30,9 @@ from ....settings import RunSettings, SettingsBase from ..launcher import Launcher from ..step import LocalStep, Step -from ..stepInfo import StepInfo, UnmanagedStepInfo -from ..stepMapping import StepMapping -from ..taskManager import TaskManager +from ..step_info import StepInfo, UnmanagedStepInfo +from ..step_mapping import StepMapping +from ..task_manager import TaskManager class LocalLauncher(Launcher): diff --git a/smartsim/_core/launcher/lsf/lsfCommands.py b/smartsim/_core/launcher/lsf/lsf_commands.py similarity index 100% rename from smartsim/_core/launcher/lsf/lsfCommands.py rename to smartsim/_core/launcher/lsf/lsf_commands.py diff --git a/smartsim/_core/launcher/lsf/lsfLauncher.py b/smartsim/_core/launcher/lsf/lsf_launcher.py similarity index 98% rename from smartsim/_core/launcher/lsf/lsfLauncher.py rename to smartsim/_core/launcher/lsf/lsf_launcher.py index 387607f308..472d66b89b 100644 --- a/smartsim/_core/launcher/lsf/lsfLauncher.py +++ b/smartsim/_core/launcher/lsf/lsf_launcher.py @@ -50,9 +50,9 @@ OrterunStep, Step, ) -from ..stepInfo import LSFBatchStepInfo, LSFJsrunStepInfo, StepInfo -from .lsfCommands import bjobs, bkill, jskill, jslist -from .lsfParser import ( +from ..step_info import LSFBatchStepInfo, LSFJsrunStepInfo, StepInfo +from .lsf_commands import bjobs, bkill, jskill, jslist +from .lsf_parser import ( parse_bjobs_jobid, parse_bsub, parse_jslist_stepid, diff --git a/smartsim/_core/launcher/lsf/lsfParser.py b/smartsim/_core/launcher/lsf/lsf_parser.py similarity index 100% rename from smartsim/_core/launcher/lsf/lsfParser.py rename to smartsim/_core/launcher/lsf/lsf_parser.py diff --git a/smartsim/_core/launcher/pbs/pbsCommands.py b/smartsim/_core/launcher/pbs/pbs_commands.py similarity index 100% rename from smartsim/_core/launcher/pbs/pbsCommands.py rename to smartsim/_core/launcher/pbs/pbs_commands.py diff --git a/smartsim/_core/launcher/pbs/pbsLauncher.py b/smartsim/_core/launcher/pbs/pbs_launcher.py similarity index 98% rename from smartsim/_core/launcher/pbs/pbsLauncher.py rename to smartsim/_core/launcher/pbs/pbs_launcher.py index 2419144cf3..fe8a9538b9 100644 --- a/smartsim/_core/launcher/pbs/pbsLauncher.py +++ b/smartsim/_core/launcher/pbs/pbs_launcher.py @@ -51,9 +51,9 @@ QsubBatchStep, Step, ) -from ..stepInfo import PBSStepInfo, StepInfo -from .pbsCommands import qdel, qstat -from .pbsParser import ( +from ..step_info import PBSStepInfo, StepInfo +from .pbs_commands import qdel, qstat +from .pbs_parser import ( parse_qstat_jobid, parse_qstat_jobid_json, parse_step_id_from_qstat, diff --git a/smartsim/_core/launcher/pbs/pbsParser.py b/smartsim/_core/launcher/pbs/pbs_parser.py similarity index 100% rename from smartsim/_core/launcher/pbs/pbsParser.py rename to smartsim/_core/launcher/pbs/pbs_parser.py diff --git a/smartsim/_core/launcher/sge/sgeCommands.py b/smartsim/_core/launcher/sge/sge_commands.py similarity index 100% rename from smartsim/_core/launcher/sge/sgeCommands.py rename to smartsim/_core/launcher/sge/sge_commands.py diff --git a/smartsim/_core/launcher/sge/sgeLauncher.py b/smartsim/_core/launcher/sge/sge_launcher.py similarity index 97% rename from smartsim/_core/launcher/sge/sgeLauncher.py rename to smartsim/_core/launcher/sge/sge_launcher.py index fc848b9a2e..82c1f8fe94 100644 --- a/smartsim/_core/launcher/sge/sgeLauncher.py +++ b/smartsim/_core/launcher/sge/sge_launcher.py @@ -48,9 +48,9 @@ SgeQsubBatchStep, Step, ) -from ..stepInfo import SGEStepInfo, StepInfo -from .sgeCommands import qacct, qdel, qstat -from .sgeParser import parse_qacct_job_output, parse_qstat_jobid_xml +from ..step_info import SGEStepInfo, StepInfo +from .sge_commands import qacct, qdel, qstat +from .sge_parser import parse_qacct_job_output, parse_qstat_jobid_xml logger = get_logger(__name__) diff --git a/smartsim/_core/launcher/sge/sgeParser.py b/smartsim/_core/launcher/sge/sge_parser.py similarity index 100% rename from smartsim/_core/launcher/sge/sgeParser.py rename to smartsim/_core/launcher/sge/sge_parser.py diff --git a/smartsim/_core/launcher/slurm/slurmCommands.py b/smartsim/_core/launcher/slurm/slurm_commands.py similarity index 100% rename from smartsim/_core/launcher/slurm/slurmCommands.py rename to smartsim/_core/launcher/slurm/slurm_commands.py diff --git a/smartsim/_core/launcher/slurm/slurmLauncher.py b/smartsim/_core/launcher/slurm/slurm_launcher.py similarity index 98% rename from smartsim/_core/launcher/slurm/slurmLauncher.py rename to smartsim/_core/launcher/slurm/slurm_launcher.py index 660ba34840..038176d937 100644 --- a/smartsim/_core/launcher/slurm/slurmLauncher.py +++ b/smartsim/_core/launcher/slurm/slurm_launcher.py @@ -52,9 +52,9 @@ SrunStep, Step, ) -from ..stepInfo import SlurmStepInfo, StepInfo -from .slurmCommands import sacct, scancel, sstat -from .slurmParser import parse_sacct, parse_sstat_nodes, parse_step_id_from_sacct +from ..step_info import SlurmStepInfo, StepInfo +from .slurm_commands import sacct, scancel, sstat +from .slurm_parser import parse_sacct, parse_sstat_nodes, parse_step_id_from_sacct logger = get_logger(__name__) diff --git a/smartsim/_core/launcher/slurm/slurmParser.py b/smartsim/_core/launcher/slurm/slurm_parser.py similarity index 100% rename from smartsim/_core/launcher/slurm/slurmParser.py rename to smartsim/_core/launcher/slurm/slurm_parser.py diff --git a/smartsim/_core/launcher/step/__init__.py b/smartsim/_core/launcher/step/__init__.py index 8331a18bf8..b11e54a50d 100644 --- a/smartsim/_core/launcher/step/__init__.py +++ b/smartsim/_core/launcher/step/__init__.py @@ -24,12 +24,12 @@ # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -from .alpsStep import AprunStep -from .dragonStep import DragonBatchStep, DragonStep -from .localStep import LocalStep -from .lsfStep import BsubBatchStep, JsrunStep -from .mpiStep import MpiexecStep, MpirunStep, OrterunStep -from .pbsStep import QsubBatchStep -from .sgeStep import SgeQsubBatchStep -from .slurmStep import SbatchStep, SrunStep +from .alps_step import AprunStep +from .dragon_step import DragonBatchStep, DragonStep +from .local_step import LocalStep +from .lsf_step import BsubBatchStep, JsrunStep +from .mpi_step import MpiexecStep, MpirunStep, OrterunStep +from .pbs_step import QsubBatchStep +from .sge_step import SgeQsubBatchStep +from .slurm_step import SbatchStep, SrunStep from .step import Step diff --git a/smartsim/_core/launcher/step/alpsStep.py b/smartsim/_core/launcher/step/alps_step.py similarity index 100% rename from smartsim/_core/launcher/step/alpsStep.py rename to smartsim/_core/launcher/step/alps_step.py diff --git a/smartsim/_core/launcher/step/dragonStep.py b/smartsim/_core/launcher/step/dragon_step.py similarity index 99% rename from smartsim/_core/launcher/step/dragonStep.py rename to smartsim/_core/launcher/step/dragon_step.py index 2f4a80cd53..e90d892e76 100644 --- a/smartsim/_core/launcher/step/dragonStep.py +++ b/smartsim/_core/launcher/step/dragon_step.py @@ -30,7 +30,7 @@ import sys import typing as t -from ...._core.schemas.dragonRequests import ( +from ...schemas.dragon_requests import ( DragonRunPolicy, DragonRunRequest, request_registry, diff --git a/smartsim/_core/launcher/step/localStep.py b/smartsim/_core/launcher/step/local_step.py similarity index 100% rename from smartsim/_core/launcher/step/localStep.py rename to smartsim/_core/launcher/step/local_step.py diff --git a/smartsim/_core/launcher/step/lsfStep.py b/smartsim/_core/launcher/step/lsf_step.py similarity index 100% rename from smartsim/_core/launcher/step/lsfStep.py rename to smartsim/_core/launcher/step/lsf_step.py diff --git a/smartsim/_core/launcher/step/mpiStep.py b/smartsim/_core/launcher/step/mpi_step.py similarity index 100% rename from smartsim/_core/launcher/step/mpiStep.py rename to smartsim/_core/launcher/step/mpi_step.py diff --git a/smartsim/_core/launcher/step/pbsStep.py b/smartsim/_core/launcher/step/pbs_step.py similarity index 100% rename from smartsim/_core/launcher/step/pbsStep.py rename to smartsim/_core/launcher/step/pbs_step.py diff --git a/smartsim/_core/launcher/step/sgeStep.py b/smartsim/_core/launcher/step/sge_step.py similarity index 100% rename from smartsim/_core/launcher/step/sgeStep.py rename to smartsim/_core/launcher/step/sge_step.py diff --git a/smartsim/_core/launcher/step/slurmStep.py b/smartsim/_core/launcher/step/slurm_step.py similarity index 100% rename from smartsim/_core/launcher/step/slurmStep.py rename to smartsim/_core/launcher/step/slurm_step.py diff --git a/smartsim/_core/launcher/stepInfo.py b/smartsim/_core/launcher/step_info.py similarity index 100% rename from smartsim/_core/launcher/stepInfo.py rename to smartsim/_core/launcher/step_info.py diff --git a/smartsim/_core/launcher/stepMapping.py b/smartsim/_core/launcher/step_mapping.py similarity index 100% rename from smartsim/_core/launcher/stepMapping.py rename to smartsim/_core/launcher/step_mapping.py diff --git a/smartsim/_core/launcher/taskManager.py b/smartsim/_core/launcher/task_manager.py similarity index 100% rename from smartsim/_core/launcher/taskManager.py rename to smartsim/_core/launcher/task_manager.py diff --git a/smartsim/_core/launcher/util/launcherUtil.py b/smartsim/_core/launcher/util/launcher_util.py similarity index 100% rename from smartsim/_core/launcher/util/launcherUtil.py rename to smartsim/_core/launcher/util/launcher_util.py diff --git a/smartsim/_core/schemas/__init__.py b/smartsim/_core/schemas/__init__.py index d7ee9d83d8..54ae3947de 100644 --- a/smartsim/_core/schemas/__init__.py +++ b/smartsim/_core/schemas/__init__.py @@ -24,8 +24,8 @@ # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -from .dragonRequests import * -from .dragonResponses import * +from .dragon_requests import * +from .dragon_responses import * __all__ = [ "DragonRequest", diff --git a/smartsim/_core/schemas/dragonRequests.py b/smartsim/_core/schemas/dragon_requests.py similarity index 100% rename from smartsim/_core/schemas/dragonRequests.py rename to smartsim/_core/schemas/dragon_requests.py diff --git a/smartsim/_core/schemas/dragonResponses.py b/smartsim/_core/schemas/dragon_responses.py similarity index 100% rename from smartsim/_core/schemas/dragonResponses.py rename to smartsim/_core/schemas/dragon_responses.py diff --git a/smartsim/_core/shell/shellLauncher.py b/smartsim/_core/shell/shell_launcher.py similarity index 99% rename from smartsim/_core/shell/shellLauncher.py rename to smartsim/_core/shell/shell_launcher.py index a247866989..9f88d0545c 100644 --- a/smartsim/_core/shell/shellLauncher.py +++ b/smartsim/_core/shell/shell_launcher.py @@ -40,7 +40,7 @@ from smartsim._core.utils.launcher import create_job_id from smartsim.error import errors from smartsim.log import get_logger -from smartsim.settings.arguments.launchArguments import LaunchArguments +from smartsim.settings.arguments.launch_arguments import LaunchArguments from smartsim.status import JobStatus from smartsim.types import LaunchedJobID diff --git a/smartsim/_core/utils/telemetry/telemetry.py b/smartsim/_core/utils/telemetry/telemetry.py index 381abb4936..98aa8ab15b 100644 --- a/smartsim/_core/utils/telemetry/telemetry.py +++ b/smartsim/_core/utils/telemetry/telemetry.py @@ -41,14 +41,14 @@ from smartsim._core.config import CONFIG from smartsim._core.control.job import JobEntity, _JobKey -from smartsim._core.control.jobmanager import JobManager +from smartsim._core.control.job_manager import JobManager from smartsim._core.launcher.dragon.dragon_launcher import DragonLauncher from smartsim._core.launcher.launcher import Launcher from smartsim._core.launcher.local.local import LocalLauncher -from smartsim._core.launcher.lsf.lsfLauncher import LSFLauncher -from smartsim._core.launcher.pbs.pbsLauncher import PBSLauncher -from smartsim._core.launcher.slurm.slurmLauncher import SlurmLauncher -from smartsim._core.launcher.stepInfo import StepInfo +from smartsim._core.launcher.lsf.lsf_launcher import LSFLauncher +from smartsim._core.launcher.pbs.pbs_launcher import PBSLauncher +from smartsim._core.launcher.slurm.slurm_launcher import SlurmLauncher +from smartsim._core.launcher.step_info import StepInfo from smartsim._core.utils.helpers import get_ts_ms from smartsim._core.utils.serialize import MANIFEST_FILENAME from smartsim._core.utils.telemetry.collector import CollectorManager diff --git a/smartsim/_core/utils/telemetry/util.py b/smartsim/_core/utils/telemetry/util.py index e46e7855be..5a1c94d5cb 100644 --- a/smartsim/_core/utils/telemetry/util.py +++ b/smartsim/_core/utils/telemetry/util.py @@ -30,7 +30,7 @@ import pathlib import typing as t -from smartsim._core.launcher.stepInfo import StepInfo +from smartsim._core.launcher.step_info import StepInfo from smartsim.status import TERMINAL_STATUSES, JobStatus _EventClass = t.Literal["start", "stop", "timestep"] diff --git a/smartsim/experiment.py b/smartsim/experiment.py index 24709ccfd0..fef0464758 100644 --- a/smartsim/experiment.py +++ b/smartsim/experiment.py @@ -43,7 +43,7 @@ from smartsim.error import errors from smartsim.status import TERMINAL_STATUSES, InvalidJobStatus, JobStatus -from ._core import Generator, Manifest, previewrenderer +from ._core import Generator, Manifest, preview_renderer from .entity import TelemetryConfiguration from .error import SmartSimError from .log import ctx_exp_path, get_logger, method_contextualizer @@ -354,8 +354,8 @@ def _generate( def preview( self, *args: t.Any, - verbosity_level: previewrenderer.Verbosity = previewrenderer.Verbosity.INFO, - output_format: previewrenderer.Format = previewrenderer.Format.PLAINTEXT, + verbosity_level: preview_renderer.Verbosity = preview_renderer.Verbosity.INFO, + output_format: preview_renderer.Format = preview_renderer.Format.PLAINTEXT, output_filename: t.Optional[str] = None, ) -> None: """Preview entity information prior to launch. This method @@ -382,7 +382,7 @@ def preview( preview_manifest = Manifest(*args) - previewrenderer.render( + preview_renderer.render( self, preview_manifest, verbosity_level, diff --git a/smartsim/settings/arguments/launch/alps.py b/smartsim/settings/arguments/launch/alps.py index 89a108a28f..356a443d65 100644 --- a/smartsim/settings/arguments/launch/alps.py +++ b/smartsim/settings/arguments/launch/alps.py @@ -30,11 +30,11 @@ from smartsim._core.arguments.shell import ShellLaunchArguments from smartsim._core.dispatch import dispatch -from smartsim._core.shell.shellLauncher import ShellLauncher, make_shell_format_fn +from smartsim._core.shell.shell_launcher import ShellLauncher, make_shell_format_fn from smartsim.log import get_logger from ...common import set_check_input -from ...launchCommand import LauncherType +from ...launch_command import LauncherType logger = get_logger(__name__) _as_aprun_command = make_shell_format_fn(run_command="aprun") diff --git a/smartsim/settings/arguments/launch/local.py b/smartsim/settings/arguments/launch/local.py index 1fb664790c..2c589cb48d 100644 --- a/smartsim/settings/arguments/launch/local.py +++ b/smartsim/settings/arguments/launch/local.py @@ -30,11 +30,11 @@ from smartsim._core.arguments.shell import ShellLaunchArguments from smartsim._core.dispatch import dispatch -from smartsim._core.shell.shellLauncher import ShellLauncher, make_shell_format_fn +from smartsim._core.shell.shell_launcher import ShellLauncher, make_shell_format_fn from smartsim.log import get_logger from ...common import StringArgument, set_check_input -from ...launchCommand import LauncherType +from ...launch_command import LauncherType logger = get_logger(__name__) _as_local_command = make_shell_format_fn(run_command=None) diff --git a/smartsim/settings/arguments/launch/lsf.py b/smartsim/settings/arguments/launch/lsf.py index 34d0f007ea..ed24271985 100644 --- a/smartsim/settings/arguments/launch/lsf.py +++ b/smartsim/settings/arguments/launch/lsf.py @@ -32,11 +32,11 @@ from smartsim._core.arguments.shell import ShellLaunchArguments from smartsim._core.dispatch import EnvironMappingType, dispatch -from smartsim._core.shell.shellLauncher import ShellLauncher, ShellLauncherCommand +from smartsim._core.shell.shell_launcher import ShellLauncher, ShellLauncherCommand from smartsim.log import get_logger from ...common import set_check_input -from ...launchCommand import LauncherType +from ...launch_command import LauncherType logger = get_logger(__name__) diff --git a/smartsim/settings/arguments/launch/mpi.py b/smartsim/settings/arguments/launch/mpi.py index 54cb7e2fd2..ce8c43aa5c 100644 --- a/smartsim/settings/arguments/launch/mpi.py +++ b/smartsim/settings/arguments/launch/mpi.py @@ -30,11 +30,11 @@ from smartsim._core.arguments.shell import ShellLaunchArguments from smartsim._core.dispatch import dispatch -from smartsim._core.shell.shellLauncher import ShellLauncher, make_shell_format_fn +from smartsim._core.shell.shell_launcher import ShellLauncher, make_shell_format_fn from smartsim.log import get_logger from ...common import set_check_input -from ...launchCommand import LauncherType +from ...launch_command import LauncherType logger = get_logger(__name__) _as_mpirun_command = make_shell_format_fn("mpirun") diff --git a/smartsim/settings/arguments/launch/pals.py b/smartsim/settings/arguments/launch/pals.py index 915ae86223..d48dc799b9 100644 --- a/smartsim/settings/arguments/launch/pals.py +++ b/smartsim/settings/arguments/launch/pals.py @@ -30,11 +30,11 @@ from smartsim._core.arguments.shell import ShellLaunchArguments from smartsim._core.dispatch import dispatch -from smartsim._core.shell.shellLauncher import ShellLauncher, make_shell_format_fn +from smartsim._core.shell.shell_launcher import ShellLauncher, make_shell_format_fn from smartsim.log import get_logger from ...common import set_check_input -from ...launchCommand import LauncherType +from ...launch_command import LauncherType logger = get_logger(__name__) _as_pals_command = make_shell_format_fn(run_command="mpiexec") diff --git a/smartsim/settings/arguments/launch/slurm.py b/smartsim/settings/arguments/launch/slurm.py index 6eff9c8124..c5dceff628 100644 --- a/smartsim/settings/arguments/launch/slurm.py +++ b/smartsim/settings/arguments/launch/slurm.py @@ -34,11 +34,11 @@ from smartsim._core.arguments.shell import ShellLaunchArguments from smartsim._core.dispatch import EnvironMappingType, dispatch -from smartsim._core.shell.shellLauncher import ShellLauncher, ShellLauncherCommand +from smartsim._core.shell.shell_launcher import ShellLauncher, ShellLauncherCommand from smartsim.log import get_logger from ...common import set_check_input -from ...launchCommand import LauncherType +from ...launch_command import LauncherType logger = get_logger(__name__) diff --git a/smartsim/wlm/pbs.py b/smartsim/wlm/pbs.py index 5b559c1e6b..62f5a69a08 100644 --- a/smartsim/wlm/pbs.py +++ b/smartsim/wlm/pbs.py @@ -31,7 +31,7 @@ from smartsim.error.errors import LauncherError, SmartSimError -from .._core.launcher.pbs.pbsCommands import qstat +from .._core.launcher.pbs.pbs_commands import qstat def get_hosts() -> t.List[str]: diff --git a/smartsim/wlm/slurm.py b/smartsim/wlm/slurm.py index 58893d2ba2..e1b24b906d 100644 --- a/smartsim/wlm/slurm.py +++ b/smartsim/wlm/slurm.py @@ -29,9 +29,9 @@ import typing as t from shutil import which -from .._core.launcher.slurm.slurmCommands import salloc, scancel, scontrol, sinfo -from .._core.launcher.slurm.slurmParser import parse_salloc, parse_salloc_error -from .._core.launcher.util.launcherUtil import ComputeNode, Partition +from .._core.launcher.slurm.slurm_commands import salloc, scancel, scontrol, sinfo +from .._core.launcher.slurm.slurm_parser import parse_salloc, parse_salloc_error +from .._core.launcher.util.launcher_util import ComputeNode, Partition from ..error import ( AllocationError, LauncherError, diff --git a/tests/_legacy/on_wlm/test_preview_wlm.py b/tests/_legacy/on_wlm/test_preview_wlm.py index bea8653599..66705669e7 100644 --- a/tests/_legacy/on_wlm/test_preview_wlm.py +++ b/tests/_legacy/on_wlm/test_preview_wlm.py @@ -31,7 +31,7 @@ from jinja2.filters import FILTERS from smartsim import Experiment -from smartsim._core import Manifest, previewrenderer +from smartsim._core import Manifest, preview_renderer from smartsim._core.config import CONFIG from smartsim.database import FeatureStore from smartsim.settings import QsubBatchSettings, RunSettings @@ -102,7 +102,7 @@ def test_preview_wlm_run_commands_cluster_feature_store_model( preview_manifest = Manifest(feature_store, smartsim_model) # Execute preview method - output = previewrenderer.render(exp, preview_manifest, verbosity_level="debug") + output = preview_renderer.render(exp, preview_manifest, verbosity_level="debug") # Evaluate output if pytest.test_launcher != "dragon": @@ -132,7 +132,7 @@ def test_preview_model_on_wlm(fileutils, test_dir, wlmutils): preview_manifest = Manifest(M1, M2) # Execute preview method - output = previewrenderer.render(exp, preview_manifest, verbosity_level="debug") + output = preview_renderer.render(exp, preview_manifest, verbosity_level="debug") if pytest.test_launcher != "dragon": assert "Run Command" in output @@ -166,7 +166,7 @@ def test_preview_batch_model(fileutils, test_dir, wlmutils): preview_manifest = Manifest(model) # Execute preview method - output = previewrenderer.render(exp, preview_manifest, verbosity_level="debug") + output = preview_renderer.render(exp, preview_manifest, verbosity_level="debug") assert "Batch Launch: True" in output assert "Batch Command" in output @@ -202,7 +202,7 @@ def test_preview_batch_ensemble(fileutils, test_dir, wlmutils): preview_manifest = Manifest(ensemble) # Execute preview method - output = previewrenderer.render(exp, preview_manifest, verbosity_level="debug") + output = preview_renderer.render(exp, preview_manifest, verbosity_level="debug") assert "Batch Launch: True" in output assert "Batch Command" in output @@ -261,7 +261,7 @@ def test_preview_launch_command(test_dir, wlmutils, choose_host): ) # Execute preview method - output = previewrenderer.render(exp, preview_manifest, verbosity_level="debug") + output = preview_renderer.render(exp, preview_manifest, verbosity_level="debug") assert "feature store" in output assert "echo-spam" in output @@ -307,7 +307,7 @@ def test_preview_batch_launch_command(fileutils, test_dir, wlmutils): preview_manifest = Manifest(feature_store, model) # Execute preview method - output = previewrenderer.render(exp, preview_manifest, verbosity_level="debug") + output = preview_renderer.render(exp, preview_manifest, verbosity_level="debug") # Evaluate output assert "Batch Launch: True" in output @@ -354,7 +354,7 @@ def test_ensemble_batch(test_dir, wlmutils): preview_manifest = Manifest(fs, ml_model, ensemble) # Call preview renderer for testing output - output = previewrenderer.render(exp, preview_manifest, verbosity_level="debug") + output = preview_renderer.render(exp, preview_manifest, verbosity_level="debug") # Evaluate output assert "Client Configuration" in output @@ -405,7 +405,7 @@ def test_preview_ensemble_fs_script(wlmutils, test_dir): preview_manifest = Manifest(ensemble, feature_store, feature_store_2) # Call preview renderer for testing output - output = previewrenderer.render(exp, preview_manifest, verbosity_level="debug") + output = preview_renderer.render(exp, preview_manifest, verbosity_level="debug") # Evaluate output assert "Torch Script" in output diff --git a/tests/_legacy/on_wlm/test_slurm_commands.py b/tests/_legacy/on_wlm/test_slurm_commands.py index 8411be6e0a..b44d309650 100644 --- a/tests/_legacy/on_wlm/test_slurm_commands.py +++ b/tests/_legacy/on_wlm/test_slurm_commands.py @@ -25,7 +25,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import pytest -from smartsim._core.launcher.slurm.slurmCommands import * +from smartsim._core.launcher.slurm.slurm_commands import * from smartsim.error.errors import LauncherError # retrieved from pytest fixtures diff --git a/tests/_legacy/test_collectors.py b/tests/_legacy/test_collectors.py index fdc8f67804..a474632c2b 100644 --- a/tests/_legacy/test_collectors.py +++ b/tests/_legacy/test_collectors.py @@ -29,7 +29,7 @@ import pytest -import smartsim._core.entrypoints.telemetrymonitor +import smartsim._core.entrypoints.telemetry_monitor import smartsim._core.utils.telemetry.collector from conftest import MockCollectorEntityFunc, MockSink from smartsim._core.utils.telemetry.collector import ( diff --git a/tests/_legacy/test_controller_errors.py b/tests/_legacy/test_controller_errors.py index 60b757f0bb..4814ce4950 100644 --- a/tests/_legacy/test_controller_errors.py +++ b/tests/_legacy/test_controller_errors.py @@ -29,7 +29,7 @@ from smartsim._core.control import Controller, Manifest from smartsim._core.launcher.step import Step -from smartsim._core.launcher.step.dragonStep import DragonStep +from smartsim._core.launcher.step.dragon_step import DragonStep from smartsim.database import FeatureStore from smartsim.entity import Application from smartsim.entity.ensemble import Ensemble diff --git a/tests/_legacy/test_dragon_client.py b/tests/_legacy/test_dragon_client.py index 80257b6107..054f6f0d12 100644 --- a/tests/_legacy/test_dragon_client.py +++ b/tests/_legacy/test_dragon_client.py @@ -30,7 +30,7 @@ import pytest -from smartsim._core.launcher.step.dragonStep import DragonBatchStep, DragonStep +from smartsim._core.launcher.step.dragon_step import DragonBatchStep, DragonStep from smartsim.settings import DragonRunSettings from smartsim.settings.slurmSettings import SbatchSettings @@ -39,8 +39,8 @@ import smartsim._core.entrypoints.dragon_client as dragon_client -from smartsim._core.schemas.dragonRequests import * -from smartsim._core.schemas.dragonResponses import * +from smartsim._core.schemas.dragon_requests import * +from smartsim._core.schemas.dragon_responses import * @pytest.fixture diff --git a/tests/_legacy/test_dragon_launcher.py b/tests/_legacy/test_dragon_launcher.py index a2266964f8..77f094b7d7 100644 --- a/tests/_legacy/test_dragon_launcher.py +++ b/tests/_legacy/test_dragon_launcher.py @@ -47,9 +47,9 @@ get_authenticator, get_secure_socket, ) -from smartsim._core.launcher.step.dragonStep import DragonBatchStep, DragonStep -from smartsim._core.schemas.dragonRequests import DragonBootstrapRequest -from smartsim._core.schemas.dragonResponses import ( +from smartsim._core.launcher.step.dragon_step import DragonBatchStep, DragonStep +from smartsim._core.schemas.dragon_requests import DragonBootstrapRequest +from smartsim._core.schemas.dragon_responses import ( DragonHandshakeResponse, DragonRunResponse, ) diff --git a/tests/_legacy/test_dragon_run_policy.py b/tests/_legacy/test_dragon_run_policy.py index 16b1c468bd..5da84bf305 100644 --- a/tests/_legacy/test_dragon_run_policy.py +++ b/tests/_legacy/test_dragon_run_policy.py @@ -28,7 +28,7 @@ import pytest -from smartsim._core.launcher.step.dragonStep import DragonBatchStep, DragonStep +from smartsim._core.launcher.step.dragon_step import DragonBatchStep, DragonStep from smartsim.settings.dragonRunSettings import DragonRunSettings from smartsim.settings.slurmSettings import SbatchSettings @@ -45,8 +45,8 @@ # The tests in this file belong to the group_b group pytestmark = pytest.mark.group_b -from smartsim._core.schemas.dragonRequests import * -from smartsim._core.schemas.dragonResponses import * +from smartsim._core.schemas.dragon_requests import * +from smartsim._core.schemas.dragon_responses import * @pytest.fixture diff --git a/tests/_legacy/test_dragon_run_request.py b/tests/_legacy/test_dragon_run_request.py index dade022dad..f5fdc73a06 100644 --- a/tests/_legacy/test_dragon_run_request.py +++ b/tests/_legacy/test_dragon_run_request.py @@ -44,8 +44,8 @@ dragon_loaded = False from smartsim._core.config import CONFIG -from smartsim._core.schemas.dragonRequests import * -from smartsim._core.schemas.dragonResponses import * +from smartsim._core.schemas.dragon_requests import * +from smartsim._core.schemas.dragon_responses import * from smartsim._core.utils.helpers import create_short_id_str from smartsim.status import TERMINAL_STATUSES, InvalidJobStatus, JobStatus diff --git a/tests/_legacy/test_dragon_run_request_nowlm.py b/tests/_legacy/test_dragon_run_request_nowlm.py index afd25aa9d7..2b5526c69e 100644 --- a/tests/_legacy/test_dragon_run_request_nowlm.py +++ b/tests/_legacy/test_dragon_run_request_nowlm.py @@ -30,8 +30,8 @@ # The tests in this file belong to the group_a group pytestmark = pytest.mark.group_a -from smartsim._core.schemas.dragonRequests import * -from smartsim._core.schemas.dragonResponses import * +from smartsim._core.schemas.dragon_requests import * +from smartsim._core.schemas.dragon_responses import * def test_run_request_with_null_policy(monkeypatch: pytest.MonkeyPatch) -> None: diff --git a/tests/_legacy/test_dragon_step.py b/tests/_legacy/test_dragon_step.py index 19f408e0bd..17279a33c6 100644 --- a/tests/_legacy/test_dragon_step.py +++ b/tests/_legacy/test_dragon_step.py @@ -32,7 +32,7 @@ import pytest -from smartsim._core.launcher.step.dragonStep import DragonBatchStep, DragonStep +from smartsim._core.launcher.step.dragon_step import DragonBatchStep, DragonStep from smartsim.settings import DragonRunSettings from smartsim.settings.pbsSettings import QsubBatchSettings from smartsim.settings.slurmSettings import SbatchSettings @@ -41,8 +41,8 @@ pytestmark = pytest.mark.group_a -from smartsim._core.schemas.dragonRequests import * -from smartsim._core.schemas.dragonResponses import * +from smartsim._core.schemas.dragon_requests import * +from smartsim._core.schemas.dragon_responses import * @pytest.fixture diff --git a/tests/_legacy/test_lsf_parser.py b/tests/_legacy/test_lsf_parser.py index abd27eb5ae..0234ee4e90 100644 --- a/tests/_legacy/test_lsf_parser.py +++ b/tests/_legacy/test_lsf_parser.py @@ -26,7 +26,7 @@ import pytest -from smartsim._core.launcher.lsf import lsfParser +from smartsim._core.launcher.lsf import lsf_parser # The tests in this file belong to the group_b group pytestmark = pytest.mark.group_b @@ -37,7 +37,7 @@ def test_parse_bsub(): output = "Job <12345> is submitted to queue ." - step_id = lsfParser.parse_bsub(output) + step_id = lsf_parser.parse_bsub(output) assert step_id == "12345" @@ -57,15 +57,15 @@ def test_parse_bsub_error(): "Not a member of the specified project: . You are currently a member of the following projects:\n" "ABC123" ) - parsed_error = lsfParser.parse_bsub_error(output) + parsed_error = lsf_parser.parse_bsub_error(output) assert error == parsed_error output = "NOT A PARSABLE ERROR\nBUT STILL AN ERROR MESSAGE" - parsed_error = lsfParser.parse_bsub_error(output) + parsed_error = lsf_parser.parse_bsub_error(output) assert output == parsed_error output = " \n" - parsed_error = lsfParser.parse_bsub_error(output) + parsed_error = lsf_parser.parse_bsub_error(output) assert parsed_error == "LSF run error" @@ -79,7 +79,7 @@ def test_parse_bsub_nodes(fileutils): "1234567 smartsim RUN batch login1 batch3:a01n02:a01n02:a01n02:a01n02:a01n02:a01n06:a01n06:a01n06:a01n06:a01n06 SmartSim Jul 24 12:53\n" ) nodes = ["batch3", "a01n02", "a01n06"] - parsed_nodes = lsfParser.parse_bjobs_nodes(output) + parsed_nodes = lsf_parser.parse_bjobs_nodes(output) assert nodes == parsed_nodes @@ -98,7 +98,7 @@ def test_parse_max_step_id(): " 4 0 1 various various 137 Killed\n" " 5 0 3 various various 137 Killed\n" ) - parsed_id = lsfParser.parse_max_step_id_from_jslist(output) + parsed_id = lsf_parser.parse_max_step_id_from_jslist(output) assert parsed_id == "9" @@ -121,6 +121,6 @@ def test_parse_jslist(): " 1 1 4 various various 0 Running\n" " 11 1 1 1 1 1 Running\n" ) - parsed_result = lsfParser.parse_jslist_stepid(output, "1") + parsed_result = lsf_parser.parse_jslist_stepid(output, "1") result = ("Running", "0") assert parsed_result == result diff --git a/tests/_legacy/test_pals_settings.py b/tests/_legacy/test_pals_settings.py index 8bc23d14d0..4fcf7cae34 100644 --- a/tests/_legacy/test_pals_settings.py +++ b/tests/_legacy/test_pals_settings.py @@ -33,7 +33,7 @@ import smartsim._core.config.config from smartsim._core.launcher import PBSLauncher -from smartsim._core.launcher.step.mpiStep import MpiexecStep +from smartsim._core.launcher.step.mpi_step import MpiexecStep from smartsim.error import SSUnsupportedError from smartsim.settings import PalsMpiexecSettings diff --git a/tests/_legacy/test_pbs_parser.py b/tests/_legacy/test_pbs_parser.py index ae01ffb19b..b5b7081751 100644 --- a/tests/_legacy/test_pbs_parser.py +++ b/tests/_legacy/test_pbs_parser.py @@ -28,7 +28,7 @@ import pytest -from smartsim._core.launcher.pbs import pbsParser +from smartsim._core.launcher.pbs import pbs_parser # The tests in this file belong to the group_b group pytestmark = pytest.mark.group_b @@ -39,14 +39,14 @@ def test_parse_qsub(): output = "12345.sdb" - step_id = pbsParser.parse_qsub(output) + step_id = pbs_parser.parse_qsub(output) assert step_id == "12345.sdb" def test_parse_qsub_error(): output = "qsub: Unknown queue" error = "Unknown queue" - parsed_error = pbsParser.parse_qsub_error(output) + parsed_error = pbs_parser.parse_qsub_error(output) assert error == parsed_error @@ -58,7 +58,7 @@ def test_parse_qstat_nodes(fileutils): file_path = fileutils.get_test_conf_path("qstat.json") output = Path(file_path).read_text() nodes = ["server_1", "server_2"] - parsed_nodes = pbsParser.parse_qstat_nodes(output) + parsed_nodes = pbs_parser.parse_qstat_nodes(output) assert nodes == parsed_nodes @@ -70,7 +70,7 @@ def test_parse_qstat_status(): "1289903.sdb jobname username 00:00:00 R queue\n" ) status = "R" - parsed_status = pbsParser.parse_qstat_jobid(output, "1289903.sdb") + parsed_status = pbs_parser.parse_qstat_jobid(output, "1289903.sdb") assert status == parsed_status @@ -80,7 +80,7 @@ def test_parse_qstat_status_not_found(): "---------------- ---------------- ---------------- -------- - -----\n" "1289903.sdb jobname username 00:00:00 R queue\n" ) - parsed_status = pbsParser.parse_qstat_jobid(output, "9999999.sdb") + parsed_status = pbs_parser.parse_qstat_jobid(output, "9999999.sdb") assert parsed_status is None @@ -90,5 +90,5 @@ def test_parse_qstat_status_json(fileutils): file_path = fileutils.get_test_conf_path("qstat.json") output = Path(file_path).read_text() status = "R" - parsed_status = pbsParser.parse_qstat_jobid_json(output, "16705.sdb") + parsed_status = pbs_parser.parse_qstat_jobid_json(output, "16705.sdb") assert status == parsed_status diff --git a/tests/_legacy/test_preview.py b/tests/_legacy/test_preview.py index 9ce46c315c..82d443fb3e 100644 --- a/tests/_legacy/test_preview.py +++ b/tests/_legacy/test_preview.py @@ -36,7 +36,7 @@ import smartsim import smartsim._core._cli.utils as _utils from smartsim import Experiment -from smartsim._core import Manifest, previewrenderer +from smartsim._core import Manifest, preview_renderer from smartsim._core.config import CONFIG from smartsim._core.control.controller import Controller from smartsim._core.control.job import Job @@ -130,7 +130,7 @@ def test_get_ifname_filter(): loader = jinja2.DictLoader(template_dict) env = jinja2.Environment(loader=loader, autoescape=True) - env.filters["get_ifname"] = previewrenderer.get_ifname + env.filters["get_ifname"] = preview_renderer.get_ifname t = env.get_template("ts") @@ -147,7 +147,7 @@ def test_get_fstype_filter(): template_dict = {"ts": template_str} loader = jinja2.DictLoader(template_dict) env = jinja2.Environment(loader=loader, autoescape=True) - env.filters["get_fstype"] = previewrenderer.get_fstype + env.filters["get_fstype"] = preview_renderer.get_fstype t = env.get_template("ts") output = t.render(config=CONFIG.database_cli) @@ -183,7 +183,7 @@ def test_experiment_preview(test_dir, wlmutils): exp = Experiment(exp_name, exp_path=test_dir, launcher=test_launcher) # Execute method for template rendering - output = previewrenderer.render(exp, verbosity_level="debug") + output = preview_renderer.render(exp, verbosity_level="debug") # Evaluate output summary_lines = output.split("\n") @@ -203,7 +203,7 @@ def test_experiment_preview_properties(test_dir, wlmutils): exp = Experiment(exp_name, exp_path=test_dir, launcher=test_launcher) # Execute method for template rendering - output = previewrenderer.render(exp, verbosity_level="debug") + output = preview_renderer.render(exp, verbosity_level="debug") # Evaluate output summary_lines = output.split("\n") @@ -232,7 +232,7 @@ def test_feature_store_preview_render(test_dir, wlmutils, choose_host): preview_manifest = Manifest(feature_store) # Execute method for template rendering - output = previewrenderer.render(exp, preview_manifest, verbosity_level="debug") + output = preview_renderer.render(exp, preview_manifest, verbosity_level="debug") # Evaluate output assert "Feature Store Identifier" in output @@ -268,7 +268,7 @@ def test_preview_to_file(test_dir, wlmutils): path = pathlib.Path(test_dir) / filename # Execute preview method exp.preview( - output_format=previewrenderer.Format.PLAINTEXT, + output_format=preview_renderer.Format.PLAINTEXT, output_filename=str(path), verbosity_level="debug", ) @@ -299,7 +299,7 @@ def test_model_preview(test_dir, wlmutils): preview_manifest = Manifest(hello_world_model, spam_eggs_model) # Execute preview method - rendered_preview = previewrenderer.render( + rendered_preview = preview_renderer.render( exp, preview_manifest, verbosity_level="debug" ) @@ -341,7 +341,7 @@ def test_model_preview_properties(test_dir, wlmutils): preview_manifest = Manifest(hello_world_model, spam_eggs_model) # Execute preview method - rendered_preview = previewrenderer.render( + rendered_preview = preview_renderer.render( exp, preview_manifest, verbosity_level="debug" ) @@ -400,7 +400,7 @@ def test_preview_model_tagged_files(fileutils, test_dir, wlmutils): preview_manifest = Manifest(hello_world_model) # Execute preview method - rendered_preview = previewrenderer.render( + rendered_preview = preview_renderer.render( exp, preview_manifest, verbosity_level="debug" ) @@ -431,7 +431,7 @@ def test_model_key_prefixing(test_dir, wlmutils): preview_manifest = Manifest(fs, model) # Execute preview method - output = previewrenderer.render(exp, preview_manifest, verbosity_level="debug") + output = preview_renderer.render(exp, preview_manifest, verbosity_level="debug") # Evaluate output assert "Key Prefix" in output @@ -469,7 +469,7 @@ def test_ensembles_preview(test_dir, wlmutils): ) preview_manifest = Manifest(ensemble) - output = previewrenderer.render(exp, preview_manifest, verbosity_level="debug") + output = preview_renderer.render(exp, preview_manifest, verbosity_level="debug") # Evaluate output assert "Ensemble Name" in output @@ -500,7 +500,7 @@ def test_preview_models_and_ensembles(test_dir, wlmutils): exp.generate(hello_world_model, spam_eggs_model, hello_ensemble) preview_manifest = Manifest(hello_world_model, spam_eggs_model, hello_ensemble) - output = previewrenderer.render(exp, preview_manifest, verbosity_level="debug") + output = preview_renderer.render(exp, preview_manifest, verbosity_level="debug") # Evaluate output assert "Models" in output @@ -541,7 +541,7 @@ def test_ensemble_preview_client_configuration(test_dir, wlmutils): preview_manifest = Manifest(fs, ml_model, ensemble) # Call preview renderer for testing output - output = previewrenderer.render(exp, preview_manifest, verbosity_level="debug") + output = preview_renderer.render(exp, preview_manifest, verbosity_level="debug") # Evaluate output assert "Client Configuration" in output @@ -584,7 +584,7 @@ def test_ensemble_preview_client_configuration_multifs(test_dir, wlmutils): preview_manifest = Manifest(fs1, fs2, ml_model, ensemble) # Call preview renderer for testing output - output = previewrenderer.render(exp, preview_manifest, verbosity_level="debug") + output = preview_renderer.render(exp, preview_manifest, verbosity_level="debug") # Evaluate output assert "Client Configuration" in output @@ -630,7 +630,7 @@ def test_ensemble_preview_attached_files(fileutils, test_dir, wlmutils): preview_manifest = Manifest(ensemble) # Call preview renderer for testing output - output = previewrenderer.render(exp, preview_manifest, verbosity_level="debug") + output = preview_renderer.render(exp, preview_manifest, verbosity_level="debug") # Evaluate output assert "Tagged Files for Model Configuration" in output @@ -745,7 +745,7 @@ def test_preview_colocated_fs_model_ensemble(fileutils, test_dir, wlmutils, mlut preview_manifest = Manifest(colo_ensemble) # Execute preview method - output = previewrenderer.render(exp, preview_manifest, verbosity_level="debug") + output = preview_renderer.render(exp, preview_manifest, verbosity_level="debug") # Evaluate output assert "Models" in output @@ -859,7 +859,7 @@ def test_preview_colocated_fs_script_ensemble(fileutils, test_dir, wlmutils, mlu preview_manifest = Manifest(colo_ensemble) # Execute preview method - output = previewrenderer.render(exp, preview_manifest, verbosity_level="debug") + output = preview_renderer.render(exp, preview_manifest, verbosity_level="debug") # Evaluate output assert "Torch Scripts" in output @@ -882,7 +882,7 @@ def test_preview_active_infrastructure(wlmutils, test_dir, preview_object): exp = Experiment(exp_name, exp_path=test_dir, launcher=test_launcher) # Execute method for template rendering - output = previewrenderer.render( + output = preview_renderer.render( exp, active_fsjobs=preview_object, verbosity_level="debug" ) @@ -925,7 +925,7 @@ def test_preview_orch_active_infrastructure( preview_manifest = Manifest(feature_store2, feature_store3) # Execute method for template rendering - output = previewrenderer.render( + output = preview_renderer.render( exp, preview_manifest, active_fsjobs=preview_object, verbosity_level="debug" ) @@ -955,7 +955,7 @@ def test_preview_multifs_active_infrastructure( ) # Execute method for template rendering - output = previewrenderer.render( + output = preview_renderer.render( exp, active_fsjobs=preview_object_multifs, verbosity_level="debug" ) @@ -999,7 +999,7 @@ def test_preview_active_infrastructure_feature_store_error( preview_manifest = Manifest(orc) # Execute method for template rendering - output = previewrenderer.render( + output = preview_renderer.render( exp, preview_manifest, active_fsjobs=active_fsjobs, verbosity_level="debug" ) @@ -1059,7 +1059,7 @@ def test_verbosity_info_ensemble(test_dir, wlmutils): exp.generate(hello_world_model, spam_eggs_model, hello_ensemble) preview_manifest = Manifest(hello_world_model, spam_eggs_model, hello_ensemble) - output = previewrenderer.render(exp, preview_manifest, verbosity_level="info") + output = preview_renderer.render(exp, preview_manifest, verbosity_level="info") assert "Executable" not in output assert "Executable Arguments" not in output @@ -1163,7 +1163,7 @@ def test_verbosity_info_colocated_fs_model_ensemble( preview_manifest = Manifest(colo_ensemble) # Execute preview method - output = previewrenderer.render(exp, preview_manifest, verbosity_level="info") + output = preview_renderer.render(exp, preview_manifest, verbosity_level="info") assert "Outgoing Key Collision Prevention (Key Prefixing)" not in output assert "Devices Per Node" not in output @@ -1186,7 +1186,7 @@ def test_verbosity_info_feature_store(test_dir, wlmutils, choose_host): preview_manifest = Manifest(feature_store) # Execute method for template rendering - output = previewrenderer.render(exp, preview_manifest, verbosity_level="info") + output = preview_renderer.render(exp, preview_manifest, verbosity_level="info") # Evaluate output assert "Executable" not in output @@ -1220,7 +1220,7 @@ def test_verbosity_info_ensemble(test_dir, wlmutils): preview_manifest = Manifest(fs, ml_model, ensemble) # Call preview renderer for testing output - output = previewrenderer.render(exp, preview_manifest, verbosity_level="info") + output = preview_renderer.render(exp, preview_manifest, verbosity_level="info") # Evaluate output assert "Outgoing Key Collision Prevention (Key Prefixing)" in output @@ -1289,7 +1289,7 @@ def test_preview_colocated_fs_singular_model(wlmutils, test_dir): preview_manifest = Manifest(model_1, model_2) # Call preview renderer for testing output - output = previewrenderer.render(exp, preview_manifest, verbosity_level="debug") + output = preview_renderer.render(exp, preview_manifest, verbosity_level="debug") assert "model_1" in output assert "model_2" in output @@ -1326,7 +1326,7 @@ def test_preview_fs_script(wlmutils, test_dir): preview_manifest = Manifest(model_instance) # Call preview renderer for testing output - output = previewrenderer.render(exp, preview_manifest, verbosity_level="debug") + output = preview_renderer.render(exp, preview_manifest, verbosity_level="debug") # Evaluate output assert "Torch Script" in output diff --git a/tests/_legacy/test_sge_batch_settings.py b/tests/_legacy/test_sge_batch_settings.py index fa40b4b00e..f81bee1eab 100644 --- a/tests/_legacy/test_sge_batch_settings.py +++ b/tests/_legacy/test_sge_batch_settings.py @@ -29,7 +29,7 @@ import pytest from smartsim import Experiment -from smartsim._core.launcher.sge.sgeParser import parse_qstat_jobid_xml +from smartsim._core.launcher.sge.sge_parser import parse_qstat_jobid_xml from smartsim.error import SSConfigError from smartsim.settings import SgeQsubBatchSettings from smartsim.settings.mpiSettings import _BaseMPISettings diff --git a/tests/_legacy/test_slurm_parser.py b/tests/_legacy/test_slurm_parser.py index a49d9b198e..e73ec7ed7e 100644 --- a/tests/_legacy/test_slurm_parser.py +++ b/tests/_legacy/test_slurm_parser.py @@ -26,7 +26,7 @@ import pytest -from smartsim._core.launcher.slurm import slurmParser +from smartsim._core.launcher.slurm import slurm_parser # The tests in this file belong to the group_b group pytestmark = pytest.mark.group_b @@ -41,7 +41,7 @@ def test_parse_salloc(): "salloc: Waiting for resource configuration\n" "salloc: Nodes nid00116 are ready for job" ) - alloc_id = slurmParser.parse_salloc(output) + alloc_id = slurm_parser.parse_salloc(output) assert alloc_id == "118568" @@ -54,7 +54,7 @@ def test_parse_salloc_extra(): "salloc: Waiting for resource configuration\n" "salloc: Nodes prod76-0006 are ready for job\n" ) - alloc_id = slurmParser.parse_salloc(output) + alloc_id = slurm_parser.parse_salloc(output) assert alloc_id == "22942" @@ -64,14 +64,14 @@ def test_parse_salloc_high(): "salloc: Waiting for resource configuration\n" "salloc: Nodes nid00034 are ready for job\n" ) - alloc_id = slurmParser.parse_salloc(output) + alloc_id = slurm_parser.parse_salloc(output) assert alloc_id == "29917893" def test_parse_salloc_error(): output = "salloc: error: Job submit/allocate failed: Job dependency problem" error = "Job submit/allocate failed: Job dependency problem" - parsed_error = slurmParser.parse_salloc_error(output) + parsed_error = slurm_parser.parse_salloc_error(output) assert error == parsed_error @@ -81,7 +81,7 @@ def test_parse_salloc_error_2(): "Try 'salloc --help' for more information\n" ) error = "unrecognized option '--no-a-option'" - parsed_error = slurmParser.parse_salloc_error(output) + parsed_error = slurm_parser.parse_salloc_error(output) assert error == parsed_error @@ -93,7 +93,7 @@ def test_parse_salloc_error_3(): "\nsalloc: error: Job submit/allocate failed: Invalid node name specified\n" ) error = "Job submit/allocate failed: Invalid node name specified" - parsed_error = slurmParser.parse_salloc_error(output) + parsed_error = slurm_parser.parse_salloc_error(output) assert error == parsed_error @@ -103,7 +103,7 @@ def test_parse_salloc_error_4(): "salloc: error: Job submit/allocate failed: Unspecified error\n" ) error = "No hardware architecture specified (-C)!" - parsed_error = slurmParser.parse_salloc_error(output) + parsed_error = slurm_parser.parse_salloc_error(output) assert error == parsed_error @@ -116,7 +116,7 @@ def test_parse_sstat_nodes(): """ output = "118594.extern|nid00028|38671|\n" "118594.0|nid00028|38703|" nodes = ["nid00028"] - parsed_nodes = slurmParser.parse_sstat_nodes(output, "118594") + parsed_nodes = slurm_parser.parse_sstat_nodes(output, "118594") assert nodes == parsed_nodes @@ -126,7 +126,7 @@ def test_parse_sstat_nodes_1(): """ output = "22942.0|prod76-0006|354345|" nodes = ["prod76-0006"] - parsed_nodes = slurmParser.parse_sstat_nodes(output, "22942.0") + parsed_nodes = slurm_parser.parse_sstat_nodes(output, "22942.0") assert nodes == parsed_nodes @@ -136,7 +136,7 @@ def test_parse_sstat_nodes_2(): """ output = "29917893.extern|nid00034|44860|\n" "29917893.0|nid00034|44887|\n" nodes = ["nid00034"] - parsed_nodes = slurmParser.parse_sstat_nodes(output, "29917893.0") + parsed_nodes = slurm_parser.parse_sstat_nodes(output, "29917893.0") assert nodes == parsed_nodes @@ -152,7 +152,7 @@ def test_parse_sstat_nodes_3(): "29917893.2|nid00034|45174|\n" ) nodes = ["nid00034"] - parsed_nodes = slurmParser.parse_sstat_nodes(output, "29917893.2") + parsed_nodes = slurm_parser.parse_sstat_nodes(output, "29917893.2") assert nodes == parsed_nodes @@ -171,7 +171,7 @@ def test_parse_sstat_nodes_4(): "30000.2|nid00036|45174,32435|\n" ) nodes = set(["nid00034", "nid00035", "nid00036"]) - parsed_nodes = set(slurmParser.parse_sstat_nodes(output, "30000")) + parsed_nodes = set(slurm_parser.parse_sstat_nodes(output, "30000")) assert nodes == parsed_nodes @@ -190,7 +190,7 @@ def test_parse_sstat_nodes_4(): "30000.2|nid00036|45174,32435|\n" ) nodes = set(["nid00034", "nid00035", "nid00036"]) - parsed_nodes = set(slurmParser.parse_sstat_nodes(output, "30000")) + parsed_nodes = set(slurm_parser.parse_sstat_nodes(output, "30000")) assert nodes == parsed_nodes @@ -206,7 +206,7 @@ def test_parse_sstat_nodes_5(): "29917893.2|nid00034|45174|\n" ) nodes = ["nid00034"] - parsed_nodes = slurmParser.parse_sstat_nodes(output, "29917893.2") + parsed_nodes = slurm_parser.parse_sstat_nodes(output, "29917893.2") assert nodes == parsed_nodes @@ -221,7 +221,7 @@ def test_parse_sacct_step_id(): "m2-119225.1|119225.1|" ) step_id = "119225.0" - parsed_step_id = slurmParser.parse_step_id_from_sacct(output, "m1-119225.0") + parsed_step_id = slurm_parser.parse_step_id_from_sacct(output, "m1-119225.0") assert step_id == parsed_step_id @@ -235,7 +235,7 @@ def test_parse_sacct_step_id_2(): "n1-119225.3|119225.3|" ) step_id = "119225.2" - parsed_step_id = slurmParser.parse_step_id_from_sacct( + parsed_step_id = slurm_parser.parse_step_id_from_sacct( output, "featurestore_0-119225.2" ) assert step_id == parsed_step_id @@ -251,7 +251,7 @@ def test_parse_sacct_step_id_2(): "cti_dlaunch1.0|962333.3|" ) step_id = "962333.1" - parsed_step_id = slurmParser.parse_step_id_from_sacct(output, "python-962333.1") + parsed_step_id = slurm_parser.parse_step_id_from_sacct(output, "python-962333.1") assert step_id == parsed_step_id @@ -261,7 +261,7 @@ def test_parse_sacct_status(): """ output = "29917893.2|COMPLETED|0:0|\n" status = ("COMPLETED", "0") - parsed_status = slurmParser.parse_sacct(output, "29917893.2") + parsed_status = slurm_parser.parse_sacct(output, "29917893.2") assert status == parsed_status @@ -271,7 +271,7 @@ def test_parse_sacct_status_1(): """ output = "22999.0|FAILED|1:0|\n" status = ("FAILED", "1") - parsed_status = slurmParser.parse_sacct(output, "22999.0") + parsed_status = slurm_parser.parse_sacct(output, "22999.0") assert status == parsed_status @@ -281,5 +281,5 @@ def test_parse_sacct_status_2(): """ output = "22999.10|COMPLETED|0:0|\n22999.1|FAILED|1:0|\n" status = ("FAILED", "1") - parsed_status = slurmParser.parse_sacct(output, "22999.1") + parsed_status = slurm_parser.parse_sacct(output, "22999.1") assert status == parsed_status diff --git a/tests/_legacy/test_slurm_settings.py b/tests/_legacy/test_slurm_settings.py index aa915cdedf..9fd0f5e82b 100644 --- a/tests/_legacy/test_slurm_settings.py +++ b/tests/_legacy/test_slurm_settings.py @@ -100,7 +100,7 @@ def test_mpmd_compound_env_exports(): srun_2.env_vars = {"cmp2": "222,333", "norm2": "pqr"} srun.make_mpmd(srun_2) - from smartsim._core.launcher.step.slurmStep import SbatchStep, SrunStep + from smartsim._core.launcher.step.slurm_step import SbatchStep, SrunStep from smartsim.settings.slurmSettings import SbatchSettings step = SrunStep("teststep", "./", srun) @@ -160,7 +160,7 @@ def test_mpmd_non_compound_env_exports(): srun_2.env_vars = {"cmp2": "222", "norm2": "pqr"} srun.make_mpmd(srun_2) - from smartsim._core.launcher.step.slurmStep import SbatchStep, SrunStep + from smartsim._core.launcher.step.slurm_step import SbatchStep, SrunStep from smartsim.settings.slurmSettings import SbatchSettings step = SrunStep("teststep", "./", srun) @@ -220,7 +220,7 @@ def test_mpmd_non_compound_no_exports(): srun_2.env_vars = {} srun.make_mpmd(srun_2) - from smartsim._core.launcher.step.slurmStep import SbatchStep, SrunStep + from smartsim._core.launcher.step.slurm_step import SbatchStep, SrunStep from smartsim.settings.slurmSettings import SbatchSettings step = SrunStep("teststep", "./", srun) diff --git a/tests/_legacy/test_step_info.py b/tests/_legacy/test_step_info.py index b0d7360164..06e914b0a8 100644 --- a/tests/_legacy/test_step_info.py +++ b/tests/_legacy/test_step_info.py @@ -26,7 +26,7 @@ import pytest -from smartsim._core.launcher.stepInfo import * +from smartsim._core.launcher.step_info import * from smartsim.status import JobStatus # The tests in this file belong to the group_b group diff --git a/tests/_legacy/test_telemetry_monitor.py b/tests/_legacy/test_telemetry_monitor.py index bc15f32e59..262f07e1e6 100644 --- a/tests/_legacy/test_telemetry_monitor.py +++ b/tests/_legacy/test_telemetry_monitor.py @@ -39,12 +39,12 @@ from conftest import FileUtils, WLMUtils from smartsim import Experiment from smartsim._core.control.job import Job, JobEntity -from smartsim._core.control.jobmanager import JobManager -from smartsim._core.entrypoints.telemetrymonitor import get_parser +from smartsim._core.control.job_manager import JobManager +from smartsim._core.entrypoints.telemetry_monitor import get_parser from smartsim._core.launcher.launcher import WLMLauncher -from smartsim._core.launcher.slurm.slurmLauncher import SlurmLauncher +from smartsim._core.launcher.slurm.slurm_launcher import SlurmLauncher from smartsim._core.launcher.step.step import Step, proxyable_launch_cmd -from smartsim._core.launcher.stepInfo import StepInfo +from smartsim._core.launcher.step_info import StepInfo from smartsim._core.utils import serialize from smartsim._core.utils.helpers import get_ts_ms from smartsim._core.utils.telemetry.manifest import Run, RuntimeManifest diff --git a/tests/temp_tests/test_settings/test_alpsLauncher.py b/tests/temp_tests/test_settings/test_alpsLauncher.py index 1017988c0e..5abfbb9c76 100644 --- a/tests/temp_tests/test_settings/test_alpsLauncher.py +++ b/tests/temp_tests/test_settings/test_alpsLauncher.py @@ -29,13 +29,13 @@ import pytest -from smartsim._core.shell.shellLauncher import ShellLauncherCommand +from smartsim._core.shell.shell_launcher import ShellLauncherCommand from smartsim.settings import LaunchSettings from smartsim.settings.arguments.launch.alps import ( AprunLaunchArguments, _as_aprun_command, ) -from smartsim.settings.launchCommand import LauncherType +from smartsim.settings.launch_command import LauncherType pytestmark = pytest.mark.group_a diff --git a/tests/temp_tests/test_settings/test_dragonLauncher.py b/tests/temp_tests/test_settings/test_dragonLauncher.py index bd2c6f4927..a7685e18e7 100644 --- a/tests/temp_tests/test_settings/test_dragonLauncher.py +++ b/tests/temp_tests/test_settings/test_dragonLauncher.py @@ -28,10 +28,10 @@ from smartsim._core.launcher.dragon.dragon_launcher import ( _as_run_request_args_and_policy, ) -from smartsim._core.schemas.dragonRequests import DragonRunPolicy, DragonRunRequestView +from smartsim._core.schemas.dragon_requests import DragonRunPolicy, DragonRunRequestView from smartsim.settings import LaunchSettings from smartsim.settings.arguments.launch.dragon import DragonLaunchArguments -from smartsim.settings.launchCommand import LauncherType +from smartsim.settings.launch_command import LauncherType pytestmark = pytest.mark.group_a diff --git a/tests/temp_tests/test_settings/test_localLauncher.py b/tests/temp_tests/test_settings/test_localLauncher.py index f5b40735a7..6576b2249c 100644 --- a/tests/temp_tests/test_settings/test_localLauncher.py +++ b/tests/temp_tests/test_settings/test_localLauncher.py @@ -29,13 +29,13 @@ import pytest -from smartsim._core.shell.shellLauncher import ShellLauncherCommand +from smartsim._core.shell.shell_launcher import ShellLauncherCommand from smartsim.settings import LaunchSettings from smartsim.settings.arguments.launch.local import ( LocalLaunchArguments, _as_local_command, ) -from smartsim.settings.launchCommand import LauncherType +from smartsim.settings.launch_command import LauncherType pytestmark = pytest.mark.group_a diff --git a/tests/temp_tests/test_settings/test_mpiLauncher.py b/tests/temp_tests/test_settings/test_mpiLauncher.py index 9309674e51..57be23ee2b 100644 --- a/tests/temp_tests/test_settings/test_mpiLauncher.py +++ b/tests/temp_tests/test_settings/test_mpiLauncher.py @@ -31,7 +31,7 @@ import pytest -from smartsim._core.shell.shellLauncher import ShellLauncherCommand +from smartsim._core.shell.shell_launcher import ShellLauncherCommand from smartsim.settings import LaunchSettings from smartsim.settings.arguments.launch.mpi import ( MpiexecLaunchArguments, @@ -41,7 +41,7 @@ _as_mpirun_command, _as_orterun_command, ) -from smartsim.settings.launchCommand import LauncherType +from smartsim.settings.launch_command import LauncherType pytestmark = pytest.mark.group_a diff --git a/tests/temp_tests/test_settings/test_palsLauncher.py b/tests/temp_tests/test_settings/test_palsLauncher.py index e1d7ef5c3e..d38d1842c6 100644 --- a/tests/temp_tests/test_settings/test_palsLauncher.py +++ b/tests/temp_tests/test_settings/test_palsLauncher.py @@ -30,13 +30,13 @@ import pytest -from smartsim._core.shell.shellLauncher import ShellLauncherCommand +from smartsim._core.shell.shell_launcher import ShellLauncherCommand from smartsim.settings import LaunchSettings from smartsim.settings.arguments.launch.pals import ( PalsMpiexecLaunchArguments, _as_pals_command, ) -from smartsim.settings.launchCommand import LauncherType +from smartsim.settings.launch_command import LauncherType pytestmark = pytest.mark.group_a diff --git a/tests/temp_tests/test_settings/test_slurmLauncher.py b/tests/temp_tests/test_settings/test_slurmLauncher.py index e5d9c718f3..6be9b5542a 100644 --- a/tests/temp_tests/test_settings/test_slurmLauncher.py +++ b/tests/temp_tests/test_settings/test_slurmLauncher.py @@ -27,13 +27,13 @@ import pytest -from smartsim._core.shell.shellLauncher import ShellLauncherCommand +from smartsim._core.shell.shell_launcher import ShellLauncherCommand from smartsim.settings import LaunchSettings from smartsim.settings.arguments.launch.slurm import ( SlurmLaunchArguments, _as_srun_command, ) -from smartsim.settings.launchCommand import LauncherType +from smartsim.settings.launch_command import LauncherType pytestmark = pytest.mark.group_a diff --git a/tests/test_shell_launcher.py b/tests/test_shell_launcher.py index 95e8847108..2614a68955 100644 --- a/tests/test_shell_launcher.py +++ b/tests/test_shell_launcher.py @@ -37,7 +37,7 @@ import psutil import pytest -from smartsim._core.shell.shellLauncher import ShellLauncher, ShellLauncherCommand, sp +from smartsim._core.shell.shell_launcher import ShellLauncher, ShellLauncherCommand, sp from smartsim._core.utils import helpers from smartsim._core.utils.shell import * from smartsim.entity import entity From 4710ad0bca66dad73b82fdfae78a4ccf7a5fc2b4 Mon Sep 17 00:00:00 2001 From: Amanda Richardson Date: Wed, 18 Sep 2024 13:49:37 -0700 Subject: [PATCH 3/5] last --- smartsim/_core/arguments/shell.py | 2 +- smartsim/entity/ensemble.py | 2 +- smartsim/entity/entity.py | 4 ++-- smartsim/launchable/__init__.py | 12 ++++++------ smartsim/launchable/{basejob.py => base_job.py} | 0 .../{baseJobGroup.py => base_job_group.py} | 2 +- .../{colocatedJobGroup.py => colocated_job_group.py} | 4 ++-- smartsim/launchable/job.py | 2 +- smartsim/launchable/{jobGroup.py => job_group.py} | 4 ++-- smartsim/launchable/{mpmdjob.py => mpmd_job.py} | 6 +++--- smartsim/launchable/{mpmdpair.py => mpmd_pair.py} | 2 +- smartsim/settings/__init__.py | 6 +++--- smartsim/settings/arguments/__init__.py | 4 ++-- smartsim/settings/arguments/batch/lsf.py | 4 ++-- smartsim/settings/arguments/batch/pbs.py | 4 ++-- smartsim/settings/arguments/batch/slurm.py | 4 ++-- .../{batchArguments.py => batch_arguments.py} | 0 smartsim/settings/arguments/launch/dragon.py | 4 ++-- .../{launchArguments.py => launch_arguments.py} | 0 .../settings/{baseSettings.py => base_settings.py} | 0 .../settings/{batchCommand.py => batch_command.py} | 0 .../settings/{batchSettings.py => batch_settings.py} | 4 ++-- .../settings/{launchCommand.py => launch_command.py} | 0 .../{launchSettings.py => launch_settings.py} | 4 ++-- .../settings/{sgeSettings.py => sge_settings.py} | 0 tests/temp_tests/test_colocatedJobGroup.py | 4 ++-- .../test_core/test_commands/test_commandList.py | 2 +- .../test_core/test_commands/test_launchCommands.py | 2 +- tests/temp_tests/test_jobGroup.py | 6 +++--- tests/temp_tests/test_launchable.py | 4 ++-- tests/temp_tests/test_settings/conftest.py | 2 +- tests/temp_tests/test_settings/test_batchSettings.py | 2 +- .../temp_tests/test_settings/test_launchSettings.py | 2 +- tests/temp_tests/test_settings/test_lsfLauncher.py | 2 +- tests/temp_tests/test_settings/test_lsfScheduler.py | 2 +- tests/temp_tests/test_settings/test_pbsScheduler.py | 2 +- .../temp_tests/test_settings/test_slurmScheduler.py | 2 +- tests/test_ensemble.py | 2 +- tests/test_experiment.py | 10 +++++----- 39 files changed, 59 insertions(+), 59 deletions(-) rename smartsim/launchable/{basejob.py => base_job.py} (100%) rename smartsim/launchable/{baseJobGroup.py => base_job_group.py} (99%) rename smartsim/launchable/{colocatedJobGroup.py => colocated_job_group.py} (97%) rename smartsim/launchable/{jobGroup.py => job_group.py} (97%) rename smartsim/launchable/{mpmdjob.py => mpmd_job.py} (96%) rename smartsim/launchable/{mpmdpair.py => mpmd_pair.py} (96%) rename smartsim/settings/arguments/{batchArguments.py => batch_arguments.py} (100%) rename smartsim/settings/arguments/{launchArguments.py => launch_arguments.py} (100%) rename smartsim/settings/{baseSettings.py => base_settings.py} (100%) rename smartsim/settings/{batchCommand.py => batch_command.py} (100%) rename smartsim/settings/{batchSettings.py => batch_settings.py} (98%) rename smartsim/settings/{launchCommand.py => launch_command.py} (100%) rename smartsim/settings/{launchSettings.py => launch_settings.py} (98%) rename smartsim/settings/{sgeSettings.py => sge_settings.py} (100%) diff --git a/smartsim/_core/arguments/shell.py b/smartsim/_core/arguments/shell.py index 184d242cb1..e4138d0ebb 100644 --- a/smartsim/_core/arguments/shell.py +++ b/smartsim/_core/arguments/shell.py @@ -30,7 +30,7 @@ from abc import abstractmethod from smartsim.log import get_logger -from smartsim.settings.arguments.launchArguments import LaunchArguments +from smartsim.settings.arguments.launch_arguments import LaunchArguments logger = get_logger(__name__) diff --git a/smartsim/entity/ensemble.py b/smartsim/entity/ensemble.py index f228c4a8af..261f22d65a 100644 --- a/smartsim/entity/ensemble.py +++ b/smartsim/entity/ensemble.py @@ -39,7 +39,7 @@ from smartsim.launchable.job import Job if t.TYPE_CHECKING: - from smartsim.settings.launchSettings import LaunchSettings + from smartsim.settings.launch_settings import LaunchSettings class Ensemble(entity.CompoundEntity): diff --git a/smartsim/entity/entity.py b/smartsim/entity/entity.py index 1caebb6075..f3e5b17f3a 100644 --- a/smartsim/entity/entity.py +++ b/smartsim/entity/entity.py @@ -29,11 +29,11 @@ import abc import typing as t -from smartsim.launchable.jobGroup import JobGroup +from smartsim.launchable.job_group import JobGroup if t.TYPE_CHECKING: from smartsim.launchable.job import Job - from smartsim.settings.launchSettings import LaunchSettings + from smartsim.settings.launch_settings import LaunchSettings class TelemetryConfiguration: diff --git a/smartsim/launchable/__init__.py b/smartsim/launchable/__init__.py index 961032bf28..383b458f09 100644 --- a/smartsim/launchable/__init__.py +++ b/smartsim/launchable/__init__.py @@ -24,11 +24,11 @@ # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -from .basejob import BaseJob -from .baseJobGroup import BaseJobGroup -from .colocatedJobGroup import ColocatedJobGroup +from .base_job import BaseJob +from .base_job_group import BaseJobGroup +from .colocated_job_group import ColocatedJobGroup from .job import Job -from .jobGroup import JobGroup +from .job_group import JobGroup from .launchable import Launchable -from .mpmdjob import MPMDJob -from .mpmdpair import MPMDPair +from .mpmd_job import MPMDJob +from .mpmd_pair import MPMDPair diff --git a/smartsim/launchable/basejob.py b/smartsim/launchable/base_job.py similarity index 100% rename from smartsim/launchable/basejob.py rename to smartsim/launchable/base_job.py diff --git a/smartsim/launchable/baseJobGroup.py b/smartsim/launchable/base_job_group.py similarity index 99% rename from smartsim/launchable/baseJobGroup.py rename to smartsim/launchable/base_job_group.py index b7becba568..9031705f39 100644 --- a/smartsim/launchable/baseJobGroup.py +++ b/smartsim/launchable/base_job_group.py @@ -33,7 +33,7 @@ from smartsim.launchable.launchable import Launchable -from .basejob import BaseJob +from .base_job import BaseJob class BaseJobGroup(Launchable, MutableSequence[BaseJob], ABC): diff --git a/smartsim/launchable/colocatedJobGroup.py b/smartsim/launchable/colocated_job_group.py similarity index 97% rename from smartsim/launchable/colocatedJobGroup.py rename to smartsim/launchable/colocated_job_group.py index 1c3b96fbac..db187a46c0 100644 --- a/smartsim/launchable/colocatedJobGroup.py +++ b/smartsim/launchable/colocated_job_group.py @@ -29,8 +29,8 @@ import typing as t from copy import deepcopy -from .basejob import BaseJob -from .baseJobGroup import BaseJobGroup +from .base_job import BaseJob +from .base_job_group import BaseJobGroup if t.TYPE_CHECKING: from typing_extensions import Self diff --git a/smartsim/launchable/job.py b/smartsim/launchable/job.py index d020e6e575..b7d81bfdc2 100644 --- a/smartsim/launchable/job.py +++ b/smartsim/launchable/job.py @@ -32,7 +32,7 @@ from smartsim._core.commands.launch_commands import LaunchCommands from smartsim._core.utils.helpers import check_name -from smartsim.launchable.basejob import BaseJob +from smartsim.launchable.base_job import BaseJob from smartsim.log import get_logger from smartsim.settings import LaunchSettings diff --git a/smartsim/launchable/jobGroup.py b/smartsim/launchable/job_group.py similarity index 97% rename from smartsim/launchable/jobGroup.py rename to smartsim/launchable/job_group.py index 3de767711f..f06313dd8d 100644 --- a/smartsim/launchable/jobGroup.py +++ b/smartsim/launchable/job_group.py @@ -32,8 +32,8 @@ from smartsim.log import get_logger from .._core.utils.helpers import check_name -from .basejob import BaseJob -from .baseJobGroup import BaseJobGroup +from .base_job import BaseJob +from .base_job_group import BaseJobGroup logger = get_logger(__name__) diff --git a/smartsim/launchable/mpmdjob.py b/smartsim/launchable/mpmd_job.py similarity index 96% rename from smartsim/launchable/mpmdjob.py rename to smartsim/launchable/mpmd_job.py index 314653498c..e526f10746 100644 --- a/smartsim/launchable/mpmdjob.py +++ b/smartsim/launchable/mpmd_job.py @@ -31,9 +31,9 @@ from copy import deepcopy from smartsim.error.errors import SSUnsupportedError -from smartsim.launchable.basejob import BaseJob -from smartsim.launchable.mpmdpair import MPMDPair -from smartsim.settings.launchSettings import LaunchSettings +from smartsim.launchable.base_job import BaseJob +from smartsim.launchable.mpmd_pair import MPMDPair +from smartsim.settings.launch_settings import LaunchSettings if t.TYPE_CHECKING: from smartsim._core.commands.launch_commands import LaunchCommands diff --git a/smartsim/launchable/mpmdpair.py b/smartsim/launchable/mpmd_pair.py similarity index 96% rename from smartsim/launchable/mpmdpair.py rename to smartsim/launchable/mpmd_pair.py index 3df8a0ee51..722a16cdee 100644 --- a/smartsim/launchable/mpmdpair.py +++ b/smartsim/launchable/mpmd_pair.py @@ -29,7 +29,7 @@ import copy import typing as t -from smartsim.settings.launchSettings import LaunchSettings +from smartsim.settings.launch_settings import LaunchSettings if t.TYPE_CHECKING: from smartsim.entity.entity import SmartSimEntity diff --git a/smartsim/settings/__init__.py b/smartsim/settings/__init__.py index b9ede3cecd..59aeeffbd8 100644 --- a/smartsim/settings/__init__.py +++ b/smartsim/settings/__init__.py @@ -26,9 +26,9 @@ import typing as t -from .baseSettings import BaseSettings -from .batchSettings import BatchSettings -from .launchSettings import LaunchSettings +from .base_settings import BaseSettings +from .batch_settings import BatchSettings +from .launch_settings import LaunchSettings __all__ = ["LaunchSettings", "BaseSettings", "BatchSettings"] diff --git a/smartsim/settings/arguments/__init__.py b/smartsim/settings/arguments/__init__.py index cd216526cf..f79a3b4bf9 100644 --- a/smartsim/settings/arguments/__init__.py +++ b/smartsim/settings/arguments/__init__.py @@ -24,7 +24,7 @@ # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -from .batchArguments import BatchArguments -from .launchArguments import LaunchArguments +from .batch_arguments import BatchArguments +from .launch_arguments import LaunchArguments __all__ = ["LaunchArguments", "BatchArguments"] diff --git a/smartsim/settings/arguments/batch/lsf.py b/smartsim/settings/arguments/batch/lsf.py index 10dc85763e..5e7565afbd 100644 --- a/smartsim/settings/arguments/batch/lsf.py +++ b/smartsim/settings/arguments/batch/lsf.py @@ -30,9 +30,9 @@ from smartsim.log import get_logger -from ...batchCommand import SchedulerType +from ...batch_command import SchedulerType from ...common import StringArgument -from ..batchArguments import BatchArguments +from ..batch_arguments import BatchArguments logger = get_logger(__name__) diff --git a/smartsim/settings/arguments/batch/pbs.py b/smartsim/settings/arguments/batch/pbs.py index 192874c164..7f03642df5 100644 --- a/smartsim/settings/arguments/batch/pbs.py +++ b/smartsim/settings/arguments/batch/pbs.py @@ -32,9 +32,9 @@ from smartsim.log import get_logger from ....error import SSConfigError -from ...batchCommand import SchedulerType +from ...batch_command import SchedulerType from ...common import StringArgument -from ..batchArguments import BatchArguments +from ..batch_arguments import BatchArguments logger = get_logger(__name__) diff --git a/smartsim/settings/arguments/batch/slurm.py b/smartsim/settings/arguments/batch/slurm.py index f4725a1175..7114e947ec 100644 --- a/smartsim/settings/arguments/batch/slurm.py +++ b/smartsim/settings/arguments/batch/slurm.py @@ -31,9 +31,9 @@ from smartsim.log import get_logger -from ...batchCommand import SchedulerType +from ...batch_command import SchedulerType from ...common import StringArgument -from ..batchArguments import BatchArguments +from ..batch_arguments import BatchArguments logger = get_logger(__name__) diff --git a/smartsim/settings/arguments/batchArguments.py b/smartsim/settings/arguments/batch_arguments.py similarity index 100% rename from smartsim/settings/arguments/batchArguments.py rename to smartsim/settings/arguments/batch_arguments.py diff --git a/smartsim/settings/arguments/launch/dragon.py b/smartsim/settings/arguments/launch/dragon.py index 98b91059ca..f1b34608d8 100644 --- a/smartsim/settings/arguments/launch/dragon.py +++ b/smartsim/settings/arguments/launch/dragon.py @@ -33,8 +33,8 @@ from smartsim.log import get_logger from ...common import set_check_input -from ...launchCommand import LauncherType -from ..launchArguments import LaunchArguments +from ...launch_command import LauncherType +from ..launch_arguments import LaunchArguments logger = get_logger(__name__) diff --git a/smartsim/settings/arguments/launchArguments.py b/smartsim/settings/arguments/launch_arguments.py similarity index 100% rename from smartsim/settings/arguments/launchArguments.py rename to smartsim/settings/arguments/launch_arguments.py diff --git a/smartsim/settings/baseSettings.py b/smartsim/settings/base_settings.py similarity index 100% rename from smartsim/settings/baseSettings.py rename to smartsim/settings/base_settings.py diff --git a/smartsim/settings/batchCommand.py b/smartsim/settings/batch_command.py similarity index 100% rename from smartsim/settings/batchCommand.py rename to smartsim/settings/batch_command.py diff --git a/smartsim/settings/batchSettings.py b/smartsim/settings/batch_settings.py similarity index 98% rename from smartsim/settings/batchSettings.py rename to smartsim/settings/batch_settings.py index 6649fa5f77..10aea8377f 100644 --- a/smartsim/settings/batchSettings.py +++ b/smartsim/settings/batch_settings.py @@ -36,8 +36,8 @@ from .arguments.batch.lsf import BsubBatchArguments from .arguments.batch.pbs import QsubBatchArguments from .arguments.batch.slurm import SlurmBatchArguments -from .baseSettings import BaseSettings -from .batchCommand import SchedulerType +from .base_settings import BaseSettings +from .batch_command import SchedulerType from .common import StringArgument logger = get_logger(__name__) diff --git a/smartsim/settings/launchCommand.py b/smartsim/settings/launch_command.py similarity index 100% rename from smartsim/settings/launchCommand.py rename to smartsim/settings/launch_command.py diff --git a/smartsim/settings/launchSettings.py b/smartsim/settings/launch_settings.py similarity index 98% rename from smartsim/settings/launchSettings.py rename to smartsim/settings/launch_settings.py index 14137481de..6d7da57ca9 100644 --- a/smartsim/settings/launchSettings.py +++ b/smartsim/settings/launch_settings.py @@ -44,9 +44,9 @@ ) from .arguments.launch.pals import PalsMpiexecLaunchArguments from .arguments.launch.slurm import SlurmLaunchArguments -from .baseSettings import BaseSettings +from .base_settings import BaseSettings from .common import StringArgument -from .launchCommand import LauncherType +from .launch_command import LauncherType logger = get_logger(__name__) diff --git a/smartsim/settings/sgeSettings.py b/smartsim/settings/sge_settings.py similarity index 100% rename from smartsim/settings/sgeSettings.py rename to smartsim/settings/sge_settings.py diff --git a/tests/temp_tests/test_colocatedJobGroup.py b/tests/temp_tests/test_colocatedJobGroup.py index 90a5e254c4..d6d17fc8ae 100644 --- a/tests/temp_tests/test_colocatedJobGroup.py +++ b/tests/temp_tests/test_colocatedJobGroup.py @@ -27,8 +27,8 @@ import pytest from smartsim.entity.application import Application -from smartsim.launchable.basejob import BaseJob -from smartsim.launchable.colocatedJobGroup import ColocatedJobGroup +from smartsim.launchable.base_job import BaseJob +from smartsim.launchable.colocated_job_group import ColocatedJobGroup from smartsim.launchable.job import Job from smartsim.settings import LaunchSettings diff --git a/tests/temp_tests/test_core/test_commands/test_commandList.py b/tests/temp_tests/test_core/test_commands/test_commandList.py index 9fd041dd89..c6bc8d8347 100644 --- a/tests/temp_tests/test_core/test_commands/test_commandList.py +++ b/tests/temp_tests/test_core/test_commands/test_commandList.py @@ -28,7 +28,7 @@ from smartsim._core.commands.command import Command from smartsim._core.commands.command_list import CommandList -from smartsim.settings.launchCommand import LauncherType +from smartsim.settings.launch_command import LauncherType pytestmark = pytest.mark.group_a diff --git a/tests/temp_tests/test_core/test_commands/test_launchCommands.py b/tests/temp_tests/test_core/test_commands/test_launchCommands.py index c4c19c6f81..60bfe4b279 100644 --- a/tests/temp_tests/test_core/test_commands/test_launchCommands.py +++ b/tests/temp_tests/test_core/test_commands/test_launchCommands.py @@ -29,7 +29,7 @@ from smartsim._core.commands.command import Command from smartsim._core.commands.command_list import CommandList from smartsim._core.commands.launch_commands import LaunchCommands -from smartsim.settings.launchCommand import LauncherType +from smartsim.settings.launch_command import LauncherType pytestmark = pytest.mark.group_a diff --git a/tests/temp_tests/test_jobGroup.py b/tests/temp_tests/test_jobGroup.py index 5f27199b57..f735162609 100644 --- a/tests/temp_tests/test_jobGroup.py +++ b/tests/temp_tests/test_jobGroup.py @@ -27,10 +27,10 @@ import pytest from smartsim.entity.application import Application -from smartsim.launchable.basejob import BaseJob +from smartsim.launchable.base_job import BaseJob from smartsim.launchable.job import Job -from smartsim.launchable.jobGroup import JobGroup -from smartsim.settings.launchSettings import LaunchSettings +from smartsim.launchable.job_group import JobGroup +from smartsim.settings.launch_settings import LaunchSettings pytestmark = pytest.mark.group_a diff --git a/tests/temp_tests/test_launchable.py b/tests/temp_tests/test_launchable.py index 9b2adb3e7a..e87e689028 100644 --- a/tests/temp_tests/test_launchable.py +++ b/tests/temp_tests/test_launchable.py @@ -33,8 +33,8 @@ from smartsim.error.errors import SSUnsupportedError from smartsim.launchable import Job, Launchable from smartsim.launchable.launchable import SmartSimObject -from smartsim.launchable.mpmdjob import MPMDJob -from smartsim.launchable.mpmdpair import MPMDPair +from smartsim.launchable.mpmd_job import MPMDJob +from smartsim.launchable.mpmd_pair import MPMDPair from smartsim.settings import LaunchSettings pytestmark = pytest.mark.group_a diff --git a/tests/temp_tests/test_settings/conftest.py b/tests/temp_tests/test_settings/conftest.py index 90ffdd1416..8697b15108 100644 --- a/tests/temp_tests/test_settings/conftest.py +++ b/tests/temp_tests/test_settings/conftest.py @@ -27,7 +27,7 @@ import pytest from smartsim._core.utils.launcher import LauncherProtocol, create_job_id -from smartsim.settings.arguments import launchArguments as launch +from smartsim.settings.arguments import launch_arguments as launch @pytest.fixture diff --git a/tests/temp_tests/test_settings/test_batchSettings.py b/tests/temp_tests/test_settings/test_batchSettings.py index 38289e0f04..e7fd4b5ff7 100644 --- a/tests/temp_tests/test_settings/test_batchSettings.py +++ b/tests/temp_tests/test_settings/test_batchSettings.py @@ -26,7 +26,7 @@ import pytest from smartsim.settings import BatchSettings -from smartsim.settings.batchCommand import SchedulerType +from smartsim.settings.batch_command import SchedulerType pytestmark = pytest.mark.group_a diff --git a/tests/temp_tests/test_settings/test_launchSettings.py b/tests/temp_tests/test_settings/test_launchSettings.py index 6f2d3ee3ae..e06cf29395 100644 --- a/tests/temp_tests/test_settings/test_launchSettings.py +++ b/tests/temp_tests/test_settings/test_launchSettings.py @@ -29,7 +29,7 @@ import pytest from smartsim.settings import LaunchSettings -from smartsim.settings.launchCommand import LauncherType +from smartsim.settings.launch_command import LauncherType pytestmark = pytest.mark.group_a diff --git a/tests/temp_tests/test_settings/test_lsfLauncher.py b/tests/temp_tests/test_settings/test_lsfLauncher.py index 6074fc182a..549c2483b4 100644 --- a/tests/temp_tests/test_settings/test_lsfLauncher.py +++ b/tests/temp_tests/test_settings/test_lsfLauncher.py @@ -32,7 +32,7 @@ JsrunLaunchArguments, _as_jsrun_command, ) -from smartsim.settings.launchCommand import LauncherType +from smartsim.settings.launch_command import LauncherType pytestmark = pytest.mark.group_a diff --git a/tests/temp_tests/test_settings/test_lsfScheduler.py b/tests/temp_tests/test_settings/test_lsfScheduler.py index 59a1e7ccd8..afb73d45b7 100644 --- a/tests/temp_tests/test_settings/test_lsfScheduler.py +++ b/tests/temp_tests/test_settings/test_lsfScheduler.py @@ -26,7 +26,7 @@ import pytest from smartsim.settings import BatchSettings -from smartsim.settings.batchCommand import SchedulerType +from smartsim.settings.batch_command import SchedulerType pytestmark = pytest.mark.group_a diff --git a/tests/temp_tests/test_settings/test_pbsScheduler.py b/tests/temp_tests/test_settings/test_pbsScheduler.py index 1a866c1a19..642d115ac8 100644 --- a/tests/temp_tests/test_settings/test_pbsScheduler.py +++ b/tests/temp_tests/test_settings/test_pbsScheduler.py @@ -27,7 +27,7 @@ from smartsim.settings import BatchSettings from smartsim.settings.arguments.batch.pbs import QsubBatchArguments -from smartsim.settings.batchCommand import SchedulerType +from smartsim.settings.batch_command import SchedulerType pytestmark = pytest.mark.group_a diff --git a/tests/temp_tests/test_settings/test_slurmScheduler.py b/tests/temp_tests/test_settings/test_slurmScheduler.py index a6afcef161..94fa213da5 100644 --- a/tests/temp_tests/test_settings/test_slurmScheduler.py +++ b/tests/temp_tests/test_settings/test_slurmScheduler.py @@ -27,7 +27,7 @@ from smartsim.settings import BatchSettings from smartsim.settings.arguments.batch.slurm import SlurmBatchArguments -from smartsim.settings.batchCommand import SchedulerType +from smartsim.settings.batch_command import SchedulerType pytestmark = pytest.mark.group_a diff --git a/tests/test_ensemble.py b/tests/test_ensemble.py index 5198681fe1..3f0840711c 100644 --- a/tests/test_ensemble.py +++ b/tests/test_ensemble.py @@ -34,7 +34,7 @@ from smartsim.entity.ensemble import Ensemble from smartsim.entity.files import EntityFiles from smartsim.entity.strategies import ParamSet -from smartsim.settings.launchSettings import LaunchSettings +from smartsim.settings.launch_settings import LaunchSettings pytestmark = pytest.mark.group_a diff --git a/tests/test_experiment.py b/tests/test_experiment.py index aff32604c0..73657801d5 100644 --- a/tests/test_experiment.py +++ b/tests/test_experiment.py @@ -45,8 +45,8 @@ from smartsim.error import errors from smartsim.experiment import Experiment from smartsim.launchable import job -from smartsim.settings import launchSettings -from smartsim.settings.arguments import launchArguments +from smartsim.settings import launch_settings +from smartsim.settings.arguments import launch_arguments from smartsim.status import InvalidJobStatus, JobStatus pytestmark = pytest.mark.group_a @@ -91,7 +91,7 @@ def job_maker(monkeypatch): def iter_jobs(): for i in itertools.count(): - settings = launchSettings.LaunchSettings("local") + settings = launch_settings.LaunchSettings("local") monkeypatch.setattr(settings, "_arguments", MockLaunchArgs(i)) yield job.Job(EchoHelloWorldEntity(), settings) @@ -152,7 +152,7 @@ def stop_jobs(self, *ids): @dataclasses.dataclass(frozen=True) class LaunchRecord: - launch_args: launchArguments.LaunchArguments + launch_args: launch_arguments.LaunchArguments entity: entity.SmartSimEntity env: t.Mapping[str, str | None] path: str @@ -178,7 +178,7 @@ def from_job(cls, job: job.Job): return cls(args, entity, env, path, out, err) -class MockLaunchArgs(launchArguments.LaunchArguments): +class MockLaunchArgs(launch_arguments.LaunchArguments): """A `LaunchArguments` subclass that will evaluate as true with another if and only if they were initialized with the same id. In practice this class has no arguments to set. From 32f9d24c544417a3b7b45cab01b63ecc78031ba0 Mon Sep 17 00:00:00 2001 From: Amanda Richardson Date: Wed, 18 Sep 2024 14:22:39 -0700 Subject: [PATCH 4/5] issues fixed --- pyproject.toml | 8 ++++---- smartsim/_core/control/job_manager.py | 2 +- smartsim/_core/control/preview_renderer.py | 4 ++-- smartsim/_core/launcher/dragon/dragon_backend.py | 4 ++-- smartsim/_core/launcher/dragon/dragon_connector.py | 6 ++++-- smartsim/_core/launcher/dragon/dragon_launcher.py | 2 +- smartsim/_core/launcher/launcher.py | 3 +-- smartsim/_core/launcher/step/dragon_step.py | 10 +++++----- 8 files changed, 20 insertions(+), 19 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index c62a849be8..9d4e23c85b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -158,13 +158,13 @@ module = [ "smartsim._core.launcher.sge.*", "smartsim._core.launcher.slurm.*", "smartsim._core.launcher.step.*", - "smartsim._core.launcher.stepInfo", - "smartsim._core.launcher.stepMapping", - "smartsim._core.launcher.taskManager", + "smartsim._core.launcher.step_info", + "smartsim._core.launcher.step_mapping", + "smartsim._core.launcher.task_manager", "smartsim._core.utils.serialize", "smartsim._core.utils.telemetry.*", "smartsim.database.*", - "smartsim.settings.sgeSettings", + "smartsim.settings.sge_settings", "smartsim._core.control.controller_utils", "smartsim.entity.dbnode", ] diff --git a/smartsim/_core/control/job_manager.py b/smartsim/_core/control/job_manager.py index 7fe3d558be..5d59ad50e6 100644 --- a/smartsim/_core/control/job_manager.py +++ b/smartsim/_core/control/job_manager.py @@ -32,13 +32,13 @@ from threading import RLock, Thread from types import FrameType -from ..launcher.step import Step from ...database import FeatureStore from ...entity import EntitySequence, FSNode, SmartSimEntity from ...log import ContextThread, get_logger from ...status import TERMINAL_STATUSES, InvalidJobStatus, JobStatus from ..config import CONFIG from ..launcher import Launcher, LocalLauncher +from ..launcher.step import Step from ..utils.network import get_ip_from_host from .job import Job, JobEntity diff --git a/smartsim/_core/control/preview_renderer.py b/smartsim/_core/control/preview_renderer.py index 5d06a12a07..17d9ceac15 100644 --- a/smartsim/_core/control/preview_renderer.py +++ b/smartsim/_core/control/preview_renderer.py @@ -33,10 +33,10 @@ import jinja2.utils as u from jinja2 import pass_eval_context -from ..config import CONFIG -from . import Manifest from ...error.errors import PreviewFormatError from ...log import get_logger +from ..config import CONFIG +from . import Manifest from .job import Job logger = get_logger(__name__) diff --git a/smartsim/_core/launcher/dragon/dragon_backend.py b/smartsim/_core/launcher/dragon/dragon_backend.py index a0d6e71f25..7d77aaaacc 100644 --- a/smartsim/_core/launcher/dragon/dragon_backend.py +++ b/smartsim/_core/launcher/dragon/dragon_backend.py @@ -45,6 +45,8 @@ # pylint: enable=import-error # isort: on +from ....log import get_logger +from ....status import TERMINAL_STATUSES, JobStatus from ...config import get_config from ...schemas import ( DragonHandshakeRequest, @@ -61,8 +63,6 @@ DragonUpdateStatusResponse, ) from ...utils.helpers import create_short_id_str -from ....log import get_logger -from ....status import TERMINAL_STATUSES, JobStatus logger = get_logger(__name__) diff --git a/smartsim/_core/launcher/dragon/dragon_connector.py b/smartsim/_core/launcher/dragon/dragon_connector.py index c493c7f897..7ff4cdc1c8 100644 --- a/smartsim/_core/launcher/dragon/dragon_connector.py +++ b/smartsim/_core/launcher/dragon/dragon_connector.py @@ -42,7 +42,6 @@ import zmq import zmq.auth.thread -from . import dragon_sockets from ....error.errors import SmartSimError from ....log import get_logger from ...config import get_config @@ -56,6 +55,7 @@ DragonShutdownRequest, ) from ...utils.network import find_free_port, get_best_interface_and_address +from . import dragon_sockets if t.TYPE_CHECKING: from typing_extensions import Self @@ -224,7 +224,9 @@ def _start_connector_socket(self, socket_addr: str) -> zmq.Socket[t.Any]: connector_socket: t.Optional[zmq.Socket[t.Any]] = None self._reset_timeout(config.dragon_server_startup_timeout) self._get_new_authenticator(-1) - connector_socket = dragon_sockets.get_secure_socket(self._context, zmq.REP, True) + connector_socket = dragon_sockets.get_secure_socket( + self._context, zmq.REP, True + ) logger.debug(f"Binding connector to {socket_addr}") connector_socket.bind(socket_addr) if connector_socket is None: diff --git a/smartsim/_core/launcher/dragon/dragon_launcher.py b/smartsim/_core/launcher/dragon/dragon_launcher.py index 552c2f1053..d540ce0813 100644 --- a/smartsim/_core/launcher/dragon/dragon_launcher.py +++ b/smartsim/_core/launcher/dragon/dragon_launcher.py @@ -34,7 +34,6 @@ from smartsim.error import errors from smartsim.types import LaunchedJobID -from ..step_mapping import StepMap from ....error import LauncherError, SmartSimError from ....log import get_logger from ....settings import ( @@ -59,6 +58,7 @@ from ..slurm.slurm_launcher import SlurmLauncher from ..step import DragonBatchStep, DragonStep, LocalStep, Step from ..step_info import StepInfo +from ..step_mapping import StepMap from .dragon_connector import DragonConnector, _SchemaT if t.TYPE_CHECKING: diff --git a/smartsim/_core/launcher/launcher.py b/smartsim/_core/launcher/launcher.py index 722c64904e..5b2894cf35 100644 --- a/smartsim/_core/launcher/launcher.py +++ b/smartsim/_core/launcher/launcher.py @@ -27,13 +27,12 @@ import abc import typing as t -from .step_mapping import StepMap from ...entity import SmartSimEntity from ...error import AllocationError, LauncherError, SSUnsupportedError from ...settings import SettingsBase from .step import Step from .step_info import StepInfo, UnmanagedStepInfo -from .step_mapping import StepMapping +from .step_mapping import StepMap, StepMapping from .task_manager import TaskManager diff --git a/smartsim/_core/launcher/step/dragon_step.py b/smartsim/_core/launcher/step/dragon_step.py index e90d892e76..26864e89fd 100644 --- a/smartsim/_core/launcher/step/dragon_step.py +++ b/smartsim/_core/launcher/step/dragon_step.py @@ -30,11 +30,6 @@ import sys import typing as t -from ...schemas.dragon_requests import ( - DragonRunPolicy, - DragonRunRequest, - request_registry, -) from ....error.errors import SSUnsupportedError from ....log import get_logger from ....settings import ( @@ -43,6 +38,11 @@ SbatchSettings, Singularity, ) +from ...schemas.dragon_requests import ( + DragonRunPolicy, + DragonRunRequest, + request_registry, +) from .step import Step logger = get_logger(__name__) From f2185984013a747230c386a7b1e2b30beace730d Mon Sep 17 00:00:00 2001 From: Amanda Richardson Date: Wed, 18 Sep 2024 14:36:41 -0700 Subject: [PATCH 5/5] fix failing test --- tests/test_shell_launcher.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_shell_launcher.py b/tests/test_shell_launcher.py index 2614a68955..f371d793f1 100644 --- a/tests/test_shell_launcher.py +++ b/tests/test_shell_launcher.py @@ -156,7 +156,7 @@ def test_shell_launcher_start_calls_popen( ): """Test that the process leading up to the shell launcher popen call was correct""" with unittest.mock.patch( - "smartsim._core.shell.shellLauncher.sp.Popen" + "smartsim._core.shell.shell_launcher.sp.Popen" ) as mock_open: _ = shell_launcher.start(shell_cmd) mock_open.assert_called_once() @@ -167,7 +167,7 @@ def test_shell_launcher_start_calls_popen_with_value( ): """Test that popen was called with correct values""" with unittest.mock.patch( - "smartsim._core.shell.shellLauncher.sp.Popen" + "smartsim._core.shell.shell_launcher.sp.Popen" ) as mock_open: _ = shell_launcher.start(shell_cmd) mock_open.assert_called_once_with(