diff options
| author | Tiziano Müller <tiziano.mueller@chem.uzh.ch> | 2021-04-13 13:01:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-13 13:01:58 +0200 |
| commit | a580788d861f9ca2138668100b9281b1c8b0e2b3 (patch) | |
| tree | 09c6f21d72a4a001a86c9fa43da4e0bf8e11b0e0 /lib | |
| parent | 0b9bd92511cec9c8e3bb49d412f1f8de49257ad7 (diff) | |
| download | spack-a580788d861f9ca2138668100b9281b1c8b0e2b3.tar.gz spack-a580788d861f9ca2138668100b9281b1c8b0e2b3.tar.bz2 spack-a580788d861f9ca2138668100b9281b1c8b0e2b3.tar.xz spack-a580788d861f9ca2138668100b9281b1c8b0e2b3.zip | |
intel-parallel-studio: fix vtune installation for 2020+ (#22255)
vtune_amplifier got renamed to vtune_profiler for the 2020+ suite
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/build_systems/intel.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/spack/spack/build_systems/intel.py b/lib/spack/spack/build_systems/intel.py index 18628b8910..16a7e50084 100644 --- a/lib/spack/spack/build_systems/intel.py +++ b/lib/spack/spack/build_systems/intel.py @@ -151,7 +151,7 @@ class IntelPackage(PackageBase): '+advisor': 'advisor', '+inspector': 'inspector', '+itac': 'itac', - '+vtune': 'vtune_amplifier', + '+vtune': 'vtune_profiler', }.items(): if variant in self.spec: dirs.append(self.normalize_path( @@ -202,7 +202,8 @@ class IntelPackage(PackageBase): '+itac': ' intel-itac intel-ta intel-tc' ' intel-trace-analyzer intel-trace-collector', # Trace Analyzer and Collector - '+vtune': ' intel-vtune-amplifier', # VTune + '+vtune': ' intel-vtune' + # VTune, ..-profiler since 2020, ..-amplifier before }.items(): if variant in self.spec: c += components_to_add @@ -535,8 +536,9 @@ class IntelPackage(PackageBase): [None, '2016:', 'compilers_and_libraries'], ['advisor', ':2016', 'advisor_xe'], ['inspector', ':2016', 'inspector_xe'], - ['vtune_amplifier', ':2017', 'vtune_amplifier_xe'], + ['vtune_profiler', ':2017', 'vtune_amplifier_xe'], ['vtune', ':2017', 'vtune_amplifier_xe'], # alt. + ['vtune_profiler', ':2019', 'vtune_amplifier'], ['itac', ':', 'itac', [os.sep + standalone_glob]], ]: if cs == rename_rule[0] and v.satisfies(ver(rename_rule[1])): |