zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel-parallel-studio: fix vtune installation for 2020+ (#22255)

Browse Source 
vtune_amplifier got renamed to vtune_profiler for the 2020+ suite
This commit is contained in:
Tiziano Müller 2021-04-13 13:01:58 +02:00 committed by GitHub
parent 0b9bd92511
commit a580788d86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/spack/spack/build_systems/intel.py
View File

@ -151,7 +151,7 @@ def license_files(self):
'+advisor': 'advisor', '+advisor': 'advisor',
'+inspector': 'inspector', '+inspector': 'inspector',
'+itac': 'itac', '+itac': 'itac',
'+vtune': 'vtune_amplifier', '+vtune': 'vtune_profiler',
}.items(): }.items():
if variant in self.spec: if variant in self.spec:
dirs.append(self.normalize_path( dirs.append(self.normalize_path(
@ -202,7 +202,8 @@ def pset_components(self):
'+itac': ' intel-itac intel-ta intel-tc' '+itac': ' intel-itac intel-ta intel-tc'
' intel-trace-analyzer intel-trace-collector', ' intel-trace-analyzer intel-trace-collector',
# Trace Analyzer and Collector # Trace Analyzer and Collector
'+vtune': ' intel-vtune-amplifier', # VTune '+vtune': ' intel-vtune'
# VTune, ..-profiler since 2020, ..-amplifier before
}.items(): }.items():
if variant in self.spec: if variant in self.spec:
c += components_to_add c += components_to_add
@ -535,8 +536,9 @@ def normalize_path(self, component_path, component_suite_dir=None,
[None, '2016:', 'compilers_and_libraries'], [None, '2016:', 'compilers_and_libraries'],
['advisor', ':2016', 'advisor_xe'], ['advisor', ':2016', 'advisor_xe'],
['inspector', ':2016', 'inspector_xe'], ['inspector', ':2016', 'inspector_xe'],
['vtune_amplifier', ':2017', 'vtune_amplifier_xe'], ['vtune_profiler', ':2017', 'vtune_amplifier_xe'],
['vtune', ':2017', 'vtune_amplifier_xe'], # alt. ['vtune', ':2017', 'vtune_amplifier_xe'], # alt.
['vtune_profiler', ':2019', 'vtune_amplifier'],
['itac', ':', 'itac', [os.sep + standalone_glob]], ['itac', ':', 'itac', [os.sep + standalone_glob]],
]: ]:
if cs == rename_rule[0] and v.satisfies(ver(rename_rule[1])): if cs == rename_rule[0] and v.satisfies(ver(rename_rule[1])):