Merge pull request #785 from jgphpc/MAINT-75

[test] Hardcode version in Intel Vtune test to prevent failure when default changes
reframe-hpc · May 19, 2019 · 166cf73 · 166cf73
2 parents 758f93e + 9975ab6
commit 166cf73
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/cscs-checks/tools/profiling_and_debugging/intel_vtune.py b/cscs-checks/tools/profiling_and_debugging/intel_vtune.py
@@ -45,10 +45,6 @@ def __init__(self, lang):
         self.version_rpt = 'Intel_VTuneAmplifier_version.rpt'
         self.summary_rpt = 'Intel_VTuneAmplifier_summary.rpt'
         self.paranoid_rpt = 'Intel_VTuneAmplifier_paranoid.rpt'
-        self.pre_run = [
-            'source $INTEL_PATH/../vtune_amplifier/amplxe-vars.sh',
-            'amplxe-cl -help collect |tail -20',
-        ]
         self.post_run = [
             'amplxe-cl -V &> %s' % self.version_rpt,
             'amplxe-cl -R hotspots -r hotspots* -column="CPU Time:Self" &>%s' %
@@ -72,11 +68,12 @@ def setup(self, partition, environ, **job_opts):
         elif partitiontype == 'mc':
             self.job.options = ['--constraint="mc&perf"']
 
-        if self.current_system.name == 'dom':
-            toolsversion = '579888'
-        elif self.current_system.name == 'daint':
-            toolsversion = '551022'
-
+        vtuneversion = '2019'
+        toolsversion = '579888'
+        self.pre_run = [
+            'source $INTEL_PATH/../vtune_amplifier_%s/amplxe-vars.sh' %
+            vtuneversion, 'amplxe-cl -help collect | tail -20',
+        ]
         self.sanity_patterns = sn.all([
             # check the job:
             sn.assert_found('SUCCESS', self.stdout),