summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Lee <lee218@llnl.gov>2018-01-11 07:51:14 -0800
committerAdam J. Stewart <ajstewart426@gmail.com>2018-01-11 09:51:14 -0600
commit5d49fe4b4c3225efc33c5b9ca78db10df45ea673 (patch)
tree59593d5dd23f8b59d0e726ab95df5e99fb1d9d6f
parent637165eef82d40abc240b1dc40edddabecbb6af3 (diff)
downloadspack-5d49fe4b4c3225efc33c5b9ca78db10df45ea673.tar.gz
spack-5d49fe4b4c3225efc33c5b9ca78db10df45ea673.tar.bz2
spack-5d49fe4b4c3225efc33c5b9ca78db10df45ea673.tar.xz
spack-5d49fe4b4c3225efc33c5b9ca78db10df45ea673.zip
fix ips 2018 vtune directory name (#6893)
-rw-r--r--var/spack/repos/builtin/packages/intel-parallel-studio/package.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py
index fefda18e18..ccfac3c9a9 100644
--- a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py
+++ b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py
@@ -341,7 +341,7 @@ class IntelParallelStudio(IntelPackage):
# Intel(R) VTune(TM) Amplifier XE
if '+vtune' in spec:
- components.append('intel-vtune-amplifier-xe')
+ components.append('intel-vtune-amplifier')
return components
@@ -397,6 +397,9 @@ class IntelParallelStudio(IntelPackage):
if '+vtune' in spec:
vtune_dir = 'vtune_amplifier_xe/licenses'
+ if year >= 2018:
+ vtune_dir = 'vtune_amplifier/licenses'
+
directories.append(vtune_dir)
return [os.path.join(dir, 'license.lic') for dir in directories]