From 111e03b7365f550902fa37bea0f11bc92ef71d82 Mon Sep 17 00:00:00 2001 From: Xavier Lapillonne Date: Thu, 29 Nov 2018 17:59:00 +0100 Subject: [PATCH 1/2] Fail if test is not compiled with OpenACC We probably should add this to all the OpenACC test, they have no purpose on CPU and we want to make sure there is no mistake in the flags/compiler --- cscs-checks/mch/src/automatic_arrays.f90 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cscs-checks/mch/src/automatic_arrays.f90 b/cscs-checks/mch/src/automatic_arrays.f90 index 926ab9e734..6d12dc9a40 100644 --- a/cscs-checks/mch/src/automatic_arrays.f90 +++ b/cscs-checks/mch/src/automatic_arrays.f90 @@ -357,6 +357,12 @@ program AutomaticArrays call MPI_Comm_size(MPI_COMM_WORLD, mpi_size, ierr) call MPI_Comm_rank(MPI_COMM_WORLD, mpi_rank, ierr) +#ifndef _OPENACC + write (*,'(A)') "Error: this test must be compield with OpenACC on" + write (*,'(A)') "Result: FAIL" + CALL MPI_Abort(MPI_COMM_WORLD, ierr) +#endif + !----------------------------------------------------------------------------! ! CPU reference with work arrays From 3dd6203cbe875d1c6e61c09d22c642e841f6fab8 Mon Sep 17 00:00:00 2001 From: ajocksch Date: Tue, 4 Dec 2018 10:33:30 +0100 Subject: [PATCH 2/2] all changes automatic_arrays --- .../{automatic_arrays.py => automatic_arrays_acc.py} | 11 ++--------- ...omatic_arrays.f90 => automatic_arrays_OpenACC.F90} | 0 2 files changed, 2 insertions(+), 9 deletions(-) rename cscs-checks/mch/{automatic_arrays.py => automatic_arrays_acc.py} (85%) rename cscs-checks/mch/src/{automatic_arrays.f90 => automatic_arrays_OpenACC.F90} (100%) diff --git a/cscs-checks/mch/automatic_arrays.py b/cscs-checks/mch/automatic_arrays_acc.py similarity index 85% rename from cscs-checks/mch/automatic_arrays.py rename to cscs-checks/mch/automatic_arrays_acc.py index 044b89cd68..40071122d4 100644 --- a/cscs-checks/mch/automatic_arrays.py +++ b/cscs-checks/mch/automatic_arrays_acc.py @@ -8,7 +8,7 @@ def __init__(self): super().__init__() self.valid_systems = ['daint:gpu', 'dom:gpu', 'kesch:cn'] self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-pgi', - 'PrgEnv-gnu', 'PrgEnv-cray-c2sm-gpu', + 'PrgEnv-cray-c2sm-gpu', 'PrgEnv-pgi-c2sm-gpu'] if self.current_system.name in ['daint', 'dom']: self.modules = ['craype-accel-nvidia60'] @@ -23,7 +23,7 @@ def __init__(self): self.num_tasks = 1 self.num_gpus_per_node = 1 self.num_tasks_per_node = 1 - self.sourcepath = 'automatic_arrays.f90' + self.sourcepath = 'automatic_arrays_OpenACC.F90' self.build_system = 'SingleSource' self.build_system.fflags = ['-O2'] self.sanity_patterns = sn.assert_found(r'Result: ', self.stdout) @@ -38,11 +38,6 @@ def __init__(self): 'dom:gpu': {'time': (5.8E-05, None, 0.15)}, 'kesch:cn': {'time': (2.9E-04, None, 0.15)}, }, - 'PrgEnv-gnu': { - 'daint:gpu': {'time': (7.0E-03, None, 0.15)}, - 'dom:gpu': {'time': (7.3E-03, None, 0.15)}, - 'kesch:cn': {'time': (6.5E-03, None, 0.15)}, - }, 'PrgEnv-pgi': { 'daint:gpu': {'time': (6.4E-05, None, 0.15)}, 'dom:gpu': {'time': (6.3E-05, None, 0.15)}, @@ -64,8 +59,6 @@ def setup(self, partition, environ, **job_opts): self.build_system.fflags += ['-ta=tesla,cc35,cuda8.0'] elif self.current_system.name in ['daint', 'dom']: self.build_system.fflags += ['-ta=tesla,cc60', '-Mnorpath'] - elif environ.name.startswith('PrgEnv-gnu'): - envname = 'PrgEnv-gnu' else: envname = environ.name diff --git a/cscs-checks/mch/src/automatic_arrays.f90 b/cscs-checks/mch/src/automatic_arrays_OpenACC.F90 similarity index 100% rename from cscs-checks/mch/src/automatic_arrays.f90 rename to cscs-checks/mch/src/automatic_arrays_OpenACC.F90