experiments/simbricks/orchestration/nodeconfig : added ExpEnv variable to...

experiments/simbricks/orchestration/nodeconfig : added ExpEnv variable to AppConfig.config_files method

experiments/pyexps/farmem.py

@@ -23,6 +23,7 @@
 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 = []
 
@@ -34,9 +35,9 @@ class FarMemTest(nodec.AppConfig):
         self.size = size
 
     # pylint: disable=consider-using-with
-    def config_files(self):
-        m = {'farmem.ko': open('../images/farmem/farmem.ko', 'rb')}
-        return {**m, **super().config_files()}
+    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 run_cmds(self, node):
         return [

experiments/pyexps/memswitch.py

@@ -23,6 +23,7 @@
 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]
@@ -45,10 +46,10 @@ class MemTest(node.AppConfig):
         self.disaggregated = disaggregated
         self.time_limit = time_limit
 
-    def config_files(self):
+    def config_files(self, env: ExpEnv):
         # pylint: disable-next=consider-using-with
-        m = {'farmem.ko': open('../images/farmem/farmem.ko', 'rb')}
-        return {**m, **super().config_files()}
+        m = {'farmem.ko': open(f'{env.repodir}/images/farmem/farmem.ko', 'rb')}
+        return {**m, **super().config_files(env)}
 
     def run_cmds(self, _):
         commands = [

experiments/pyexps/memswitch_large.py

@@ -23,6 +23,7 @@
 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
@@ -46,10 +47,10 @@ class MemTest(node.AppConfig):
         self.disaggregated = disaggregated
         self.time_limit = time_limit
 
-    def config_files(self):
+    def config_files(self, env: ExpEnv):
         # pylint: disable-next=consider-using-with
-        m = {'farmem.ko': open('../images/farmem/farmem.ko', 'rb')}
-        return {**m, **super().config_files()}
+        m = {'farmem.ko': open(f'{env.repodir}/images/farmem/farmem.ko', 'rb')}
+        return {**m, **super().config_files(env)}
 
     def run_cmds(self, _):
         commands = []

experiments/pyexps/sysbench_memory.py

@@ -28,6 +28,7 @@ Used to compare latency and throughput of disaggregated memory to local one.
 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']
@@ -60,9 +61,9 @@ class SysbenchMemoryBenchmark(node.AppConfig):
         """Number of cores to run the benchmark on in parallel."""
 
     # pylint: disable=consider-using-with
-    def config_files(self):
-        m = {'farmem.ko': open('../images/farmem/farmem.ko', 'rb')}
-        return {**m, **super().config_files()}
+    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 run_cmds(self, _):
         cmds = [

experiments/simbricks/orchestration/nodeconfig.py

@@ -46,7 +46,8 @@ class AppConfig():
         restored."""
         return []
 
-    def config_files(self) -> tp.Dict[str, tp.IO]:
+    # pylint: disable=unused-argument
+    def config_files(self, env: ExpEnv) -> tp.Dict[str, tp.IO]:
         """
         Additional files to put inside the node, which are mounted under
         `/tmp/guest/`.
@@ -175,7 +176,7 @@ class NodeConfig():
         Specified in the following format: `filename_inside_node`:
         `IO_handle_of_file`
         """
-        return self.app.config_files()
+        return self.app.config_files(env)
 
     def strfile(self, s: str) -> io.BytesIO:
         """