nodelist is taken from PerformanceDataHandler singleton for both kernel and extension

Author: OutlyingWest

src/jumper/kernel.py

@@ -97,8 +97,7 @@ def __init__(self, **kwargs):
         self.gpu_avail = False
         # TODO: Temporary share perfdata_handler instance with an ipython extension
         #  as it contains data that should be shared with the extension.
-        kernel_context.perfdata_handler = PerformanceDataHandler()
-        kernel_context.nodelist = kernel_context.perfdata_handler.get_nodelist()
+        self.nodelist = kernel_context.perfdata_handler.get_nodelist()
 
         self.scorep_available_ = shutil.which("scorep")
         self.scorep_python_available_ = True
@@ -487,9 +486,9 @@ def report_perfdata(self, performance_data_nodes, duration):
                 performance_data_nodes[:-8]
             ):
 
-                if kernel_context.nodelist:
+                if self.nodelist:
                     self.cell_output(
-                        "--NODE " + str(kernel_context.nodelist[idx]) + "--\n", "stdout"
+                        "--NODE " + str(self.nodelist[idx]) + "--\n", "stdout"
                     )
 
                 cpu_util = performance_data[0]
@@ -970,7 +969,7 @@ async def do_execute(
                     f" following sub cells: {sub_idxs}"
                 )
             perfvis.draw_performance_graph(
-                kernel_context.nodelist,
+                self.nodelist,
                 kernel_context.perfdata_handler.get_perfdata_history()[-1],
                 self.gpu_avail,
                 time_indices,
@@ -999,7 +998,7 @@ async def do_execute(
                         f" following sub cells: {sub_idxs}"
                     )
                 perfvis.draw_performance_graph(
-                    kernel_context.nodelist,
+                    self.nodelist,
                     kernel_context.perfdata_handler.get_perfdata_history()[index],
                     self.gpu_avail,
                     time_indices,

src/magic_extension/magic.py

@@ -18,6 +18,7 @@ def __init__(self, shell):
 
         # will be set to True as soon as GPU data is received
         self.gpu_avail = False
+        self.nodelist = kernel_context.perfdata_handler.get_nodelist()
 
     @cell_magic
     def abra(self, line, cell):
@@ -29,12 +30,16 @@ def display_graph_for_all(self, line):
             kernel_context.perfdata_handler.get_perfdata_aggregated()
         )
         perfvis.draw_performance_graph(
-            kernel_context.nodelist,
+            self.nodelist,
             data,
             self.gpu_avail,
             time_indices,
         )
 
+    @line_magic
+    def display_graph_for_index(self, line):
+        pass
+
 
     @cell_magic
     def set_perfmonitor(self, line, code):
@@ -50,9 +55,9 @@ def set_perfmonitor(self, line, code):
             else:
                 try:
                     kernel_context.perfdata_handler.set_monitor(monitor)
-                    kernel_context.nodelist = kernel_context.perfdata_handler.get_nodelist()
-                    if len(kernel_context.nodelist) <= 1:
-                        kernel_context.nodelist = None
+                    self.nodelist = kernel_context.perfdata_handler.get_nodelist()
+                    if len(self.nodelist) <= 1:
+                        self.nodelist = None
                         self.cell_output(
                             "Found monitor: "
                             + str(monitor)
@@ -63,7 +68,7 @@ def set_perfmonitor(self, line, code):
                             "Selected monitor: "
                             + str(monitor)
                             + " and got nodes: "
-                            + str(kernel_context.nodelist)
+                            + str(self.nodelist)
                         )
                 except Exception as e:
                     self.cell_output(f"Error setting monitor\n{e}", "stderr")