From 80917ad2f6c83a4bd01af2b801391796c3b89068 Mon Sep 17 00:00:00 2001 From: jg Date: Fri, 11 Oct 2019 07:29:49 -0500 Subject: [PATCH 1/3] tag --- cscs-checks/analytics/spark/spark_check.py | 2 +- cscs-checks/compile/haswell_fma_check.py | 2 +- cscs-checks/compile/libsci_acc_symlink.py | 2 +- cscs-checks/compile/libsci_resolve.py | 4 ++-- cscs-checks/cuda/cuda_checks.py | 2 +- cscs-checks/cuda/cuda_memtest_check.py | 2 +- cscs-checks/cuda/multi_gpu.py | 2 +- cscs-checks/cuda/nvml_check.py | 2 +- cscs-checks/libraries/io/hdf5_compile_run.py | 2 +- cscs-checks/libraries/io/netcdf_compile_run.py | 2 +- cscs-checks/libraries/math/trilinos_compile_run.py | 2 +- cscs-checks/libraries/petsc/petsc_helloworld.py | 2 +- cscs-checks/mch/automatic_arrays_acc.py | 2 +- cscs-checks/mch/collectives_halo.py | 2 +- cscs-checks/mch/cuda_stress_test.py | 2 +- cscs-checks/mch/gpu_direct_acc.py | 2 +- cscs-checks/mch/gpu_direct_cuda.py | 2 +- cscs-checks/mch/openacc_cuda_mpi_cppstd.py | 2 +- cscs-checks/microbenchmarks/alloc_speed/alloc_speed.py | 2 +- cscs-checks/microbenchmarks/dgemm/dgemm.py | 2 +- cscs-checks/microbenchmarks/fft/fftw_benchmark.py | 2 +- cscs-checks/microbenchmarks/gpu_burn/gpu_burn_test.py | 2 +- cscs-checks/microbenchmarks/hpcg/hpcg_benchmark.py | 4 ++-- .../microbenchmarks/kernel_latency/kernel_latency.py | 2 +- cscs-checks/microbenchmarks/latency/latency.py | 2 +- cscs-checks/microbenchmarks/osu/osu_tests.py | 8 ++++---- cscs-checks/microbenchmarks/shmem/shmem.py | 2 +- cscs-checks/microbenchmarks/stream/stream.py | 2 +- cscs-checks/prgenv/affinity_check.py | 2 +- cscs-checks/prgenv/cpu_target_check.py | 2 +- cscs-checks/prgenv/environ_check.py | 4 ++-- cscs-checks/prgenv/helloworld.py | 6 +++--- cscs-checks/prgenv/mpi.py | 4 ++-- cscs-checks/prgenv/openacc_checks.py | 2 +- cscs-checks/prgenv/opencl_check.py | 2 +- cscs-checks/prgenv/ssh_environ_check.py | 4 ++-- cscs-checks/prgenv/ulimit_check.py | 2 +- cscs-checks/tools/profiling_and_debugging/cuda_gdb.py | 2 +- cscs-checks/tools/profiling_and_debugging/ddt.py | 2 +- cscs-checks/tools/profiling_and_debugging/gdb4hpc.py | 2 +- cscs-checks/tools/profiling_and_debugging/nvprof.py | 2 +- cscs-checks/tools/profiling_and_debugging/perftools.py | 7 +++++-- 42 files changed, 56 insertions(+), 53 deletions(-) diff --git a/cscs-checks/analytics/spark/spark_check.py b/cscs-checks/analytics/spark/spark_check.py index 2554afe61c..f165ef58e5 100644 --- a/cscs-checks/analytics/spark/spark_check.py +++ b/cscs-checks/analytics/spark/spark_check.py @@ -21,7 +21,7 @@ def __init__(self): self.stdout, 'pi', float) self.sanity_patterns = sn.assert_lt(sn.abs(pi_value - math.pi), 0.01) self.maintainers = ['TM'] - self.tags = {'production'} + self.tags = {'production', 'craype'} def setup(self, partition, environ, **job_opts): if partition.fullname == 'daint:gpu': diff --git a/cscs-checks/compile/haswell_fma_check.py b/cscs-checks/compile/haswell_fma_check.py index 2efe9f34e5..c600bdbf2e 100644 --- a/cscs-checks/compile/haswell_fma_check.py +++ b/cscs-checks/compile/haswell_fma_check.py @@ -34,7 +34,7 @@ def __init__(self): ]) self.maintainers = ['AJ', 'VK'] - self.tags = {'production'} + self.tags = {'production', 'craype'} def setup(self, partition, environ, **job_opts): if self.current_system.name == 'kesch': diff --git a/cscs-checks/compile/libsci_acc_symlink.py b/cscs-checks/compile/libsci_acc_symlink.py index 583d7403ce..c779829b1e 100644 --- a/cscs-checks/compile/libsci_acc_symlink.py +++ b/cscs-checks/compile/libsci_acc_symlink.py @@ -22,4 +22,4 @@ def __init__(self, lib_name): self.sanity_patterns = sn.assert_found(lib_name + '.so', self.stdout) self.maintainers = ['AJ'] - self.tags = {'production'} + self.tags = {'production', 'craype'} diff --git a/cscs-checks/compile/libsci_resolve.py b/cscs-checks/compile/libsci_resolve.py index 77035f90c3..ae7cddc295 100644 --- a/cscs-checks/compile/libsci_resolve.py +++ b/cscs-checks/compile/libsci_resolve.py @@ -11,7 +11,7 @@ def __init__(self): 'dom:login', 'dom:gpu'] self.modules = ['craype-haswell'] self.maintainers = ['AJ'] - self.tags = {'production'} + self.tags = {'production', 'craype'} @rfm.required_version('>=2.14') @@ -91,4 +91,4 @@ def __init__(self): ]) self.maintainers = ['AJ'] - self.tags = {'production'} + self.tags = {'production', 'craype'} diff --git a/cscs-checks/cuda/cuda_checks.py b/cscs-checks/cuda/cuda_checks.py index b5c26887c9..bd59b813e2 100644 --- a/cscs-checks/cuda/cuda_checks.py +++ b/cscs-checks/cuda/cuda_checks.py @@ -27,7 +27,7 @@ def __init__(self): self.nvidia_sm = '37' self.maintainers = ['AJ', 'VK'] - self.tags = {'production'} + self.tags = {'production', 'craype'} @rfm.required_version('>=2.14') diff --git a/cscs-checks/cuda/cuda_memtest_check.py b/cscs-checks/cuda/cuda_memtest_check.py index 8da422dbae..416a797c28 100644 --- a/cscs-checks/cuda/cuda_memtest_check.py +++ b/cscs-checks/cuda/cuda_memtest_check.py @@ -37,7 +37,7 @@ def __init__(self): *assert_finished_tests, sn.assert_not_found('(?i)ERROR', self.stdout), sn.assert_not_found('(?i)ERROR', self.stderr)]) - self.tags = {'diagnostic', 'ops'} + self.tags = {'diagnostic', 'ops', 'craype'} @property @sn.sanity_function diff --git a/cscs-checks/cuda/multi_gpu.py b/cscs-checks/cuda/multi_gpu.py index a56f408a8f..a61efc3a23 100644 --- a/cscs-checks/cuda/multi_gpu.py +++ b/cscs-checks/cuda/multi_gpu.py @@ -61,7 +61,7 @@ def __init__(self): 'kesch:cn:d2h': (7584, -0.1, None, 'MB/s'), 'kesch:cn:d2d': (137408, -0.1, None, 'MB/s') } - self.tags = {'diagnostic', 'mch'} + self.tags = {'diagnostic', 'mch', 'craype'} self.maintainers = ['AJ', 'VK'] def _xfer_pattern(self, xfer_kind, devno, nodename): diff --git a/cscs-checks/cuda/nvml_check.py b/cscs-checks/cuda/nvml_check.py index 20e88fd10e..50b67a3785 100644 --- a/cscs-checks/cuda/nvml_check.py +++ b/cscs-checks/cuda/nvml_check.py @@ -22,4 +22,4 @@ def __init__(self): r"compute\s+mode\s+'Exclusive Process'", self.stdout) self.maintainers = ['AJ', 'VK'] - self.tags = {'production'} + self.tags = {'production', 'craype'} diff --git a/cscs-checks/libraries/io/hdf5_compile_run.py b/cscs-checks/libraries/io/hdf5_compile_run.py index 9bb58229be..d8a4db0e31 100644 --- a/cscs-checks/libraries/io/hdf5_compile_run.py +++ b/cscs-checks/libraries/io/hdf5_compile_run.py @@ -73,4 +73,4 @@ def __init__(self, lang, linkage): self.post_run = ['h5dump h5ex_d_chunk.h5 > h5dump_out.txt'] self.maintainers = ['SO'] - self.tags = {'production'} + self.tags = {'production', 'craype'} diff --git a/cscs-checks/libraries/io/netcdf_compile_run.py b/cscs-checks/libraries/io/netcdf_compile_run.py index 6160e32531..2257e5aa39 100644 --- a/cscs-checks/libraries/io/netcdf_compile_run.py +++ b/cscs-checks/libraries/io/netcdf_compile_run.py @@ -40,7 +40,7 @@ def __init__(self, lang, linkage): self.num_tasks_per_node = 1 self.sanity_patterns = sn.assert_found(r'SUCCESS', self.stdout) self.maintainers = ['AJ', 'VK'] - self.tags = {'production'} + self.tags = {'production', 'craype'} def setup(self, partition, environ, **job_opts): if self.current_system.name == 'kesch': diff --git a/cscs-checks/libraries/math/trilinos_compile_run.py b/cscs-checks/libraries/math/trilinos_compile_run.py index 1f9a94a887..d7bbcaec30 100644 --- a/cscs-checks/libraries/math/trilinos_compile_run.py +++ b/cscs-checks/libraries/math/trilinos_compile_run.py @@ -37,7 +37,7 @@ def __init__(self, linkage): self.stdout) self.maintainers = ['WS', 'AJ'] - self.tags = {'production'} + self.tags = {'production', 'craype'} def setup(self, partition, environ, **job_opts): prgenv_flags = self.prgenv_flags[environ.name] diff --git a/cscs-checks/libraries/petsc/petsc_helloworld.py b/cscs-checks/libraries/petsc/petsc_helloworld.py index 5d65616f46..b379173a4f 100644 --- a/cscs-checks/libraries/petsc/petsc_helloworld.py +++ b/cscs-checks/libraries/petsc/petsc_helloworld.py @@ -28,5 +28,5 @@ def __init__(self, variant): self.stdout, 'norm', float, -1) self.sanity_patterns = sn.assert_lt(norm, 1.0e-5) - self.tags = {'production'} + self.tags = {'production', 'craype'} self.maintainers = ['WS', 'AJ', 'TM'] diff --git a/cscs-checks/mch/automatic_arrays_acc.py b/cscs-checks/mch/automatic_arrays_acc.py index b19647b79f..135c08d3d4 100644 --- a/cscs-checks/mch/automatic_arrays_acc.py +++ b/cscs-checks/mch/automatic_arrays_acc.py @@ -46,7 +46,7 @@ def __init__(self): } self.maintainers = ['AJ', 'VK'] - self.tags = {'production', 'mch'} + self.tags = {'production', 'mch', 'craype'} def setup(self, partition, environ, **job_opts): if environ.name.startswith('PrgEnv-cray'): diff --git a/cscs-checks/mch/collectives_halo.py b/cscs-checks/mch/collectives_halo.py index 2708134dfd..78228ab7da 100644 --- a/cscs-checks/mch/collectives_halo.py +++ b/cscs-checks/mch/collectives_halo.py @@ -89,7 +89,7 @@ def __init__(self, variant, bench_reference): } self.maintainers = ['AJ', 'VK'] - self.tags = {'production', 'mch'} + self.tags = {'production', 'mch', 'craype'} def setup(self, *args, **kwargs): super().setup(*args, **kwargs) diff --git a/cscs-checks/mch/cuda_stress_test.py b/cscs-checks/mch/cuda_stress_test.py index caac7700ee..3824718d13 100644 --- a/cscs-checks/mch/cuda_stress_test.py +++ b/cscs-checks/mch/cuda_stress_test.py @@ -36,5 +36,5 @@ def __init__(self): 'time': (2.25, None, 0.05) } } - self.tags = {'production', 'mch'} + self.tags = {'production', 'mch', 'craype'} self.maintainers = ['VK', 'AJ'] diff --git a/cscs-checks/mch/gpu_direct_acc.py b/cscs-checks/mch/gpu_direct_acc.py index ab783bc9db..a03608a503 100644 --- a/cscs-checks/mch/gpu_direct_acc.py +++ b/cscs-checks/mch/gpu_direct_acc.py @@ -37,7 +37,7 @@ def __init__(self): ]) self.launch_options = [] self.maintainers = ['AJ', 'VK'] - self.tags = {'production', 'mch'} + self.tags = {'production', 'mch', 'craype'} def setup(self, partition, environ, **job_opts): if environ.name.startswith('PrgEnv-cray'): diff --git a/cscs-checks/mch/gpu_direct_cuda.py b/cscs-checks/mch/gpu_direct_cuda.py index 876f4d5c23..4c6a1a72d6 100644 --- a/cscs-checks/mch/gpu_direct_cuda.py +++ b/cscs-checks/mch/gpu_direct_cuda.py @@ -36,4 +36,4 @@ def __init__(self): self.stdout, 'result', float) self.sanity_patterns = sn.assert_reference(result, 1., -1e-5, 1e-5) self.maintainers = ['AJ', 'VK'] - self.tags = {'production', 'mch'} + self.tags = {'production', 'mch', 'craype'} diff --git a/cscs-checks/mch/openacc_cuda_mpi_cppstd.py b/cscs-checks/mch/openacc_cuda_mpi_cppstd.py index e1a0b40257..02612769bf 100644 --- a/cscs-checks/mch/openacc_cuda_mpi_cppstd.py +++ b/cscs-checks/mch/openacc_cuda_mpi_cppstd.py @@ -63,7 +63,7 @@ def __init__(self): self.executable = 'openacc_cuda_mpi_cppstd' self.sanity_patterns = sn.assert_found(r'Result:\s+OK', self.stdout) self.maintainers = ['AJ', 'VK'] - self.tags = {'production', 'mch'} + self.tags = {'production', 'mch', 'craype'} def setup(self, partition, environ, **job_opts): if environ.name.startswith('PrgEnv-cray'): diff --git a/cscs-checks/microbenchmarks/alloc_speed/alloc_speed.py b/cscs-checks/microbenchmarks/alloc_speed/alloc_speed.py index e060b666c7..9aebea7c90 100644 --- a/cscs-checks/microbenchmarks/alloc_speed/alloc_speed.py +++ b/cscs-checks/microbenchmarks/alloc_speed/alloc_speed.py @@ -69,4 +69,4 @@ def __init__(self, hugepages): self.reference = self.sys_reference[hugepages] self.maintainers = ['AK', 'VH'] - self.tags = {'production'} + self.tags = {'production', 'craype'} diff --git a/cscs-checks/microbenchmarks/dgemm/dgemm.py b/cscs-checks/microbenchmarks/dgemm/dgemm.py index 0a09a226ab..c14aedef43 100644 --- a/cscs-checks/microbenchmarks/dgemm/dgemm.py +++ b/cscs-checks/microbenchmarks/dgemm/dgemm.py @@ -43,7 +43,7 @@ def __init__(self): } self.maintainers = ['AJ', 'VH', 'VK'] - self.tags = {'benchmark', 'diagnostic'} + self.tags = {'benchmark', 'diagnostic', 'craype'} def setup(self, partition, environ, **job_opts): diff --git a/cscs-checks/microbenchmarks/fft/fftw_benchmark.py b/cscs-checks/microbenchmarks/fft/fftw_benchmark.py index 7d10704590..55a0cee390 100644 --- a/cscs-checks/microbenchmarks/fft/fftw_benchmark.py +++ b/cscs-checks/microbenchmarks/fft/fftw_benchmark.py @@ -66,4 +66,4 @@ def __init__(self, exec_mode): } self.maintainers = ['AJ'] - self.tags = {'benchmark', 'scs'} + self.tags = {'benchmark', 'scs', 'craype'} diff --git a/cscs-checks/microbenchmarks/gpu_burn/gpu_burn_test.py b/cscs-checks/microbenchmarks/gpu_burn/gpu_burn_test.py index 6d7d0fe216..8a7cd832b0 100644 --- a/cscs-checks/microbenchmarks/gpu_burn/gpu_burn_test.py +++ b/cscs-checks/microbenchmarks/gpu_burn/gpu_burn_test.py @@ -70,7 +70,7 @@ def __init__(self): self.num_tasks_per_node = 1 self.maintainers = ['AJ', 'VK', 'TM'] - self.tags = {'diagnostic', 'benchmark'} + self.tags = {'diagnostic', 'benchmark', 'craype'} @property @sn.sanity_function diff --git a/cscs-checks/microbenchmarks/hpcg/hpcg_benchmark.py b/cscs-checks/microbenchmarks/hpcg/hpcg_benchmark.py index 20a4d8dcd8..0f4207aae3 100644 --- a/cscs-checks/microbenchmarks/hpcg/hpcg_benchmark.py +++ b/cscs-checks/microbenchmarks/hpcg/hpcg_benchmark.py @@ -52,7 +52,7 @@ def __init__(self): } self.maintainers = ['SK'] - self.tags = {'diagnostic', 'benchmark'} + self.tags = {'diagnostic', 'benchmark', 'craype'} @property @sn.sanity_function @@ -129,7 +129,7 @@ def __init__(self): } self.maintainers = ['SK'] - self.tags = {'diagnostic', 'benchmark'} + self.tags = {'diagnostic', 'benchmark', 'craype'} @property @sn.sanity_function diff --git a/cscs-checks/microbenchmarks/kernel_latency/kernel_latency.py b/cscs-checks/microbenchmarks/kernel_latency/kernel_latency.py index 89144f8ada..a2fe416b53 100644 --- a/cscs-checks/microbenchmarks/kernel_latency/kernel_latency.py +++ b/cscs-checks/microbenchmarks/kernel_latency/kernel_latency.py @@ -91,7 +91,7 @@ def __init__(self, kernel_version): self.reference = self.sys_reference[kernel_version] self.maintainers = ['TM'] - self.tags = {'benchmark', 'diagnostic'} + self.tags = {'benchmark', 'diagnostic', 'craype'} @property @sn.sanity_function diff --git a/cscs-checks/microbenchmarks/latency/latency.py b/cscs-checks/microbenchmarks/latency/latency.py index 11f4dba10d..a46cccad25 100644 --- a/cscs-checks/microbenchmarks/latency/latency.py +++ b/cscs-checks/microbenchmarks/latency/latency.py @@ -86,7 +86,7 @@ def lat_pattern(index): } self.maintainers = ['SK'] - self.tags = {'benchmark', 'diagnostic'} + self.tags = {'benchmark', 'diagnostic', 'craype'} @property @sn.sanity_function diff --git a/cscs-checks/microbenchmarks/osu/osu_tests.py b/cscs-checks/microbenchmarks/osu/osu_tests.py index 901d7412f6..87d7fed709 100644 --- a/cscs-checks/microbenchmarks/osu/osu_tests.py +++ b/cscs-checks/microbenchmarks/osu/osu_tests.py @@ -25,7 +25,7 @@ def __init__(self, variant): 'latency': sn.extractsingle(r'^8\s+(?P\S+)', self.stdout, 'latency', float) } - self.tags = {variant, 'benchmark'} + self.tags = {variant, 'benchmark', 'craype'} self.reference = { 'dom:gpu': { 'latency': (8.23, None, 0.1, 'us') @@ -72,7 +72,7 @@ def __init__(self): self.num_tasks_per_node = 1 self.num_tasks = 0 self.sanity_patterns = sn.assert_found(r'^1048576', self.stdout) - self.tags = {'diagnostic', 'ops', 'benchmark'} + self.tags = {'diagnostic', 'ops', 'benchmark', 'craype'} @rfm.required_version('>=2.16') @@ -99,7 +99,7 @@ def __init__(self, variant): 'latency': sn.extractsingle(r'^8\s+(?P\S+)', self.stdout, 'latency', float) } - self.tags = {'production', 'benchmark'} + self.tags = {'production', 'benchmark', 'craype'} if variant == 'small': self.num_tasks = 6 self.reference = { @@ -182,7 +182,7 @@ def __init__(self): self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu', 'PrgEnv-intel'] self.maintainers = ['RS', 'VK'] - self.tags = {'production', 'benchmark'} + self.tags = {'production', 'benchmark', 'craype'} self.sanity_patterns = sn.assert_found(r'^4194304', self.stdout) self.extra_resources = { diff --git a/cscs-checks/microbenchmarks/shmem/shmem.py b/cscs-checks/microbenchmarks/shmem/shmem.py index 385fdb818b..0ae6c3c351 100644 --- a/cscs-checks/microbenchmarks/shmem/shmem.py +++ b/cscs-checks/microbenchmarks/shmem/shmem.py @@ -41,7 +41,7 @@ def __init__(self): } self.maintainers = ['SK'] - self.tags = {'benchmark', 'diagnostic'} + self.tags = {'benchmark', 'diagnostic', 'craype'} @property @sn.sanity_function diff --git a/cscs-checks/microbenchmarks/stream/stream.py b/cscs-checks/microbenchmarks/stream/stream.py index b3c3a30437..f5aa4eede2 100644 --- a/cscs-checks/microbenchmarks/stream/stream.py +++ b/cscs-checks/microbenchmarks/stream/stream.py @@ -102,7 +102,7 @@ def __init__(self): '*': {'triad': (0.0, None, None, 'MB/s')}, } } - self.tags = {'production'} + self.tags = {'production', 'craype'} self.maintainers = ['RS', 'VK'] def setup(self, partition, environ, **job_opts): diff --git a/cscs-checks/prgenv/affinity_check.py b/cscs-checks/prgenv/affinity_check.py index 7068947088..bce5450832 100644 --- a/cscs-checks/prgenv/affinity_check.py +++ b/cscs-checks/prgenv/affinity_check.py @@ -17,7 +17,7 @@ def __init__(self, variant): self.executable = './affinity/affinity' self.variant = variant self.maintainers = ['RS', 'VK'] - self.tags = {'production', 'scs', 'maintenance'} + self.tags = {'production', 'scs', 'maintenance', 'craype'} def setup(self, partition, environ, **job_opts): diff --git a/cscs-checks/prgenv/cpu_target_check.py b/cscs-checks/prgenv/cpu_target_check.py index d0b6b00a1e..765ff1d03b 100644 --- a/cscs-checks/prgenv/cpu_target_check.py +++ b/cscs-checks/prgenv/cpu_target_check.py @@ -15,4 +15,4 @@ def __init__(self): self.stdout) self.maintainers = ['TM'] - self.tags = {'production', 'maintenance'} + self.tags = {'production', 'maintenance', 'craype'} diff --git a/cscs-checks/prgenv/environ_check.py b/cscs-checks/prgenv/environ_check.py index 3d8e54b453..3dd3127547 100644 --- a/cscs-checks/prgenv/environ_check.py +++ b/cscs-checks/prgenv/environ_check.py @@ -12,7 +12,7 @@ def __init__(self): self.valid_prog_environs = ['PrgEnv-cray'] self.valid_systems = ['daint:login', 'dom:login'] self.maintainers = ['VK', 'CB'] - self.tags = {'production'} + self.tags = {'production', 'craype'} # We need to override setup, because otherwise environ will be loaded and # we could not check if PrgEnv-cray is the default environment. This, @@ -50,7 +50,7 @@ def __init__(self): self.sanity_patterns = sn.assert_found(self.env_module_patt, self.stderr) self.maintainers = ['VK', 'CB'] - self.tags = {'production'} + self.tags = {'production', 'craype'} @property @sn.sanity_function diff --git a/cscs-checks/prgenv/helloworld.py b/cscs-checks/prgenv/helloworld.py index 0f4491df21..191f536335 100644 --- a/cscs-checks/prgenv/helloworld.py +++ b/cscs-checks/prgenv/helloworld.py @@ -34,7 +34,7 @@ def __init__(self, variant, lang, linkage): self.compilation_time_seconds = None self.maintainers = ['CB', 'VK'] - self.tags = {'production'} + self.tags = {'production', 'craype'} def setup(self, partition, environ, **job_opts): result = sn.findall(r'Hello World from thread \s*(\d+) out ' @@ -137,7 +137,7 @@ def __init__(self, lang, linkage): self.sourcepath += '_openmp.' + lang self.descr += ' OpenMP ' + str.capitalize(linkage) self.prgenv_flags = { - 'PrgEnv-cray': self.cray_omp_flags(lang), + 'PrgEnv-cray': ['-homp' if lang == 'F90' else '-fopenmp'], 'PrgEnv-cray_classic': ['-homp'], 'PrgEnv-gnu': ['-fopenmp'], 'PrgEnv-intel': ['-qopenmp'], @@ -193,7 +193,7 @@ def __init__(self, lang, linkage): self.sourcepath += '_mpi_openmp.' + lang self.descr += ' MPI + OpenMP ' + linkage.capitalize() self.prgenv_flags = { - 'PrgEnv-cray': self.cray_omp_flags(lang), + 'PrgEnv-cray': ['-homp' if lang == 'F90' else '-fopenmp'], 'PrgEnv-cray_classic': ['-homp'], 'PrgEnv-gnu': ['-fopenmp'], 'PrgEnv-intel': ['-qopenmp'], diff --git a/cscs-checks/prgenv/mpi.py b/cscs-checks/prgenv/mpi.py index 260c9e69f6..d32bd76804 100644 --- a/cscs-checks/prgenv/mpi.py +++ b/cscs-checks/prgenv/mpi.py @@ -61,7 +61,7 @@ def __init__(self, required_thread): self.mpithread_version[required_thread]) ]) self.maintainers = ['JG'] - self.tags = {'production'} + self.tags = {'production', 'craype'} @rfm.simple_test @@ -88,7 +88,7 @@ def __init__(self): self.stdout, 'nprocs', int) self.sanity_patterns = sn.assert_eq(num_processes, self.num_tasks_assigned-1) - self.tags = {'diagnostic', 'ops'} + self.tags = {'diagnostic', 'ops', 'craype'} @property @sn.sanity_function diff --git a/cscs-checks/prgenv/openacc_checks.py b/cscs-checks/prgenv/openacc_checks.py index 01fccbcb43..a9c573f401 100644 --- a/cscs-checks/prgenv/openacc_checks.py +++ b/cscs-checks/prgenv/openacc_checks.py @@ -39,7 +39,7 @@ def __init__(self, variant): self.sanity_patterns = sn.assert_reference(result, 1., -1e-5, 1e-5) self.maintainers = ['TM', 'VK'] - self.tags = {'production'} + self.tags = {'production', 'craype'} def setup(self, partition, environ, **job_opts): if environ.name.startswith('PrgEnv-cray'): diff --git a/cscs-checks/prgenv/opencl_check.py b/cscs-checks/prgenv/opencl_check.py index beced1f0a6..86362c080f 100644 --- a/cscs-checks/prgenv/opencl_check.py +++ b/cscs-checks/prgenv/opencl_check.py @@ -9,7 +9,7 @@ class OpenCLCheck(rfm.RegressionTest): def __init__(self): super().__init__() self.maintainers = ['TM', 'VK'] - self.tags = {'production'} + self.tags = {'production', 'craype'} self.valid_systems = ['daint:gpu', 'dom:gpu'] self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-pgi'] diff --git a/cscs-checks/prgenv/ssh_environ_check.py b/cscs-checks/prgenv/ssh_environ_check.py index 2ea7c127ab..1d2488d0cf 100644 --- a/cscs-checks/prgenv/ssh_environ_check.py +++ b/cscs-checks/prgenv/ssh_environ_check.py @@ -11,7 +11,7 @@ def __init__(self): self.valid_systems = ['daint:login', 'dom:login'] self.valid_prog_environs = ['PrgEnv-cray'] reference = { - 'CRAY_CPU_TARGET': 'haswell', + 'CRAY_CPU_TARGET': ('haswell', 'broadwell'), 'CRAYPE_NETWORK_TARGET': 'aries', 'MODULEPATH': r'[\S+]', 'MODULESHOME': r'/opt/cray/pe/modules/[\d+\.+]', @@ -29,7 +29,7 @@ def __init__(self): self.sanity_patterns = sn.all( sn.map(self.assert_envvar, list(reference.items()))) self.maintainers = ['RS', 'LM'] - self.tags = {'maintenance', 'production'} + self.tags = {'maintenance', 'production', 'craype'} def assert_envvar(self, v): return sn.assert_found('='.join(v), self.stdout) diff --git a/cscs-checks/prgenv/ulimit_check.py b/cscs-checks/prgenv/ulimit_check.py index 5096ef8401..f54c8a742a 100644 --- a/cscs-checks/prgenv/ulimit_check.py +++ b/cscs-checks/prgenv/ulimit_check.py @@ -18,4 +18,4 @@ def __init__(self): ]) self.maintainers = ['RS', 'VK'] - self.tags = {'production', 'scs'} + self.tags = {'production', 'scs', 'craype'} diff --git a/cscs-checks/tools/profiling_and_debugging/cuda_gdb.py b/cscs-checks/tools/profiling_and_debugging/cuda_gdb.py index 8461fcecbd..dcdffe8c73 100644 --- a/cscs-checks/tools/profiling_and_debugging/cuda_gdb.py +++ b/cscs-checks/tools/profiling_and_debugging/cuda_gdb.py @@ -46,7 +46,7 @@ def __init__(self): ]) self.maintainers = ['MK', 'JG'] - self.tags = {'production'} + self.tags = {'production', 'craype'} def setup(self, partition, environ, **job_opts): super().setup(partition, environ, **job_opts) diff --git a/cscs-checks/tools/profiling_and_debugging/ddt.py b/cscs-checks/tools/profiling_and_debugging/ddt.py index f0173ce46e..3b597d5908 100644 --- a/cscs-checks/tools/profiling_and_debugging/ddt.py +++ b/cscs-checks/tools/profiling_and_debugging/ddt.py @@ -47,7 +47,7 @@ def __init__(self, lang, extension): 'Cuda': 94 } self.maintainers = ['MK', 'JG'] - self.tags = {'production'} + self.tags = {'production', 'craype'} self.post_run = ['ddt -V ; which ddt ;'] self.keep_files = ['ddtreport.txt'] diff --git a/cscs-checks/tools/profiling_and_debugging/gdb4hpc.py b/cscs-checks/tools/profiling_and_debugging/gdb4hpc.py index 27a7e6f403..5353355a74 100644 --- a/cscs-checks/tools/profiling_and_debugging/gdb4hpc.py +++ b/cscs-checks/tools/profiling_and_debugging/gdb4hpc.py @@ -41,7 +41,7 @@ def __init__(self, lang, extension): 'OMP_PROC_BIND': 'true', } self.maintainers = ['JG'] - self.tags = {'production'} + self.tags = {'production', 'craype'} # gdb4hpc has its own way to launch a debugging job and needs an # additional jobscript. The reframe jobscript can be copied for that # purpose, by adding the cray_debug_ comments around the job launch diff --git a/cscs-checks/tools/profiling_and_debugging/nvprof.py b/cscs-checks/tools/profiling_and_debugging/nvprof.py index df550d56b5..f4fe6b0c9c 100644 --- a/cscs-checks/tools/profiling_and_debugging/nvprof.py +++ b/cscs-checks/tools/profiling_and_debugging/nvprof.py @@ -42,4 +42,4 @@ def __init__(self): self.modules = ['craype-accel-nvidia60'] self.maintainers = ['MK', 'JG'] - self.tags = {'production'} + self.tags = {'production', 'craype'} diff --git a/cscs-checks/tools/profiling_and_debugging/perftools.py b/cscs-checks/tools/profiling_and_debugging/perftools.py index 91115e28c9..c09df11218 100644 --- a/cscs-checks/tools/profiling_and_debugging/perftools.py +++ b/cscs-checks/tools/profiling_and_debugging/perftools.py @@ -24,7 +24,10 @@ def __init__(self, lang): else: self.sourcesdir = os.path.join('src', lang) - self.modules = ['craype-accel-nvidia60', 'perftools-lite'] + self.modules = ['perftools-lite'] + if lang == 'Cuda': + self.modules += ['craype-accel-nvidia60'] + self.build_system = 'Make' # NOTE: Restrict concurrency to allow creation of Fortran modules if lang == 'F90': @@ -74,7 +77,7 @@ def __init__(self, lang): self.sanity_patterns = sn.assert_found('Table 1: Profile by Function', self.stdout) self.maintainers = ['MK', 'JG'] - self.tags = {'production'} + self.tags = {'production', 'craype'} def setup(self, environ, partition, **job_opts): super().setup(environ, partition, **job_opts) From b50332b7009ce2be56f8a7414af610a4e900dfaa Mon Sep 17 00:00:00 2001 From: jgp Date: Tue, 15 Oct 2019 18:37:52 +0200 Subject: [PATCH 2/3] removing cray_omp_flags --- cscs-checks/prgenv/helloworld.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/cscs-checks/prgenv/helloworld.py b/cscs-checks/prgenv/helloworld.py index 191f536335..8243ddd80a 100644 --- a/cscs-checks/prgenv/helloworld.py +++ b/cscs-checks/prgenv/helloworld.py @@ -93,12 +93,6 @@ def compile(self): self.compilation_time_seconds = ( datetime.now() - self.compilation_time_seconds).total_seconds() - def cray_omp_flags(self, lang): - if lang != 'f90' and self.current_system.name in {'daint', 'dom'}: - return ['-fopenmp'] - - return ['-homp'] - @rfm.required_version('>=2.14') @rfm.parameterized_test(*([lang, linkage] From c0c60b68c58ff281d5e51c49ecefad549e92848a Mon Sep 17 00:00:00 2001 From: jgp Date: Tue, 15 Oct 2019 18:42:40 +0200 Subject: [PATCH 3/3] typo --- cscs-checks/prgenv/ssh_environ_check.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cscs-checks/prgenv/ssh_environ_check.py b/cscs-checks/prgenv/ssh_environ_check.py index 1d2488d0cf..e7f1881373 100644 --- a/cscs-checks/prgenv/ssh_environ_check.py +++ b/cscs-checks/prgenv/ssh_environ_check.py @@ -11,7 +11,7 @@ def __init__(self): self.valid_systems = ['daint:login', 'dom:login'] self.valid_prog_environs = ['PrgEnv-cray'] reference = { - 'CRAY_CPU_TARGET': ('haswell', 'broadwell'), + 'CRAY_CPU_TARGET': ('haswell'), 'CRAYPE_NETWORK_TARGET': 'aries', 'MODULEPATH': r'[\S+]', 'MODULESHOME': r'/opt/cray/pe/modules/[\d+\.+]',