symphony: fix some imports

symphony/local/simbricks/local/__main__.py

@@ -33,15 +33,14 @@ import pickle
 import signal
 import sys
 
-from simbricks.orchestration import exectools
 
 from simbricks.orchestration.simulation import base as sim_base
 from simbricks.orchestration.simulation import output as sim_out
 from simbricks.orchestration.instantiation import base as inst_base
-from simbricks.orchestration.runtime.runs import base as runs_base
-from simbricks.orchestration.runtime.runs import base as runs_base
-from simbricks.orchestration.runtime.runs import local as rt_local
-from simbricks.orchestration.runtime import command_executor
+from simbricks.runtime.runs import base as runs_base
+from simbricks.runtime.runs import base as runs_base
+from simbricks.runtime.runs import local as rt_local
+from simbricks.runtime import command_executor
 
 
 def parse_args() -> argparse.Namespace:
@@ -230,7 +229,7 @@ def parse_args() -> argparse.Namespace:
     return parser.parse_args()
 
 
-def load_executors(path: str) -> list[exectools.Executor]:
+def load_executors(path: str) -> list[command_executor.Executor]:
     """Load hosts list from json file and return list of executors."""
     with open(path, "r", encoding="utf-8") as f:
         hosts = json.load(f)

symphony/orchestration/simbricks/orchestration/helpers/system.py

@@ -22,7 +22,7 @@
 
 
 from simbricks.orchestration import system
-from simbricks.orchestration.utils import base as utils_base
+from simbricks.utils import base as utils_base
 
 
 def connect_host_and_device(

symphony/orchestration/simbricks/orchestration/simulation/output.py

@@ -26,7 +26,7 @@ import json
 import time
 import pathlib
 import typing
-from simbricks.orchestration.runtime_new import command_executor
+from simbricks.runtime import command_executor
 
 if typing.TYPE_CHECKING:
     from simbricks.orchestration.simulation import base as sim_base

symphony/runner/simbricks/runner/__main__.py

@@ -23,11 +23,11 @@
 import asyncio
 import json
 
-from simbricks.orchestration.runtime_new import simulation_executor
+from simbricks.runtime import simulation_executor
 from simbricks.orchestration.instantiation import base as inst_base
 from simbricks.orchestration.system import base as sys_base
 from simbricks.orchestration.simulation import base as sim_base
-from simbricks.orchestration.runtime_new import command_executor
+from simbricks.runtime import command_executor
 from simbricks import client
 
 verbose = True

symphony/runtime/simbricks/runtime/runs/__init__.py

@@ -20,11 +20,11 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-from simbricks.orchestration.runtime_new.runs.base import Run, Runtime
-from simbricks.orchestration.runtime_new.runs.distributed import (
+from simbricks.runtime.runs.base import Run, Runtime
+from simbricks.runtime.runs.distributed import (
     DistributedSimpleRuntime, auto_dist
 )
-from simbricks.orchestration.runtime_new.runs.local import (
+from simbricks.runtime.runs.local import (
     LocalParallelRuntime, LocalSimpleRuntime
 )
-from simbricks.orchestration.runtime_new.runs.slurm import SlurmRuntime
+from simbricks.runtime.runs.slurm import SlurmRuntime

symphony/runtime/simbricks/runtime/runs/distributed.py

@@ -26,9 +26,9 @@ import asyncio
 import typing as tp
 
 from simbricks.orchestration import proxy
-from simbricks.orchestration.runtime_new import simulation_executor
-from simbricks.orchestration.runtime_new import command_executor
-from simbricks.orchestration.runtime_new.runs import base as run_base
+from simbricks.runtime import simulation_executor
+from simbricks.runtime import command_executor
+from simbricks.runtime.runs import base as run_base
 from simbricks.orchestration.simulation import base as sim_base
 
 

symphony/runtime/simbricks/runtime/runs/local.py

@@ -24,9 +24,9 @@ from __future__ import annotations
 
 import asyncio
 
-from simbricks.orchestration.runtime_new import simulation_executor
-from simbricks.orchestration.runtime_new import command_executor
-from simbricks.orchestration.runtime_new.runs import base as run_base
+from simbricks.runtime import simulation_executor
+from simbricks.runtime import command_executor
+from simbricks.runtime.runs import base as run_base
 from simbricks.orchestration.instantiation import base as inst_base
 
 

symphony/runtime/simbricks/runtime/runs/slurm.py

@@ -29,7 +29,7 @@ import pickle
 import re
 import typing as tp
 
-from simbricks.orchestration.runtime_new.runs import base as run_base
+from simbricks.runtime.runs import base as run_base
 
 
 class SlurmRuntime(run_base.Runtime):

symphony/runtime/simbricks/runtime/simulation_executor.py

@@ -28,12 +28,11 @@ import shlex
 import traceback
 import abc
 
-from simbricks.orchestration.utils import graphlib
-
 from simbricks.orchestration.simulation import output
 from simbricks.orchestration.simulation import base as sim_base
 from simbricks.orchestration.instantiation import base as inst_base
-from simbricks.orchestration.runtime_new import command_executor
+from simbricks.runtime import command_executor
+from simbricks.utils import graphlib
 
 
 class SimulationBaseRunner(abc.ABC):