Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Camel Case to Snake Case #711

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/tutorials/doc_examples/experiment_doc_examples/exp.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]
Expand Down
4 changes: 2 additions & 2 deletions smartsim/_core/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
2 changes: 1 addition & 1 deletion smartsim/_core/arguments/shell.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__)

Expand Down
4 changes: 2 additions & 2 deletions smartsim/_core/commands/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .commandList import CommandList
from .command_list import CommandList


class LaunchCommands:
Expand Down
2 changes: 1 addition & 1 deletion smartsim/_core/control/controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@
from threading import RLock, Thread
from types import FrameType

from ..._core.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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
import jinja2.utils as u
from jinja2 import pass_eval_context

from ..._core.config import CONFIG
from ..._core.control 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__)
Expand Down
14 changes: 7 additions & 7 deletions smartsim/_core/entrypoints/dragon.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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}")

Expand Down Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion smartsim/_core/entrypoints/dragon_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
10 changes: 5 additions & 5 deletions smartsim/_core/launcher/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
# 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
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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,10 @@

# pylint: enable=import-error
# isort: on
from ...._core.config import get_config
from ...._core.schemas import (
from ....log import get_logger
from ....status import TERMINAL_STATUSES, JobStatus
from ...config import get_config
from ...schemas import (

Check warning on line 51 in smartsim/_core/launcher/dragon/dragon_backend.py

View check run for this annotation

Codecov / codecov/patch

smartsim/_core/launcher/dragon/dragon_backend.py#L48-L51

Added lines #L48 - L51 were not covered by tests
DragonHandshakeRequest,
DragonHandshakeResponse,
DragonRequest,
Expand All @@ -60,9 +62,7 @@
DragonUpdateStatusRequest,
DragonUpdateStatusResponse,
)
from ...._core.utils.helpers import create_short_id_str
from ....log import get_logger
from ....status import TERMINAL_STATUSES, JobStatus
from ...utils.helpers import create_short_id_str

Check warning on line 65 in smartsim/_core/launcher/dragon/dragon_backend.py

View check run for this annotation

Codecov / codecov/patch

smartsim/_core/launcher/dragon/dragon_backend.py#L65

Added line #L65 was not covered by tests

logger = get_logger(__name__)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
import zmq
import zmq.auth.thread

from ...._core.launcher.dragon import dragonSockets
from ....error.errors import SmartSimError
from ....log import get_logger
from ...config import get_config
Expand All @@ -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
Expand Down Expand Up @@ -113,7 +113,7 @@
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(

Check warning on line 116 in smartsim/_core/launcher/dragon/dragon_connector.py

View check run for this annotation

Codecov / codecov/patch

smartsim/_core/launcher/dragon/dragon_connector.py#L116

Added line #L116 was not covered by tests
self._context, zmq.REQ, False
)
self._dragon_head_socket.connect(address)
Expand Down Expand Up @@ -176,7 +176,7 @@
except zmq.Again:
logger.debug("Could not stop authenticator")
try:
self._authenticator = dragonSockets.get_authenticator(
self._authenticator = dragon_sockets.get_authenticator(

Check warning on line 179 in smartsim/_core/launcher/dragon/dragon_connector.py

View check run for this annotation

Codecov / codecov/patch

smartsim/_core/launcher/dragon/dragon_connector.py#L179

Added line #L179 was not covered by tests
self._context, timeout
)
return
Expand Down Expand Up @@ -224,7 +224,9 @@
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(

Check warning on line 227 in smartsim/_core/launcher/dragon/dragon_connector.py

View check run for this annotation

Codecov / codecov/patch

smartsim/_core/launcher/dragon/dragon_connector.py#L227

Added line #L227 was not covered by tests
self._context, zmq.REP, True
)
logger.debug(f"Binding connector to {socket_addr}")
connector_socket.bind(socket_addr)
if connector_socket is None:
Expand Down Expand Up @@ -353,7 +355,7 @@
start_new_session=True,
)

server = dragonSockets.as_server(connector_socket)
server = dragon_sockets.as_server(connector_socket)

Check warning on line 358 in smartsim/_core/launcher/dragon/dragon_connector.py

View check run for this annotation

Codecov / codecov/patch

smartsim/_core/launcher/dragon/dragon_connector.py#L358

Added line #L358 was not covered by tests
logger.debug(f"Listening to {socket_addr}")
request = _assert_schema_type(server.recv(), DragonBootstrapRequest)
server.send(
Expand Down Expand Up @@ -460,7 +462,7 @@
send_flags: int = 0,
recv_flags: int = 0,
) -> DragonResponse:
client = dragonSockets.as_client(socket)
client = dragon_sockets.as_client(socket)

Check warning on line 465 in smartsim/_core/launcher/dragon/dragon_connector.py

View check run for this annotation

Codecov / codecov/patch

smartsim/_core/launcher/dragon/dragon_connector.py#L465

Added line #L465 was not covered by tests
with DRG_LOCK:
logger.debug(f"Sending {type(request).__name__}: {request}")
client.send(request, send_flags)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,10 @@
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 ...._core.launcher.stepMapping import StepMap
from ....error import LauncherError, SmartSimError
from ....log import get_logger
from ....settings import (
Expand All @@ -55,11 +54,12 @@
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 .dragonConnector import DragonConnector, _SchemaT
from ..step_info import StepInfo
from ..step_mapping import StepMap
from .dragon_connector import DragonConnector, _SchemaT

if t.TYPE_CHECKING:
from typing_extensions import Self
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions smartsim/_core/launcher/launcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,13 @@
import abc
import typing as t

from ..._core.launcher.stepMapping 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 StepMap, StepMapping
from .task_manager import TaskManager


class Launcher(abc.ABC): # pragma: no cover
Expand Down
6 changes: 3 additions & 3 deletions smartsim/_core/launcher/local/local.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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__)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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__)

Expand Down
Loading
Loading