fix rebase bugs

ankona · Oct 19, 2023 · e841d9d · e841d9d
1 parent edda5d7
commit e841d9d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/smartsim/_core/control/controller.py b/smartsim/_core/control/controller.py
@@ -38,7 +38,6 @@
 import threading
 import time
 import typing as t
-from os import environ
 
 from smartredis import Client, ConfigOptions
 

diff --git a/smartsim/_core/control/jobmanager.py b/smartsim/_core/control/jobmanager.py
@@ -25,13 +25,15 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+import itertools
 import time
 import typing as t
 from collections import ChainMap
 from logging import Logger
 from threading import Thread, RLock
 from types import FrameType
 
+from ..._core.utils.network import get_ip_from_host
 from ...database import Orchestrator
 from ...entity import DBNode, SmartSimEntity, EntitySequence
 from ...error import SmartSimError