From 293b6ab574f05700a07929edbafb240535b52d91 Mon Sep 17 00:00:00 2001 From: Theofilos Manitaras Date: Wed, 7 Aug 2019 09:36:14 +0200 Subject: [PATCH 1/2] Update IPM tests for PE19.06 --- .../tools/profiling_and_debugging/ipm_mpi_omp.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/cscs-checks/tools/profiling_and_debugging/ipm_mpi_omp.py b/cscs-checks/tools/profiling_and_debugging/ipm_mpi_omp.py index 11dba8a056..61bfafa620 100644 --- a/cscs-checks/tools/profiling_and_debugging/ipm_mpi_omp.py +++ b/cscs-checks/tools/profiling_and_debugging/ipm_mpi_omp.py @@ -8,22 +8,26 @@ @rfm.parameterized_test(['C++'], ['F90']) class Ipm(rfm.RegressionTest): def __init__(self, lang): - super().__init__() self.name = 'Ipm_%s' % lang.replace('+', 'p') + self.descr = self.name self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc'] - self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu', - 'PrgEnv-intel', 'PrgEnv-pgi'] + self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-cray_classic', + 'PrgEnv-gnu', 'PrgEnv-intel', 'PrgEnv-pgi'] self.prgenv_flags = { 'PrgEnv-gnu': ['-O2', '-g', '-fopenmp'], - 'PrgEnv-cray': ['-O2', '-g', '-homp'], + 'PrgEnv-cray': ['-O2', '-g', + '-homp' if lang == 'F90' else '-fopenmp'], + 'PrgEnv-cray_classic': ['-O2', '-g', '-homp'], 'PrgEnv-intel': ['-O2', '-g', '-openmp'], 'PrgEnv-pgi': ['-O2', '-g', '-mp'] } ipm_ver = '2.0.6' - tc_ver = '19.03' + tc_ver = '19.06' self.ipm_modules = { 'PrgEnv-gnu': ['IPM/%s-CrayGNU-%s' % (ipm_ver, tc_ver)], 'PrgEnv-cray': ['IPM/%s-CrayCCE-%s' % (ipm_ver, tc_ver)], + 'PrgEnv-cray_classic': [ + 'IPM/%s-CrayCCE-%s-classic' % (ipm_ver, tc_ver)], 'PrgEnv-intel': ['IPM/%s-CrayIntel-%s' % (ipm_ver, tc_ver)], 'PrgEnv-pgi': ['IPM/%s-CrayPGI-%s' % (ipm_ver, tc_ver)] } From 90bda58cc3abb8b9e4f6e57874e2b21405b8af14 Mon Sep 17 00:00:00 2001 From: Theofilos Manitaras Date: Wed, 7 Aug 2019 16:08:00 +0200 Subject: [PATCH 2/2] Remove legacy max concurrency in build --- cscs-checks/tools/profiling_and_debugging/ipm_mpi_omp.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/cscs-checks/tools/profiling_and_debugging/ipm_mpi_omp.py b/cscs-checks/tools/profiling_and_debugging/ipm_mpi_omp.py index 61bfafa620..61681b8f97 100644 --- a/cscs-checks/tools/profiling_and_debugging/ipm_mpi_omp.py +++ b/cscs-checks/tools/profiling_and_debugging/ipm_mpi_omp.py @@ -34,8 +34,6 @@ def __init__(self, lang): self.sourcesdir = os.path.join('src', lang) self.executable = './jacobi' self.build_system = 'Make' - if lang == 'F90': - self.build_system.max_concurrency = 1 self.num_tasks = 3 self.num_tasks_per_node = 3