Commit 03b2c4e7 authored by Jonas Kaufmann's avatar Jonas Kaufmann Committed by Antoine Kaufmann
Browse files

create simbricks.orchestration python package (#14)

I basically did the following:
`mkdir experiments/simbricks/orchestration`
`mv experiments/simbricks/* experiments/simbricks/orchestration/`

Additionally, imports and paths had to be adjusted.
parent f519a49f
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
import simbricks.experiments as exp import simbricks.orchestration.experiments as exp
import simbricks.nodeconfig as node import simbricks.orchestration.nodeconfig as node
import simbricks.simulators as sim import simbricks.orchestration.simulators as sim
from simbricks.simulator_utils import create_basic_hosts from simbricks.orchestration.simulator_utils import create_basic_hosts
# iperf UDP Load Scalability test # iperf UDP Load Scalability test
# naming convention following host-nic-net # naming convention following host-nic-net
......
...@@ -24,13 +24,13 @@ include mk/subdir_pre.mk ...@@ -24,13 +24,13 @@ include mk/subdir_pre.mk
lint-python: lint-python:
pylint -d missing-module-docstring,missing-class-docstring \ pylint -d missing-module-docstring,missing-class-docstring \
--ignore-paths experiments/simbricks/utils/graphlib.py \ --ignore-paths experiments/simbricks/orchestration/utils/graphlib.py \
experiments/ results/ experiments/ results/
typecheck-python: typecheck-python:
pytype -j 0 --keep-going \ pytype -j 0 --keep-going \
--exclude experiments/pyexps/ae/ \ --exclude experiments/pyexps/ae/ \
experiments/simbricks/utils/graphlib.py \ experiments/simbricks/orchestration/utils/graphlib.py \
-- experiments/ results/ -- experiments/ results/
include mk/subdir_post.mk include mk/subdir_post.mk
...@@ -32,13 +32,19 @@ import sys ...@@ -32,13 +32,19 @@ import sys
import typing as tp import typing as tp
from signal import SIGINT, signal from signal import SIGINT, signal
from simbricks.exectools import LocalExecutor, RemoteExecutor from simbricks.orchestration.exectools import LocalExecutor, RemoteExecutor
from simbricks.experiment.experiment_environment import ExpEnv from simbricks.orchestration.experiment.experiment_environment import ExpEnv
from simbricks.experiments import DistributedExperiment, Experiment from simbricks.orchestration.experiments import (
from simbricks.runtime.common import Run DistributedExperiment, Experiment
from simbricks.runtime.distributed import DistributedSimpleRuntime, auto_dist )
from simbricks.runtime.local import LocalParallelRuntime, LocalSimpleRuntime from simbricks.orchestration.runtime.common import Run
from simbricks.runtime.slurm import SlurmRuntime from simbricks.orchestration.runtime.distributed import (
DistributedSimpleRuntime, auto_dist
)
from simbricks.orchestration.runtime.local import (
LocalParallelRuntime, LocalSimpleRuntime
)
from simbricks.orchestration.runtime.slurm import SlurmRuntime
# pylint: disable=redefined-outer-name # pylint: disable=redefined-outer-name
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
import json import json
import time import time
from simbricks.experiments import Experiment from simbricks.orchestration.experiments import Experiment
class ExpOutput(object): class ExpOutput(object):
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
import itertools import itertools
import typing as tp import typing as tp
from simbricks.proxy import NetProxyConnecter, NetProxyListener from simbricks.orchestration.proxy import NetProxyConnecter, NetProxyListener
from simbricks.simulators import ( from simbricks.orchestration.simulators import (
HostSim, I40eMultiNIC, NetSim, NICSim, PCIDevSim, Simulator HostSim, I40eMultiNIC, NetSim, NICSim, PCIDevSim, Simulator
) )
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
import typing as tp import typing as tp
from simbricks.simulators import NICSim, Simulator from simbricks.orchestration.simulators import NICSim, Simulator
class SimProxy(Simulator): class SimProxy(Simulator):
......
...@@ -27,12 +27,16 @@ import traceback ...@@ -27,12 +27,16 @@ import traceback
import typing as tp import typing as tp
from abc import ABC, abstractmethod from abc import ABC, abstractmethod
from simbricks.exectools import Component, Executor, SimpleComponent from simbricks.orchestration.exectools import (
from simbricks.experiment.experiment_environment import ExpEnv Component, Executor, SimpleComponent
from simbricks.experiment.experiment_output import ExpOutput )
from simbricks.experiments import DistributedExperiment, Experiment from simbricks.orchestration.experiment.experiment_environment import ExpEnv
from simbricks.simulators import Simulator from simbricks.orchestration.experiment.experiment_output import ExpOutput
from simbricks.utils import graphlib from simbricks.orchestration.experiments import (
DistributedExperiment, Experiment
)
from simbricks.orchestration.simulators import Simulator
from simbricks.orchestration.utils import graphlib
class ExperimentBaseRunner(ABC): class ExperimentBaseRunner(ABC):
......
...@@ -20,7 +20,11 @@ ...@@ -20,7 +20,11 @@
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
from simbricks.runtime.common import Run, Runtime from simbricks.orchestration.runtime.common import Run, Runtime
from simbricks.runtime.distributed import DistributedSimpleRuntime, auto_dist from simbricks.orchestration.runtime.distributed import (
from simbricks.runtime.local import LocalParallelRuntime, LocalSimpleRuntime DistributedSimpleRuntime, auto_dist
from simbricks.runtime.slurm import SlurmRuntime )
from simbricks.orchestration.runtime.local import (
LocalParallelRuntime, LocalSimpleRuntime
)
from simbricks.orchestration.runtime.slurm import SlurmRuntime
...@@ -28,10 +28,10 @@ import shutil ...@@ -28,10 +28,10 @@ import shutil
import typing as tp import typing as tp
from abc import ABCMeta, abstractmethod from abc import ABCMeta, abstractmethod
from simbricks.exectools import LocalExecutor from simbricks.orchestration.exectools import LocalExecutor
from simbricks.experiment.experiment_environment import ExpEnv from simbricks.orchestration.experiment.experiment_environment import ExpEnv
from simbricks.experiment.experiment_output import ExpOutput from simbricks.orchestration.experiment.experiment_output import ExpOutput
from simbricks.experiments import Experiment from simbricks.orchestration.experiments import Experiment
class Run(object): class Run(object):
......
...@@ -24,11 +24,13 @@ import asyncio ...@@ -24,11 +24,13 @@ import asyncio
import pathlib import pathlib
import typing as tp import typing as tp
from simbricks import proxy from simbricks.orchestration import proxy
from simbricks.exectools import Executor from simbricks.orchestration.exectools import Executor
from simbricks.experiments import DistributedExperiment, Experiment from simbricks.orchestration.experiments import (
from simbricks.runners import ExperimentDistributedRunner DistributedExperiment, Experiment
from simbricks.runtime.common import Run, Runtime )
from simbricks.orchestration.runners import ExperimentDistributedRunner
from simbricks.orchestration.runtime.common import Run, Runtime
class DistributedSimpleRuntime(Runtime): class DistributedSimpleRuntime(Runtime):
......
...@@ -24,9 +24,9 @@ import asyncio ...@@ -24,9 +24,9 @@ import asyncio
import pathlib import pathlib
import typing as tp import typing as tp
from simbricks import exectools from simbricks.orchestration import exectools
from simbricks.runners import ExperimentSimpleRunner from simbricks.orchestration.runners import ExperimentSimpleRunner
from simbricks.runtime.common import Run, Runtime from simbricks.orchestration.runtime.common import Run, Runtime
class LocalSimpleRuntime(Runtime): class LocalSimpleRuntime(Runtime):
......
...@@ -27,7 +27,7 @@ import pickle ...@@ -27,7 +27,7 @@ import pickle
import re import re
import typing as tp import typing as tp
from simbricks.runtime.common import Run, Runtime from simbricks.orchestration.runtime.common import Run, Runtime
class SlurmRuntime(Runtime): class SlurmRuntime(Runtime):
......
...@@ -23,9 +23,11 @@ ...@@ -23,9 +23,11 @@
import typing as tp import typing as tp
from simbricks.experiments import Experiment from simbricks.orchestration.experiments import Experiment
from simbricks.nodeconfig import AppConfig, NodeConfig from simbricks.orchestration.nodeconfig import AppConfig, NodeConfig
from simbricks.simulators import HostSim, I40eMultiNIC, NetSim, NICSim from simbricks.orchestration.simulators import (
HostSim, I40eMultiNIC, NetSim, NICSim
)
def create_basic_hosts( def create_basic_hosts(
......
...@@ -26,8 +26,8 @@ from __future__ import annotations ...@@ -26,8 +26,8 @@ from __future__ import annotations
import math import math
import typing as tp import typing as tp
from simbricks.experiment.experiment_environment import ExpEnv from simbricks.orchestration.experiment.experiment_environment import ExpEnv
from simbricks.nodeconfig import NodeConfig from simbricks.orchestration.nodeconfig import NodeConfig
class Simulator(object): class Simulator(object):
......
# Copyright 2022 Max Planck Institute for Software Systems, and
# National University of Singapore
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
# "Software"), to deal in the Software without restriction, including
# without limitation the rights to use, copy, modify, merge, publish,
# distribute, sublicense, and/or sell copies of the Software, and to
# permit persons to whom the Software is furnished to do so, subject to
# the following conditions:
#
# The above copyright notice and this permission notice shall be
# included in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment