From d88853d0873f26e8204a215f38df7c682bb0b96b Mon Sep 17 00:00:00 2001 From: ajocksch Date: Mon, 25 Feb 2019 11:36:16 +0100 Subject: [PATCH 1/2] added test description --- cscs-checks/mch/collectives_halo.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/cscs-checks/mch/collectives_halo.py b/cscs-checks/mch/collectives_halo.py index 0801a6ee78..0fd50c4c11 100644 --- a/cscs-checks/mch/collectives_halo.py +++ b/cscs-checks/mch/collectives_halo.py @@ -2,7 +2,7 @@ import reframe.utility.sanity as sn -class CollectivesBaseTest(rfm.RegressionTest): +class CommunicationBaseTest(rfm.RegressionTest): def __init__(self, variant, bench_reference): super().__init__() self.valid_systems = ['dom:gpu', 'daint:gpu', 'kesch:cn'] @@ -86,8 +86,11 @@ def setup(self, *args, **kwargs): '--cpu_bind=q'] +# the values default, nocomm and nocomp refer to the different parts +# of the check where the time is measured; default == all +# nocomm == no communication nocomp == no computation @rfm.parameterized_test(['default'], ['nocomm'], ['nocomp']) -class AlltoallvTest(CollectivesBaseTest): +class AlltoallvTest(CommunicationBaseTest): def __init__(self, variant): super().__init__(variant, { @@ -102,13 +105,14 @@ def __init__(self, variant): 'default': 0.0138493 } }) + self.descr = 'Alltoall communication; Meteoswiss check' self.strict_check = False self.sourcesdir = 'https://github.com/cosunae/comm_overlap_bench' self.prebuild_cmd = ['git checkout alltoallv'] @rfm.parameterized_test(['default'], ['nocomm'], ['nocomp']) -class HaloExchangeTest(CollectivesBaseTest): +class HaloExchangeTest(CommunicationBaseTest): def __init__(self, variant): super().__init__(variant, { @@ -123,5 +127,6 @@ def __init__(self, variant): 'default': 2.53509 } }) + self.descr = 'Halo-cell exchange; Meteoswiss check' self.sourcesdir = 'https://github.com/MeteoSwiss-APN/comm_overlap_bench.git' self.prebuild_cmd = ['git checkout barebones'] From afc5e5692e85597541fe77e25d70198c7f830b62 Mon Sep 17 00:00:00 2001 From: ajocksch Date: Mon, 4 Mar 2019 09:27:10 +0100 Subject: [PATCH 2/2] implemented changes required --- cscs-checks/mch/collectives_halo.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cscs-checks/mch/collectives_halo.py b/cscs-checks/mch/collectives_halo.py index 0fd50c4c11..9a2fd30d88 100644 --- a/cscs-checks/mch/collectives_halo.py +++ b/cscs-checks/mch/collectives_halo.py @@ -2,7 +2,7 @@ import reframe.utility.sanity as sn -class CommunicationBaseTest(rfm.RegressionTest): +class CommunicationTestBase(rfm.RegressionTest): def __init__(self, variant, bench_reference): super().__init__() self.valid_systems = ['dom:gpu', 'daint:gpu', 'kesch:cn'] @@ -90,7 +90,7 @@ def setup(self, *args, **kwargs): # of the check where the time is measured; default == all # nocomm == no communication nocomp == no computation @rfm.parameterized_test(['default'], ['nocomm'], ['nocomp']) -class AlltoallvTest(CommunicationBaseTest): +class AlltoallvTest(CommunicationTestBase): def __init__(self, variant): super().__init__(variant, { @@ -105,14 +105,14 @@ def __init__(self, variant): 'default': 0.0138493 } }) - self.descr = 'Alltoall communication; Meteoswiss check' + self.descr = 'Alltoall communication test' self.strict_check = False self.sourcesdir = 'https://github.com/cosunae/comm_overlap_bench' self.prebuild_cmd = ['git checkout alltoallv'] @rfm.parameterized_test(['default'], ['nocomm'], ['nocomp']) -class HaloExchangeTest(CommunicationBaseTest): +class HaloExchangeTest(CommunicationTestBase): def __init__(self, variant): super().__init__(variant, { @@ -127,6 +127,6 @@ def __init__(self, variant): 'default': 2.53509 } }) - self.descr = 'Halo-cell exchange; Meteoswiss check' + self.descr = 'Halo-cell exchange test' self.sourcesdir = 'https://github.com/MeteoSwiss-APN/comm_overlap_bench.git' self.prebuild_cmd = ['git checkout barebones']