From 2d862f3a9eccadcd94ab6ad8987e408c2eb13e22 Mon Sep 17 00:00:00 2001 From: Ake Sandgren Date: Thu, 18 Nov 2021 14:35:12 +0100 Subject: [PATCH 1/3] Fix incorrect regex for GpuBandwidth perf results The string tested on is multiline, so must not match stuff with * --- hpctestlib/microbenchmarks/gpu/memory_bandwidth/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hpctestlib/microbenchmarks/gpu/memory_bandwidth/__init__.py b/hpctestlib/microbenchmarks/gpu/memory_bandwidth/__init__.py index 4198f8f399..ddfd72b329 100644 --- a/hpctestlib/microbenchmarks/gpu/memory_bandwidth/__init__.py +++ b/hpctestlib/microbenchmarks/gpu/memory_bandwidth/__init__.py @@ -5,6 +5,7 @@ import reframe.utility.sanity as sn import reframe as rfm +import sys __all__ = ['GpuBandwidth', 'GpuBandwidthD2D'] @@ -144,7 +145,7 @@ def _xfer_pattern(self, xfer_kind): # Extract the bandwidth corresponding to the right node, transfer and # device. - return (rf'^[^,]*\[[^\]]*\]\s*{direction}\s*bandwidth on device' + return (rf'^\[[^\]]*\]\s*{direction}\s*bandwidth on device' r' \d+ is \s*(\S+)\s*GB/s.') From 1044e43d5dbe1c413a8138063bdfbd83b5b9f72a Mon Sep 17 00:00:00 2001 From: Victor Holanda Date: Thu, 18 Nov 2021 19:23:29 +0100 Subject: [PATCH 2/3] Remove unused library sys --- hpctestlib/microbenchmarks/gpu/memory_bandwidth/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/hpctestlib/microbenchmarks/gpu/memory_bandwidth/__init__.py b/hpctestlib/microbenchmarks/gpu/memory_bandwidth/__init__.py index ddfd72b329..669e2ea1c6 100644 --- a/hpctestlib/microbenchmarks/gpu/memory_bandwidth/__init__.py +++ b/hpctestlib/microbenchmarks/gpu/memory_bandwidth/__init__.py @@ -5,7 +5,6 @@ import reframe.utility.sanity as sn import reframe as rfm -import sys __all__ = ['GpuBandwidth', 'GpuBandwidthD2D'] From 03f5316ed3daed25d69359dc22635f16981dfe7f Mon Sep 17 00:00:00 2001 From: Ake Sandgren Date: Thu, 18 Nov 2021 19:37:01 +0100 Subject: [PATCH 3/3] Fix incorrect regex for GpuBandwidthD2D perf results The string tested on is multiline, so must not match stuff with * --- hpctestlib/microbenchmarks/gpu/memory_bandwidth/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hpctestlib/microbenchmarks/gpu/memory_bandwidth/__init__.py b/hpctestlib/microbenchmarks/gpu/memory_bandwidth/__init__.py index 669e2ea1c6..10d0330d57 100644 --- a/hpctestlib/microbenchmarks/gpu/memory_bandwidth/__init__.py +++ b/hpctestlib/microbenchmarks/gpu/memory_bandwidth/__init__.py @@ -179,6 +179,6 @@ def set_perf_patterns(self): ''' self.perf_patterns = { 'bw': sn.min(sn.extractall( - r'^[^,]*\[[^\]]*\]\s+GPU\s+\d+\s+(\s*\d+.\d+\s)+', + r'^\[[^\]]*\]\s+GPU\s+\d+\s+(\s*\d+.\d+\s)+', self.stdout, 1, float)) }