experiments/pyexps + experiments/simbricks/orchestration/nodeconfig : fix...

experiments/pyexps + experiments/simbricks/orchestration/nodeconfig : fix experiment environment imports

experiments/pyexps/farmem.py

@@ -20,10 +20,10 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+import simbricks.orchestration.experiment.experiment_environment as env
 import simbricks.orchestration.experiments as exp
 import simbricks.orchestration.nodeconfig as nodec
 import simbricks.orchestration.simulators as sim
-from simbricks.orchestration.experiment.experiment_environment import ExpEnv
 
 experiments = []
 
@@ -35,9 +35,12 @@ class FarMemTest(nodec.AppConfig):
         self.size = size
 
     # pylint: disable=consider-using-with
-    def config_files(self, env: ExpEnv):
-        m = {'farmem.ko': open(f'{env.repodir}/images/farmem/farmem.ko', 'rb')}
-        return {**m, **super().config_files(env)}
+    def config_files(self, environment: env.ExpEnv):
+        m = {
+            'farmem.ko':
+                open(f'{environment.repodir}/images/farmem/farmem.ko', 'rb')
+        }
+        return {**m, **super().config_files(environment)}
 
     def run_cmds(self, node):
         return [

experiments/pyexps/memswitch.py

@@ -20,10 +20,10 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+import simbricks.orchestration.experiment.experiment_environment as env
 import simbricks.orchestration.experiments as exp
 import simbricks.orchestration.nodeconfig as node
 import simbricks.orchestration.simulators as sim
-from simbricks.orchestration.experiment.experiment_environment import ExpEnv
 
 experiments = []
 num_of_netmem = [1, 2, 3, 4]
@@ -46,10 +46,13 @@ class MemTest(node.AppConfig):
         self.disaggregated = disaggregated
         self.time_limit = time_limit
 
-    def config_files(self, env: ExpEnv):
+    def config_files(self, environment: env.ExpEnv):
+        m = {
+            'farmem.ko':
                 # pylint: disable-next=consider-using-with
-        m = {'farmem.ko': open(f'{env.repodir}/images/farmem/farmem.ko', 'rb')}
-        return {**m, **super().config_files(env)}
+                open(f'{environment.repodir}/images/farmem/farmem.ko', 'rb')
+        }
+        return {**m, **super().config_files(environment)}
 
     def run_cmds(self, _):
         commands = [

experiments/pyexps/memswitch_large.py

@@ -20,10 +20,10 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+import simbricks.orchestration.experiment.experiment_environment as env
 import simbricks.orchestration.experiments as exp
 import simbricks.orchestration.nodeconfig as node
 import simbricks.orchestration.simulators as sim
-from simbricks.orchestration.experiment.experiment_environment import ExpEnv
 
 experiments = []
 num_mem_lat = [500, 100, 20]  #ns
@@ -47,10 +47,13 @@ class MemTest(node.AppConfig):
         self.disaggregated = disaggregated
         self.time_limit = time_limit
 
-    def config_files(self, env: ExpEnv):
+    def config_files(self, environment: env.ExpEnv):
+        m = {
+            'farmem.ko':
                 # pylint: disable-next=consider-using-with
-        m = {'farmem.ko': open(f'{env.repodir}/images/farmem/farmem.ko', 'rb')}
-        return {**m, **super().config_files(env)}
+                open(f'{environment.repodir}/images/farmem/farmem.ko', 'rb')
+        }
+        return {**m, **super().config_files(environment)}
 
     def run_cmds(self, _):
         commands = []

experiments/pyexps/sysbench_memory.py

@@ -25,10 +25,10 @@ Runs sysbench memory benchmarks for different memory configurations.
 Used to compare latency and throughput of disaggregated memory to local one.
 """
 
+import simbricks.orchestration.experiment.experiment_environment as env
 import simbricks.orchestration.experiments as exp
 import simbricks.orchestration.nodeconfig as node
 import simbricks.orchestration.simulators as sim
-from simbricks.orchestration.experiment.experiment_environment import ExpEnv
 
 host_types = ['gem5', 'simics']
 mem_types = ['local', 'basicmem']
@@ -61,9 +61,12 @@ class SysbenchMemoryBenchmark(node.AppConfig):
         """Number of cores to run the benchmark on in parallel."""
 
     # pylint: disable=consider-using-with
-    def config_files(self, env: ExpEnv):
-        m = {'farmem.ko': open(f'{env.repodir}/images/farmem/farmem.ko', 'rb')}
-        return {**m, **super().config_files(env)}
+    def config_files(self, environment: env.ExpEnv):
+        m = {
+            'farmem.ko':
+                open(f'{environment.repodir}/images/farmem/farmem.ko', 'rb')
+        }
+        return {**m, **super().config_files(environment)}
 
     def run_cmds(self, _):
         cmds = [

experiments/simbricks/orchestration/nodeconfig.py

@@ -26,7 +26,7 @@ import io
 import tarfile
 import typing as tp
 
-from simbricks.orchestration.experiment.experiment_environment import ExpEnv
+import simbricks.orchestration.experiment.experiment_environment as env
 
 
 class AppConfig():
@@ -47,7 +47,7 @@ class AppConfig():
         return []
 
     # pylint: disable=unused-argument
-    def config_files(self, env: ExpEnv) -> tp.Dict[str, tp.IO]:
+    def config_files(self, environment: env.ExpEnv) -> tp.Dict[str, tp.IO]:
         """
         Additional files to put inside the node, which are mounted under
         `/tmp/guest/`.
@@ -123,7 +123,7 @@ class NodeConfig():
             self.run_cmds() + self.cleanup_cmds() + exit_es
         return '\n'.join(es)
 
-    def make_tar(self, env: ExpEnv, path: str) -> None:
+    def make_tar(self, environment: env.ExpEnv, path: str) -> None:
         with tarfile.open(path, 'w:') as tar:
             # add main run script
             cfg_i = tarfile.TarInfo('guest/run.sh')
@@ -136,7 +136,7 @@ class NodeConfig():
             cfg_f.close()
 
             # add additional config files
-            for (n, f) in self.config_files(env).items():
+            for (n, f) in self.config_files(environment).items():
                 f_i = tarfile.TarInfo('guest/' + n)
                 f_i.mode = 0o777
                 f.seek(0, io.SEEK_END)
@@ -168,7 +168,7 @@ class NodeConfig():
         return []
 
     # pylint: disable=unused-argument
-    def config_files(self, env: ExpEnv) -> tp.Dict[str, tp.IO]:
+    def config_files(self, environment: env.ExpEnv) -> tp.Dict[str, tp.IO]:
         """
         Additional files to put inside the node, which are mounted under
         `/tmp/guest/`.
@@ -176,7 +176,7 @@ class NodeConfig():
         Specified in the following format: `filename_inside_node`:
         `IO_handle_of_file`
         """
-        return self.app.config_files(env)
+        return self.app.config_files(environment)
 
     def strfile(self, s: str) -> io.BytesIO:
         """
@@ -228,9 +228,12 @@ class CorundumLinuxNode(LinuxNode):
         self.drivers.append('/tmp/guest/mqnic.ko')
 
     # pylint: disable=consider-using-with
-    def config_files(self, env: ExpEnv) -> tp.Dict[str, tp.IO]:
-        m = {'mqnic.ko': open(f'{env.repodir}/images/mqnic/mqnic.ko', 'rb')}
-        return {**m, **super().config_files(env)}
+    def config_files(self, environment: env.ExpEnv) -> tp.Dict[str, tp.IO]:
+        m = {
+            'mqnic.ko':
+                open(f'{environment.repodir}/images/mqnic/mqnic.ko', 'rb')
+        }
+        return {**m, **super().config_files(environment)}
 
 
 class E1000LinuxNode(LinuxNode):
@@ -272,7 +275,7 @@ class MtcpNode(NodeConfig):
             f'ip addr add {self.ip}/{self.prefix} dev dpdk0'
         ]
 
-    def config_files(self, env: ExpEnv) -> tp.Dict[str, tp.IO]:
+    def config_files(self, environment: env.ExpEnv) -> tp.Dict[str, tp.IO]:
         m = {
             'mtcp.conf':
                 self.strfile(
@@ -290,7 +293,7 @@ class MtcpNode(NodeConfig):
                 )
         }
 
-        return {**m, **super().config_files(env)}
+        return {**m, **super().config_files(environment)}
 
 
 class TASNode(NodeConfig):