From 5d15c59d67e461aea6112c5e0af4f4ea6b9a80d7 Mon Sep 17 00:00:00 2001
From: kraushm <kraushaar@cscs.ch>
Date: Thu, 26 Aug 2021 08:00:08 +0200
Subject: [PATCH 1/5] [bugfix] correct typo in module version

---
 cscs-checks/apps/jupyter/check_ipcmagic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cscs-checks/apps/jupyter/check_ipcmagic.py b/cscs-checks/apps/jupyter/check_ipcmagic.py
index 1596c54ad6..1ecf5d1351 100644
--- a/cscs-checks/apps/jupyter/check_ipcmagic.py
+++ b/cscs-checks/apps/jupyter/check_ipcmagic.py
@@ -17,7 +17,7 @@ def __init__(self):
         self.valid_prog_environs = ['PrgEnv-gnu']
         self.modules = [
             # FIXME: Use the default ipcmagic version when fixed
-            f'ipcmagic/0.1-CrayGNU-{osext.cray_cdt_version()}',
+            f'ipcmagic/1.0.1-CrayGNU-{osext.cray_cdt_version()}',
             f'Horovod/0.21.0-CrayGNU-{osext.cray_cdt_version()}-tf-2.4.0'
         ]
         self.num_tasks = 2

From fbfab887d7c8947119762c386dbda3566e1fce3a Mon Sep 17 00:00:00 2001
From: kraushm <kraushaar@cscs.ch>
Date: Fri, 27 Aug 2021 10:58:30 +0200
Subject: [PATCH 2/5] Change to using the default ipcmagic

---
 cscs-checks/apps/jupyter/check_ipcmagic.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cscs-checks/apps/jupyter/check_ipcmagic.py b/cscs-checks/apps/jupyter/check_ipcmagic.py
index 1ecf5d1351..4d5b423028 100644
--- a/cscs-checks/apps/jupyter/check_ipcmagic.py
+++ b/cscs-checks/apps/jupyter/check_ipcmagic.py
@@ -16,8 +16,7 @@ def __init__(self):
         self.valid_systems = ['daint:gpu', 'dom:gpu']
         self.valid_prog_environs = ['PrgEnv-gnu']
         self.modules = [
-            # FIXME: Use the default ipcmagic version when fixed
-            f'ipcmagic/1.0.1-CrayGNU-{osext.cray_cdt_version()}',
+            f'ipcmagic',
             f'Horovod/0.21.0-CrayGNU-{osext.cray_cdt_version()}-tf-2.4.0'
         ]
         self.num_tasks = 2

From 1022be5a207b65e167937816375f686d2a860363 Mon Sep 17 00:00:00 2001
From: Theofilos Manitaras <manitaras@cscs.ch>
Date: Fri, 27 Aug 2021 16:09:59 +0200
Subject: [PATCH 3/5] Modernize Jupyter IPCMagic test

---
 cscs-checks/apps/jupyter/check_ipcmagic.py | 99 ++++++++++++----------
 1 file changed, 54 insertions(+), 45 deletions(-)

diff --git a/cscs-checks/apps/jupyter/check_ipcmagic.py b/cscs-checks/apps/jupyter/check_ipcmagic.py
index 4d5b423028..42b4c9ac84 100644
--- a/cscs-checks/apps/jupyter/check_ipcmagic.py
+++ b/cscs-checks/apps/jupyter/check_ipcmagic.py
@@ -11,54 +11,63 @@
 
 @rfm.simple_test
 class IPCMagicCheck(rfm.RunOnlyRegressionTest):
-    def __init__(self):
-        self.descr = 'Distributed training with TensorFlow using ipyparallel'
-        self.valid_systems = ['daint:gpu', 'dom:gpu']
-        self.valid_prog_environs = ['PrgEnv-gnu']
-        self.modules = [
-            f'ipcmagic',
-            f'Horovod/0.21.0-CrayGNU-{osext.cray_cdt_version()}-tf-2.4.0'
-        ]
-        self.num_tasks = 2
-        self.num_tasks_per_node = 1
-        self.executable = 'ipython'
-        self.executable_opts = ['tf-hvd-sgd-ipc-tf2.py']
-        nids = sn.extractall(r'nid(?P<nid>\d+)',
-                             self.stdout, 'nid', str)
-        self.sanity_patterns = sn.all([
-            sn.assert_ne(nids, []),
-            sn.assert_ne(nids[0], nids[1])
-        ])
-        self.reference = {
-            'daint:gpu': {
-                'slope': (2.0, -0.1, 0.1, None),
-                'offset': (0.0, -0.1, 0.1, None),
-                'retries': (0, None, None, None),
-                'time': (10, None, None, 's'),
-            },
-            'dom:gpu': {
-                'slope': (2.0, -0.1, 0.1, None),
-                'offset': (0.0, -0.1, 0.1, None),
-                'retries': (0, None, None, None),
-                'time': (10, None, None, 's'),
-            }
+    descr = 'Distributed training with TensorFlow using ipyparallel'
+    valid_systems = ['daint:gpu', 'dom:gpu']
+    valid_prog_environs = ['PrgEnv-gnu']
+    modules = [
+        f'ipcmagic', f'jupyterlab',
+        f'Horovod/0.21.0-CrayGNU-{osext.cray_cdt_version()}-tf-2.4.0'
+    ]
+    num_tasks = 2
+    num_tasks_per_node = 1
+    executable = 'ipython'
+    executable_opts = ['tf-hvd-sgd-ipc-tf2.py']
+    reference = {
+        'daint:gpu': {
+            'slope': (2.0, -0.1, 0.1, None),
+            'offset': (0.0, -0.1, 0.1, None),
+            'retries': (0, None, None, None),
+            'time': (10, None, None, 's'),
+        },
+        'dom:gpu': {
+            'slope': (2.0, -0.1, 0.1, None),
+            'offset': (0.0, -0.1, 0.1, None),
+            'retries': (0, None, None, None),
+            'time': (10, None, None, 's'),
         }
-        self.perf_patterns = {
-            'slope': sn.extractsingle(r'slope=(?P<slope>\S+)',
-                                      self.stdout, 'slope', float),
-            'offset': sn.extractsingle(r'offset=(?P<offset>\S+)',
-                                       self.stdout, 'offset', float),
-            'retries': 4 - sn.count(sn.findall(r'IPCluster is already running',
-                                               self.stdout)),
-            'time': sn.extractsingle(r'IPCluster is ready\!\s+'
-                                     r'\((?P<time>\d+) seconds\)',
-                                     self.stdout, 'time', float)
-        }
-        self.maintainers = ['RS', 'TR']
-        self.tags = {'production'}
+    }
+
+    maintainers = ['RS', 'TR']
+    tags = {'production'}
+
+    @sanity_function
+    def assert_nids(self):
+        nids = sn.extractall(r'nid(?P<nid>\d+)', self.stdout, 'nid', str)
+        return sn.all([sn.assert_ne(nids, []), sn.assert_ne(nids[0], nids[1])])
+
+    @performance_function('')
+    def slope(self):
+        return sn.extractsingle(r'slope=(?P<slope>\S+)', self.stdout,
+                                'slope', float)
+
+    @performance_function('')
+    def offset(self):
+        return sn.extractsingle(r'offset=(?P<offset>\S+)', self.stdout,
+                                'offset', float)
+
+    @performance_function('')
+    def retries(self):
+        return 4 - sn.count(sn.findall(r'IPCluster is already running',
+                                       self.stdout))
+
+    @performance_function('s')
+    def time(self):
+        return sn.extractsingle(r'IPCluster is ready\!\s+'
+                                r'\((?P<time>\d+) seconds\)',
+                                self.stdout, 'time', float)
 
     @run_before('run')
-    def prepare_run(self):
+    def set_local_launcher(self):
         # Change the job launcher since `ipython`
         # needs to be launched without `srun`.
         self.job.launcher = getlauncher('local')()

From 46d5fe21dd1d73de7f3305941b28f5a00538d0e1 Mon Sep 17 00:00:00 2001
From: Vasileios Karakasis <vkarak@gmail.com>
Date: Sat, 28 Aug 2021 22:57:33 +0200
Subject: [PATCH 4/5] Minor style enhancement

---
 cscs-checks/apps/jupyter/check_ipcmagic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cscs-checks/apps/jupyter/check_ipcmagic.py b/cscs-checks/apps/jupyter/check_ipcmagic.py
index 42b4c9ac84..446fd794f2 100644
--- a/cscs-checks/apps/jupyter/check_ipcmagic.py
+++ b/cscs-checks/apps/jupyter/check_ipcmagic.py
@@ -67,7 +67,7 @@ def time(self):
                                 self.stdout, 'time', float)
 
     @run_before('run')
-    def set_local_launcher(self):
+    def reset_launcher(self):
         # Change the job launcher since `ipython`
         # needs to be launched without `srun`.
         self.job.launcher = getlauncher('local')()

From 8e59f86ea7a25a30bb9dc84c9c1315c9785910c9 Mon Sep 17 00:00:00 2001
From: Theofilos Manitaras <manitaras@cscs.ch>
Date: Mon, 30 Aug 2021 18:03:05 +0200
Subject: [PATCH 5/5] Add daint workaround

---
 cscs-checks/apps/jupyter/check_ipcmagic.py | 38 +++++++++++++++-------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/cscs-checks/apps/jupyter/check_ipcmagic.py b/cscs-checks/apps/jupyter/check_ipcmagic.py
index 446fd794f2..40a5d3fc1b 100644
--- a/cscs-checks/apps/jupyter/check_ipcmagic.py
+++ b/cscs-checks/apps/jupyter/check_ipcmagic.py
@@ -24,15 +24,15 @@ class IPCMagicCheck(rfm.RunOnlyRegressionTest):
     executable_opts = ['tf-hvd-sgd-ipc-tf2.py']
     reference = {
         'daint:gpu': {
-            'slope': (2.0, -0.1, 0.1, None),
-            'offset': (0.0, -0.1, 0.1, None),
-            'retries': (0, None, None, None),
+            'slope': (2.0, -0.1, 0.1, 'N/A'),
+            'offset': (0.0, -0.1, 0.1, 'N/A'),
+            'retries': (0, None, None, 'N/A'),
             'time': (10, None, None, 's'),
         },
         'dom:gpu': {
-            'slope': (2.0, -0.1, 0.1, None),
-            'offset': (0.0, -0.1, 0.1, None),
-            'retries': (0, None, None, None),
+            'slope': (2.0, -0.1, 0.1, 'N/A'),
+            'offset': (0.0, -0.1, 0.1, 'N/A'),
+            'retries': (0, None, None, 'N/A'),
             'time': (10, None, None, 's'),
         }
     }
@@ -40,22 +40,38 @@ class IPCMagicCheck(rfm.RunOnlyRegressionTest):
     maintainers = ['RS', 'TR']
     tags = {'production'}
 
+    @run_after('setup')
+    def daint_module_workaround(self):
+        if self.current_system.name == 'daint':
+            # FIXME: Use the default modules once Dom/Daint are aligned
+            self.modules = [
+                f'ipcmagic/1.0.1-CrayGNU-{osext.cray_cdt_version()}',
+                f'Horovod/0.21.0-CrayGNU-{osext.cray_cdt_version()}-tf-2.4.0'
+            ]
+            # FIXME: Enforce loading of jupyterlab module since
+            # `module show jupyterlab` throws a Tcl error on Daint
+            self.prerun_cmds = ['module load jupyterlab']
+
     @sanity_function
-    def assert_nids(self):
+    def assert_successful_execution(self):
         nids = sn.extractall(r'nid(?P<nid>\d+)', self.stdout, 'nid', str)
-        return sn.all([sn.assert_ne(nids, []), sn.assert_ne(nids[0], nids[1])])
+        return sn.all([
+            sn.assert_ne(nids, []), sn.assert_ne(nids[0], nids[1]),
+            sn.assert_found(r'IPCluster is ready\!\s+', self.stdout),
+            sn.assert_found(r'slope=\S+', self.stdout)
+        ])
 
-    @performance_function('')
+    @performance_function('N/A')
     def slope(self):
         return sn.extractsingle(r'slope=(?P<slope>\S+)', self.stdout,
                                 'slope', float)
 
-    @performance_function('')
+    @performance_function('N/A')
     def offset(self):
         return sn.extractsingle(r'offset=(?P<offset>\S+)', self.stdout,
                                 'offset', float)
 
-    @performance_function('')
+    @performance_function('N/A')
     def retries(self):
         return 4 - sn.count(sn.findall(r'IPCluster is already running',
                                        self.stdout))