Merge pull request #1011 from teojgo/test/fix_nvidia_mkl_resolve

[test] Fix nvidia and libsci/mkl resolve tests

Author: Vasileios Karakasis

cscs-checks/compile/libsci_resolve.py

@@ -16,12 +16,11 @@ def __init__(self):
 
 @rfm.required_version('>=2.14')
 @rfm.parameterized_test(['craype-accel-nvidia35'], ['craype-accel-nvidia60'])
-class Nvidia35ResolveTest(LibSciResolveBaseTest):
+class NvidiaResolveTest(LibSciResolveBaseTest):
     def __init__(self, module_name):
         super().__init__()
         self.descr = 'Module %s resolves libsci_acc' % module_name
         self.build_system = 'SingleSource'
-        self.build_system.fflags = ['-Wl,-ypdgemm_']
 
         self.module_name = module_name
         self.module_version = {
@@ -41,30 +40,36 @@ def __init__(self, module_name):
             'PrgEnv-gnu':  'gnu'
         }
 
+        # FIXME Flags '-Wl,-ydgemm_' which are passed to the linker do not
+        # produce any output when xalt/2.7.10 is loaded, thus we use readelf
+        # to find the dynamic libraries of the executable
+        # self.build_system.fflags = ['-Wl,-ydgemm_']
+        self.postbuild_cmd = ['readelf -d %s' % self.executable]
+
     def setup(self, partition, environ, **job_opts):
         super().setup(partition, environ, **job_opts)
 
         # here lib_name is in the format: libsci_acc_gnu_48_nv35.so or
         #                                 libsci_acc_cray_nv35.so
-        regex = (r'libsci_acc_(?P<prgenv>[A-Za-z]+)_((?P<cver>[A-Za-z0-9]+)_)?'
-                 r'(?P<version>\S+)(?=(\.a)|(\.so))')
+        regex = (r'.*\(NEEDED\).*libsci_acc_(?P<prgenv>[A-Za-z]+)_'
+                 r'((?P<cver>[A-Za-z0-9]+)_)?(?P<version>\S+)\.so')
         prgenv = self.prgenv_names[self.current_environ.name]
         cver = self.compiler_version.get(self.current_system.name,
                                          self.compiler_version_default)
         mod_name = self.module_version[self.module_name]
 
         if self.current_environ.name == 'PrgEnv-cray':
-            cver_sanity = sn.assert_found(regex, self.stderr)
+            cver_sanity = sn.assert_found(regex, self.stdout)
         else:
             cver_sanity = sn.assert_eq(
-                sn.extractsingle(regex, self.stderr, 'cver'), cver)
+                sn.extractsingle(regex, self.stdout, 'cver'), cver)
 
         self.sanity_patterns = sn.all([
             sn.assert_eq(
-                sn.extractsingle(regex, self.stderr, 'prgenv'), prgenv),
+                sn.extractsingle(regex, self.stdout, 'prgenv'), prgenv),
             cver_sanity,
             sn.assert_eq(
-                sn.extractsingle(regex, self.stderr, 'version'), mod_name)
+                sn.extractsingle(regex, self.stdout, 'version'), mod_name)
         ])
 
 
@@ -76,18 +81,20 @@ def __init__(self):
         self.descr = '-mkl Resolves to MKL'
         self.valid_prog_environs = ['PrgEnv-intel']
         self.build_system = 'SingleSource'
-        self.build_system.fflags = ['-Wl,-ydgemm_', '-mkl']
 
-        # interesting enough, on Dora the linking here is static.
-        # So there is REAL need for the end term (?=(.a)|(.so)).
-        # not sure if we need to check against the version here
-        regex = (r'libmkl_(?P<prgenv>[A-Za-z]+)_(?P<version>\S+)'
-                 r'(?=(.a)|(.so))')
+        # FIXME Flags '-Wl,-ydgemm_' which are passed to the linker do not
+        # produce any output when xalt/2.7.10 is loaded, thus we use readelf
+        # to find the dynamic libraries of the executable
+        # self.build_system.fflags = ['-Wl,-ydgemm_', '-mkl']
+        self.build_system.fflags = ['-mkl']
+        self.postbuild_cmd = ['readelf -d %s' % self.executable]
+        regex = (r'.*\(NEEDED\).*libmkl_(?P<prgenv>[A-Za-z]+)_(?P<version>\S+)'
+                 r'\.so')
         self.sanity_patterns = sn.all([
             sn.assert_eq(
-                sn.extractsingle(regex, self.stderr, 'prgenv'), 'intel'),
+                sn.extractsingle(regex, self.stdout, 'prgenv'), 'intel'),
             sn.assert_eq(
-                sn.extractsingle(regex, self.stderr, 'version'), 'lp64')
+                sn.extractsingle(regex, self.stdout, 'version'), 'lp64')
         ])
 
         self.maintainers = ['AJ']