Skip to content

Commit

Permalink
last
Browse files Browse the repository at this point in the history
  • Loading branch information
amandarichardsonn committed Sep 18, 2024
1 parent 8934b3e commit 4710ad0
Show file tree
Hide file tree
Showing 39 changed files with 59 additions and 59 deletions.
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
2 changes: 1 addition & 1 deletion smartsim/entity/ensemble.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
4 changes: 2 additions & 2 deletions smartsim/entity/entity.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
12 changes: 6 additions & 6 deletions smartsim/launchable/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion smartsim/launchable/job.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions smartsim/settings/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

Expand Down
4 changes: 2 additions & 2 deletions smartsim/settings/arguments/__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 .batchArguments import BatchArguments
from .launchArguments import LaunchArguments
from .batch_arguments import BatchArguments
from .launch_arguments import LaunchArguments

__all__ = ["LaunchArguments", "BatchArguments"]
4 changes: 2 additions & 2 deletions smartsim/settings/arguments/batch/lsf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__)

Expand Down
4 changes: 2 additions & 2 deletions smartsim/settings/arguments/batch/pbs.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__)

Expand Down
4 changes: 2 additions & 2 deletions smartsim/settings/arguments/batch/slurm.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__)

Expand Down
4 changes: 2 additions & 2 deletions smartsim/settings/arguments/launch/dragon.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__)

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

Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions tests/temp_tests/test_colocatedJobGroup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

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

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

Expand Down
6 changes: 3 additions & 3 deletions tests/temp_tests/test_jobGroup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions tests/temp_tests/test_launchable.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/temp_tests/test_settings/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/temp_tests/test_settings/test_batchSettings.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion tests/temp_tests/test_settings/test_launchSettings.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion tests/temp_tests/test_settings/test_lsfLauncher.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion tests/temp_tests/test_settings/test_lsfScheduler.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion tests/temp_tests/test_settings/test_pbsScheduler.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion tests/temp_tests/test_settings/test_slurmScheduler.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion tests/test_ensemble.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions tests/test_experiment.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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
Expand All @@ -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.
Expand Down

0 comments on commit 4710ad0

Please sign in to comment.