From d33488ab7f295ed9a823299c3dfa5efa7ef13527 Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Thu, 7 Nov 2019 00:32:31 +0100 Subject: [PATCH 1/2] Add JupyterHub submission test --- config/cscs.py | 54 +++++++++++++++++----- cscs-checks/tools/jupyter/jupyter_tests.py | 15 ++++++ 2 files changed, 58 insertions(+), 11 deletions(-) create mode 100644 cscs-checks/tools/jupyter/jupyter_tests.py diff --git a/config/cscs.py b/config/cscs.py index 4a68e3645a..50aa401f3d 100644 --- a/config/cscs.py +++ b/config/cscs.py @@ -137,6 +137,22 @@ class ReframeSettings: 'resources': { 'switches': ['--switches={num_switches}'] } + }, + + 'jupyter_gpu': { + 'scheduler': 'nativeslurm', + 'environs': ['builtin'], + 'access': ['-Cgpu', '--reservation=jupyter_gpu'], + 'descr': 'JupyterHub GPU nodes', + 'max_jobs': 10, + }, + + 'jupyter_mc': { + 'scheduler': 'nativeslurm', + 'environs': ['builtin'], + 'access': ['-Cmc', '--reservation=jupyter_mc'], + 'descr': 'JupyterHub multicore nodes', + 'max_jobs': 10, } } }, @@ -196,6 +212,22 @@ class ReframeSettings: 'switches': ['--switches={num_switches}'] } }, + + 'jupyter_gpu': { + 'scheduler': 'nativeslurm', + 'environs': ['builtin'], + 'access': ['-Cgpu', '--reservation=jupyter_gpu'], + 'descr': 'JupyterHub GPU nodes', + 'max_jobs': 10, + }, + + 'jupyter_mc': { + 'scheduler': 'nativeslurm', + 'environs': ['builtin'], + 'access': ['-Cmc', '--reservation=jupyter_mc'], + 'descr': 'JupyterHub multicore nodes', + 'max_jobs': 10, + } } }, @@ -570,17 +602,17 @@ class ReframeSettings: perf_logging_config = { 'level': 'DEBUG', 'handlers': [ - #@ { - #@ 'type': 'graylog', - #@ 'host': 'your-server-here', - #@ 'port': 12345, - #@ 'level': 'INFO', - #@ 'format': '%(message)s', - #@ 'extras': { - #@ 'facility': 'reframe', - #@ 'data-version': '1.0', - #@ } - #@ }, + # @ { + # @ 'type': 'graylog', + # @ 'host': 'your-server-here', + # @ 'port': 12345, + # @ 'level': 'INFO', + # @ 'format': '%(message)s', + # @ 'extras': { + # @ 'facility': 'reframe', + # @ 'data-version': '1.0', + # @ } + # @ }, { 'type': 'filelog', 'prefix': '%(check_system)s/%(check_partition)s', diff --git a/cscs-checks/tools/jupyter/jupyter_tests.py b/cscs-checks/tools/jupyter/jupyter_tests.py new file mode 100644 index 0000000000..22be136b01 --- /dev/null +++ b/cscs-checks/tools/jupyter/jupyter_tests.py @@ -0,0 +1,15 @@ +import reframe as rfm +import reframe.utility.sanity as sn + + +@rfm.simple_test +class JupyterHubSubmitTest(rfm.RunOnlyRegressionTest): + def __init__(self): + self.valid_systems = ['daint:jupyter_gpu', 'daint:jupyter_mc', + 'dom:jupyter_gpu', 'dom:jupyter_mc'] + self.valid_prog_environs = ['*'] + self.sourcesdir = None + self.executable = 'hostname' + self.time_limit = (0, 1, 0) + self.sanity_patterns = sn.assert_found(r'nid\d+', self.stdout) + self.tags = {'production', 'maintenance'} From ea6d55c24c2b5cdddb2d2a9bfc409d762d533431 Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Thu, 7 Nov 2019 00:36:27 +0100 Subject: [PATCH 2/2] Revert special comment formatting --- config/cscs.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/config/cscs.py b/config/cscs.py index 50aa401f3d..8697b46a3b 100644 --- a/config/cscs.py +++ b/config/cscs.py @@ -602,17 +602,17 @@ class ReframeSettings: perf_logging_config = { 'level': 'DEBUG', 'handlers': [ - # @ { - # @ 'type': 'graylog', - # @ 'host': 'your-server-here', - # @ 'port': 12345, - # @ 'level': 'INFO', - # @ 'format': '%(message)s', - # @ 'extras': { - # @ 'facility': 'reframe', - # @ 'data-version': '1.0', - # @ } - # @ }, + #@ { + #@ 'type': 'graylog', + #@ 'host': 'your-server-here', + #@ 'port': 12345, + #@ 'level': 'INFO', + #@ 'format': '%(message)s', + #@ 'extras': { + #@ 'facility': 'reframe', + #@ 'data-version': '1.0', + #@ } + #@ }, { 'type': 'filelog', 'prefix': '%(check_system)s/%(check_partition)s',