From b8a91db08948440100a2d4d6a0cad01f1eb9b33a Mon Sep 17 00:00:00 2001
From: "Gregory L. Lee" <lee218@llnl.gov>
Date: Thu, 12 May 2016 20:04:45 -0700
Subject: Intel software packages and license enhancements

---
 lib/spack/spack/hooks/licensing.py                 |   5 +-
 lib/spack/spack/package.py                         |  10 +-
 var/spack/repos/builtin/packages/daal/package.py   |  27 +++++
 .../packages/intel-parallelstudio/package.py       | 112 ++++++++++++++++++++
 var/spack/repos/builtin/packages/intel/package.py  | 117 +++++++++++++++++++++
 var/spack/repos/builtin/packages/ipp/package.py    |  25 +++++
 var/spack/repos/builtin/packages/mkl/package.py    |  27 +++++
 7 files changed, 319 insertions(+), 4 deletions(-)
 create mode 100644 var/spack/repos/builtin/packages/daal/package.py
 create mode 100644 var/spack/repos/builtin/packages/intel-parallelstudio/package.py
 create mode 100644 var/spack/repos/builtin/packages/intel/package.py
 create mode 100644 var/spack/repos/builtin/packages/ipp/package.py
 create mode 100644 var/spack/repos/builtin/packages/mkl/package.py

diff --git a/lib/spack/spack/hooks/licensing.py b/lib/spack/spack/hooks/licensing.py
index 0f63b0e05a..f5d3ebd98c 100644
--- a/lib/spack/spack/hooks/licensing.py
+++ b/lib/spack/spack/hooks/licensing.py
@@ -26,7 +26,7 @@ import os
 
 import spack
 import llnl.util.tty as tty
-from llnl.util.filesystem import join_path
+from llnl.util.filesystem import join_path, mkdirp
 
 
 def pre_install(pkg):
@@ -154,6 +154,9 @@ def symlink_license(pkg):
     target = pkg.global_license_file
     for filename in pkg.license_files:
         link_name = join_path(pkg.prefix, filename)
+        license_dir = os.path.split(link_name)[0]
+        if not os.path.exists(license_dir):
+            mkdirp(license_dir)
         if os.path.exists(target):
             os.symlink(target, link_name)
             tty.msg("Added local symlink %s to global license file" %
diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py
index 8167341127..cda6a4be18 100644
--- a/lib/spack/spack/package.py
+++ b/lib/spack/spack/package.py
@@ -397,14 +397,18 @@ class Package(object):
         if self.is_extension:
             spack.repo.get(self.extendee_spec)._check_extendable()
 
+    @property
+    def global_license_dir(self):
+        """Returns the path where a global license file should be stored."""
+        spack_root = ancestor(__file__, 4)
+        return join_path(spack_root, 'etc', 'spack', 'licenses')
+
     @property
     def global_license_file(self):
         """Returns the path where a global license file should be stored."""
         if not self.license_files:
             return
-        spack_root = ancestor(__file__, 4)
-        global_license_dir = join_path(spack_root, 'etc', 'spack', 'licenses')
-        return join_path(global_license_dir, self.name,
+        return join_path(self.global_license_dir, self.name,
                          os.path.basename(self.license_files[0]))
 
     @property
diff --git a/var/spack/repos/builtin/packages/daal/package.py b/var/spack/repos/builtin/packages/daal/package.py
new file mode 100644
index 0000000000..16ae048a4c
--- /dev/null
+++ b/var/spack/repos/builtin/packages/daal/package.py
@@ -0,0 +1,27 @@
+from spack import *
+import sys, os, re
+
+from spack.pkg.builtin.intel import IntelInstaller
+
+class Daal(IntelInstaller):
+    """Intel Data Analytics Accesleration Library.
+
+    Note: You will have to add the download file to a
+    mirror so that Spack can find it. For instructions on how to set up a
+    mirror, see http://software.llnl.gov/spack/mirrors.html"""
+
+    homepage = "https://software.intel.com/en-us/daal"
+
+    version('2016.2.181', 'aad2aa70e5599ebfe6f85b29d8719d46',
+            url="file://%s/l_daal_2016.2.181.tgz" % os.getcwd())
+    version('2016.3.210', 'ad747c0dd97dace4cad03cf2266cad28',
+            url="file://%s/l_daal_2016.3.210.tgz" % os.getcwd())
+
+    def install(self, spec, prefix):
+
+        self.intel_prefix = os.path.join(prefix, "pkg")
+        IntelInstaller.install(self, spec, prefix)
+
+        daal_dir = os.path.join(self.intel_prefix, "daal")
+        for f in os.listdir(daal_dir):
+            os.symlink(os.path.join(daal_dir, f), os.path.join(self.prefix, f))
diff --git a/var/spack/repos/builtin/packages/intel-parallelstudio/package.py b/var/spack/repos/builtin/packages/intel-parallelstudio/package.py
new file mode 100644
index 0000000000..127a89654d
--- /dev/null
+++ b/var/spack/repos/builtin/packages/intel-parallelstudio/package.py
@@ -0,0 +1,112 @@
+from spack import *
+import sys, os, re
+
+from spack.pkg.builtin.intel import IntelInstaller, filter_pick
+
+class IntelParallelstudio(IntelInstaller):
+    """Intel Parallel Studio.
+
+    Note: You will have to add the download file to a
+    mirror so that Spack can find it. For instructions on how to set up a
+    mirror, see http://software.llnl.gov/spack/mirrors.html"""
+
+    homepage = "https://software.intel.com/en-us/intel-parallel-studio-xe"
+
+    # TODO: can also try the online installer (will download files on demand)
+    version('composer.2016.2', '1133fb831312eb519f7da897fec223fa',
+            url="file://%s/parallel_studio_xe_2016_composer_edition_update2.tgz" % os.getcwd())
+    version('professional.2016.2', '70be832f2d34c9bf596a5e99d5f2d832',
+            url="file://%s/parallel_studio_xe_2016_update2.tgz" % os.getcwd())
+    version('cluster.2016.2', '70be832f2d34c9bf596a5e99d5f2d832',
+            url="file://%s/parallel_studio_xe_2016_update2.tgz" % os.getcwd())
+    version('composer.2016.3', '3208eeabee951fc27579177b593cefe9',
+            url="file://%s/parallel_studio_xe_2016_composer_edition_update3.tgz" % os.getcwd())
+    version('professional.2016.3', 'eda19bb0d0d19709197ede58f13443f3',
+            url="file://%s/parallel_studio_xe_2016_update3.tgz" % os.getcwd())
+    version('cluster.2016.3', 'eda19bb0d0d19709197ede58f13443f3',
+            url="file://%s/parallel_studio_xe_2016_update3.tgz" % os.getcwd())
+
+    variant('rpath', default=True, description="Add rpath to .cfg files")
+    variant('all', default=False, description="Install all files associated with the requested edition")
+    variant('mpi', default=True, description="Install the Intel MPI library and ITAC tool")
+    variant('mkl', default=True, description="Install the Intel MKL library")
+    variant('daal', default=True, description="Install the Intel DAAL libraries")
+    variant('ipp', default=True, description="Install the Intel IPP libraries")
+    variant('tools', default=True, description="Install the Intel Advisor, VTune Amplifier, and Inspector tools")
+
+    provides('mpi', when='@cluster:+mpi')
+    provides('mkl', when='+mkl')
+    provides('daal', when='+daal')
+    provides('ipp', when='+ipp')
+
+    def install(self, spec, prefix):
+
+        # remove the installation DB, otherwise it will try to install into location of other Intel builds
+        try:
+            os.remove(os.path.join(os.environ["HOME"], "intel", "intel_sdp_products.db"))
+        except OSError:
+            pass # if the file does not exist
+
+        base_components = "ALL" # when in doubt, install everything
+        mpi_components = ""
+        mkl_components = ""
+        daal_components = ""
+        ipp_components = ""
+        tools_components = ""
+
+        if spec.satisfies('+all'):
+            base_components = "ALL"
+        else:
+            with open("pset/mediaconfig.xml", "r") as f:
+                lines = f.readlines()
+                all_components = []
+                for line in lines:
+                    if line.find('<Abbr>') != -1:
+                        component = line[line.find('<Abbr>') + 6:line.find('</Abbr>')]
+                        all_components.append(component)
+                base_components = filter_pick(all_components, re.compile('(comp|openmp|intel-tbb|icc|ifort|psxe|icsxe-pset)').search)
+                mpi_components = filter_pick(all_components, re.compile('(icsxe|imb|mpi|itac|intel-tc|clck)').search)
+                mkl_components = filter_pick(all_components, re.compile('(mkl)').search)
+                daal_components = filter_pick(all_components, re.compile('(daal)').search)
+                ipp_components = filter_pick(all_components, re.compile('(ipp)').search)
+                tool_components = filter_pick(all_components, re.compile('(gdb|vtune|inspector|advisor)').search)
+
+        components = base_components
+        if not spec.satisfies('+all'):
+            if spec.satisfies('+mpi') and 'cluster' in str(spec.version):
+                components += mpi_components
+            if spec.satisfies('+mkl'):
+                components += mkl_components
+            if spec.satisfies('+daal'):
+                components += daal_components
+            if spec.satisfies('+ipp'):
+                components += ipp_components
+            if spec.satisfies('+tools') and (spec.satisfies('@cluster') or spec.satisfies('@professional')):
+                components += tool_components
+
+        self.intel_components = ';'.join(components)
+        IntelInstaller.install(self, spec, prefix)
+
+        absbindir = os.path.split(os.path.realpath(os.path.join(self.prefix.bin, "icc")))[0]
+        abslibdir = os.path.split(os.path.realpath(os.path.join(self.prefix.lib, "intel64", "libimf.a")))[0]
+
+        # symlink or copy?
+        os.symlink(self.global_license_file, os.path.join(absbindir, "license.lic"))
+        if spec.satisfies('+tools') and (spec.satisfies('@cluster') or spec.satisfies('@professional')):
+            os.mkdir(os.path.join(self.prefix, "inspector_xe/licenses"))
+            os.symlink(self.global_license_file, os.path.join(self.prefix, "inspector_xe/licenses", "license.lic"))
+            os.mkdir(os.path.join(self.prefix, "advisor_xe/licenses"))
+            os.symlink(self.global_license_file, os.path.join(self.prefix, "advisor_xe/licenses", "license.lic"))
+            os.mkdir(os.path.join(self.prefix, "vtune_amplifier_xe/licenses"))
+            os.symlink(self.global_license_file, os.path.join(self.prefix, "vtune_amplifier_xe/licenses", "license.lic"))
+
+        if (spec.satisfies('+all') or spec.satisfies('+mpi')) and spec.satisfies('@cluster'):
+            os.symlink(self.global_license_file, os.path.join(self.prefix, "itac_latest", "license.lic"))
+
+        if spec.satisfies('+rpath'):
+            for compiler_command in ["icc", "icpc", "ifort"]:
+                cfgfilename = os.path.join(absbindir, "%s.cfg" %(compiler_command))
+                with open(cfgfilename, "w") as f:
+                    f.write('-Xlinker -rpath -Xlinker %s\n' %(abslibdir))
+
+        os.symlink(os.path.join(self.prefix.man, "common", "man1"), os.path.join(self.prefix.man, "man1"))
diff --git a/var/spack/repos/builtin/packages/intel/package.py b/var/spack/repos/builtin/packages/intel/package.py
new file mode 100644
index 0000000000..e51cc773af
--- /dev/null
+++ b/var/spack/repos/builtin/packages/intel/package.py
@@ -0,0 +1,117 @@
+from spack import *
+import sys, os, re
+
+def filter_pick(input_list, regex_filter):
+    return [l for l in input_list for m in (regex_filter(l),) if m]
+
+def unfilter_pick(input_list, regex_filter):
+    return [l for l in input_list for m in (regex_filter(l),) if not m]
+
+def get_all_components():
+    all_components = []
+    with open("pset/mediaconfig.xml", "r") as f:
+        lines = f.readlines()
+        for line in lines:
+            if line.find('<Abbr>') != -1:
+                component = line[line.find('<Abbr>') + 6:line.find('</Abbr>')]
+                all_components.append(component)
+    return all_components
+
+class IntelInstaller(Package):
+    """Base package containing common methods for installing Intel software"""
+
+    homepage = "https://software.intel.com/en-us"
+    intel_components = "ALL"
+    license_required = True
+    license_comment = '#'
+    license_files = ['Licenses/license.lic']
+    license_vars = ['INTEL_LICENSE_FILE']
+    license_url = 'https://software.intel.com/en-us/articles/intel-license-manager-faq'
+
+    @property
+    def global_license_file(self):
+        """Returns the path where a global license file should be stored."""
+        if not self.license_files:
+            return
+        return join_path(self.global_license_dir, "intel",
+                         os.path.basename(self.license_files[0]))
+
+    def install(self, spec, prefix):
+
+        # remove the installation DB, otherwise it will try to install into location of other Intel builds
+        try:
+            os.remove(os.path.join(os.environ["HOME"], "intel", "intel_sdp_products.db"))
+        except OSError:
+            pass # if the file does not exist
+
+        if not hasattr(self, "intel_prefix"):
+            self.intel_prefix = self.prefix
+
+        silent_config_filename = 'silent.cfg'
+        with open(silent_config_filename, 'w') as f:
+            f.write("""
+ACCEPT_EULA=accept
+PSET_MODE=install
+CONTINUE_WITH_INSTALLDIR_OVERWRITE=yes
+PSET_INSTALL_DIR=%s
+ACTIVATION_LICENSE_FILE=%s
+ACTIVATION_TYPE=license_file
+PHONEHOME_SEND_USAGE_DATA=no
+COMPONENTS=%s
+""" %(self.intel_prefix, self.global_license_file, self.intel_components))
+
+        install_script = which("install.sh")
+        install_script('--silent', silent_config_filename)
+
+
+class Intel(IntelInstaller):
+    """Intel Compilers.
+
+    Note: You will have to add the download file to a
+    mirror so that Spack can find it. For instructions on how to set up a
+    mirror, see http://software.llnl.gov/spack/mirrors.html"""
+
+    homepage = "https://software.intel.com/en-us/intel-parallel-studio-xe"
+
+    # TODO: can also try the online installer (will download files on demand)
+    version('16.0.2', '1133fb831312eb519f7da897fec223fa',
+            url="file://%s/parallel_studio_xe_2016_composer_edition_update2.tgz" % os.getcwd())
+    version('16.0.3', '3208eeabee951fc27579177b593cefe9',
+            url="file://%s/parallel_studio_xe_2016_composer_edition_update3.tgz" % os.getcwd())
+
+    variant('rpath', default=True, description="Add rpath to .cfg files")
+
+    def install(self, spec, prefix):
+
+        # remove the installation DB, otherwise it will try to install into location of other Intel builds
+        try:
+            os.remove(os.path.join(os.environ["HOME"], "intel", "intel_sdp_products.db"))
+        except OSError:
+            pass # if the file does not exist
+
+        components = []
+        with open("pset/mediaconfig.xml", "r") as f:
+            lines = f.readlines()
+            all_components = []
+            for line in lines:
+                if line.find('<Abbr>') != -1:
+                    component = line[line.find('<Abbr>') + 6:line.find('</Abbr>')]
+                    all_components.append(component)
+            components = filter_pick(all_components, re.compile('(comp|openmp|intel-tbb|icc|ifort|psxe|icsxe-pset)').search)
+
+        self.intel_components = ';'.join(components)
+        IntelInstaller.install(self, spec, prefix)
+
+        absbindir = os.path.split(os.path.realpath(os.path.join(self.prefix.bin, "icc")))[0]
+        abslibdir = os.path.split(os.path.realpath(os.path.join(self.prefix.lib, "intel64", "libimf.a")))[0]
+
+        # symlink or copy?
+        os.symlink(self.global_license_file, os.path.join(absbindir, "license.lic"))
+
+        if spec.satisfies('+rpath'):
+            for compiler_command in ["icc", "icpc", "ifort"]:
+                cfgfilename = os.path.join(absbindir, "%s.cfg" %(compiler_command))
+                with open(cfgfilename, "w") as f:
+                    f.write('-Xlinker -rpath -Xlinker %s\n' %(abslibdir))
+
+        os.symlink(os.path.join(self.prefix.man, "common", "man1"), os.path.join(self.prefix.man, "man1"))
diff --git a/var/spack/repos/builtin/packages/ipp/package.py b/var/spack/repos/builtin/packages/ipp/package.py
new file mode 100644
index 0000000000..23c944c2d5
--- /dev/null
+++ b/var/spack/repos/builtin/packages/ipp/package.py
@@ -0,0 +1,25 @@
+from spack import *
+import sys, os, re
+
+from spack.pkg.builtin.intel import IntelInstaller
+
+class Ipp(IntelInstaller):
+    """Intel Integrated Performance Primitives.
+
+    Note: You will have to add the download file to a
+    mirror so that Spack can find it. For instructions on how to set up a
+    mirror, see http://software.llnl.gov/spack/mirrors.html"""
+
+    homepage = "https://software.intel.com/en-us/intel-ipp"
+
+    version('9.0.3.210', '0e1520dd3de7f811a6ef6ebc7aa429a3',
+            url="file://%s/l_ipp_9.0.3.210.tgz" % os.getcwd())
+
+    def install(self, spec, prefix):
+
+        self.intel_prefix = os.path.join(prefix, "pkg")
+        IntelInstaller.install(self, spec, prefix)
+
+        ipp_dir = os.path.join(self.intel_prefix, "ipp")
+        for f in os.listdir(ipp_dir):
+            os.symlink(os.path.join(ipp_dir, f), os.path.join(self.prefix, f))
diff --git a/var/spack/repos/builtin/packages/mkl/package.py b/var/spack/repos/builtin/packages/mkl/package.py
new file mode 100644
index 0000000000..1d4553b7f5
--- /dev/null
+++ b/var/spack/repos/builtin/packages/mkl/package.py
@@ -0,0 +1,27 @@
+from spack import *
+import os, re, sys
+
+from spack.pkg.builtin.intel import IntelInstaller
+
+class Mkl(IntelInstaller):
+    """Intel Math Kernel Library.
+
+    Note: You will have to add the download file to a
+    mirror so that Spack can find it. For instructions on how to set up a
+    mirror, see http://software.llnl.gov/spack/mirrors.html"""
+
+    homepage = "https://software.intel.com/en-us/intel-mkl"
+
+    version('11.3.2.181', '536dbd82896d6facc16de8f961d17d65',
+            url="file://%s/l_mkl_11.3.2.181.tgz" % os.getcwd())
+    version('11.3.3.210', 'f72546df27f5ebb0941b5d21fd804e34',
+            url="file://%s/l_mkl_11.3.3.210.tgz" % os.getcwd())
+
+    def install(self, spec, prefix):
+
+        self.intel_prefix = os.path.join(prefix, "pkg")
+        IntelInstaller.install(self, spec, prefix)
+
+        mkl_dir = os.path.join(self.intel_prefix, "mkl")
+        for f in os.listdir(mkl_dir):
+            os.symlink(os.path.join(mkl_dir, f), os.path.join(self.prefix, f))
-- 
cgit v1.2.3-70-g09d2


From e9b71872a8d590d342e4cfcc78ff9855cff7fc24 Mon Sep 17 00:00:00 2001
From: "Gregory L. Lee" <lee218@llnl.gov>
Date: Fri, 13 May 2016 15:16:07 -0700
Subject: addressed PR#946 comments from @adamjstewart

---
 lib/spack/spack/hooks/licensing.py                 |   2 +-
 lib/spack/spack/package.py                         |   6 +-
 var/spack/repos/builtin/packages/daal/package.py   |   2 +-
 .../packages/intel-parallel-studio/package.py      | 100 ++++++++++++++++++
 .../packages/intel-parallelstudio/package.py       | 112 ---------------------
 var/spack/repos/builtin/packages/intel/package.py  |  17 ++--
 6 files changed, 112 insertions(+), 127 deletions(-)
 create mode 100644 var/spack/repos/builtin/packages/intel-parallel-studio/package.py
 delete mode 100644 var/spack/repos/builtin/packages/intel-parallelstudio/package.py

diff --git a/lib/spack/spack/hooks/licensing.py b/lib/spack/spack/hooks/licensing.py
index f5d3ebd98c..9010b84154 100644
--- a/lib/spack/spack/hooks/licensing.py
+++ b/lib/spack/spack/hooks/licensing.py
@@ -154,7 +154,7 @@ def symlink_license(pkg):
     target = pkg.global_license_file
     for filename in pkg.license_files:
         link_name = join_path(pkg.prefix, filename)
-        license_dir = os.path.split(link_name)[0]
+        license_dir = os.path.dirname(link_name)
         if not os.path.exists(license_dir):
             mkdirp(license_dir)
         if os.path.exists(target):
diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py
index cda6a4be18..fa3ece47f7 100644
--- a/lib/spack/spack/package.py
+++ b/lib/spack/spack/package.py
@@ -399,13 +399,15 @@ class Package(object):
 
     @property
     def global_license_dir(self):
-        """Returns the path where a global license file should be stored."""
+        """Returns the directory where global license files for all
+           packages are stored."""
         spack_root = ancestor(__file__, 4)
         return join_path(spack_root, 'etc', 'spack', 'licenses')
 
     @property
     def global_license_file(self):
-        """Returns the path where a global license file should be stored."""
+        """Returns the path where a global license file for this
+           particular package should be stored."""
         if not self.license_files:
             return
         return join_path(self.global_license_dir, self.name,
diff --git a/var/spack/repos/builtin/packages/daal/package.py b/var/spack/repos/builtin/packages/daal/package.py
index 16ae048a4c..9fdbd7bf5e 100644
--- a/var/spack/repos/builtin/packages/daal/package.py
+++ b/var/spack/repos/builtin/packages/daal/package.py
@@ -4,7 +4,7 @@ import sys, os, re
 from spack.pkg.builtin.intel import IntelInstaller
 
 class Daal(IntelInstaller):
-    """Intel Data Analytics Accesleration Library.
+    """Intel Data Analytics Acceleration Library.
 
     Note: You will have to add the download file to a
     mirror so that Spack can find it. For instructions on how to set up a
diff --git a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py
new file mode 100644
index 0000000000..3a44cb32a3
--- /dev/null
+++ b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py
@@ -0,0 +1,100 @@
+from spack import *
+import sys, os, re
+
+from spack.pkg.builtin.intel import IntelInstaller, filter_pick, get_all_components
+
+class IntelParallelStudio(IntelInstaller):
+    """Intel Parallel Studio.
+
+    Note: You will have to add the download file to a
+    mirror so that Spack can find it. For instructions on how to set up a
+    mirror, see http://software.llnl.gov/spack/mirrors.html"""
+
+    homepage = "https://software.intel.com/en-us/intel-parallel-studio-xe"
+
+    # TODO: can also try the online installer (will download files on demand)
+    version('composer.2016.2', '1133fb831312eb519f7da897fec223fa',
+            url="file://%s/parallel_studio_xe_2016_composer_edition_update2.tgz" % os.getcwd())
+    version('professional.2016.2', '70be832f2d34c9bf596a5e99d5f2d832',
+            url="file://%s/parallel_studio_xe_2016_update2.tgz" % os.getcwd())
+    version('cluster.2016.2', '70be832f2d34c9bf596a5e99d5f2d832',
+            url="file://%s/parallel_studio_xe_2016_update2.tgz" % os.getcwd())
+    version('composer.2016.3', '3208eeabee951fc27579177b593cefe9',
+            url="file://%s/parallel_studio_xe_2016_composer_edition_update3.tgz" % os.getcwd())
+    version('professional.2016.3', 'eda19bb0d0d19709197ede58f13443f3',
+            url="file://%s/parallel_studio_xe_2016_update3.tgz" % os.getcwd())
+    version('cluster.2016.3', 'eda19bb0d0d19709197ede58f13443f3',
+            url="file://%s/parallel_studio_xe_2016_update3.tgz" % os.getcwd())
+
+    variant('rpath', default=True, description="Add rpath to .cfg files")
+    variant('all', default=False, description="Install all files associated with the requested edition")
+    variant('mpi', default=True, description="Install the Intel MPI library and ITAC tool")
+    variant('mkl', default=True, description="Install the Intel MKL library")
+    variant('daal', default=True, description="Install the Intel DAAL libraries")
+    variant('ipp', default=True, description="Install the Intel IPP libraries")
+    variant('tools', default=True, description="Install the Intel Advisor, VTune Amplifier, and Inspector tools")
+
+    provides('mpi', when='@cluster:+mpi')
+    provides('mkl', when='+mkl')
+    provides('daal', when='+daal')
+    provides('ipp', when='+ipp')
+
+    def install(self, spec, prefix):
+
+        base_components = "ALL" # when in doubt, install everything
+        mpi_components = ""
+        mkl_components = ""
+        daal_components = ""
+        ipp_components = ""
+        tools_components = ""
+
+        if spec.satisfies('+all'):
+            base_components = "ALL"
+        else:
+            all_components = get_all_components()
+            base_components = filter_pick(all_components, re.compile('(comp|openmp|intel-tbb|icc|ifort|psxe|icsxe-pset)').search)
+            mpi_components = filter_pick(all_components, re.compile('(icsxe|imb|mpi|itac|intel-tc|clck)').search)
+            mkl_components = filter_pick(all_components, re.compile('(mkl)').search)
+            daal_components = filter_pick(all_components, re.compile('(daal)').search)
+            ipp_components = filter_pick(all_components, re.compile('(ipp)').search)
+            tool_components = filter_pick(all_components, re.compile('(gdb|vtune|inspector|advisor)').search)
+
+        components = base_components
+        if not spec.satisfies('+all'):
+            if spec.satisfies('+mpi') and 'cluster' in str(spec.version):
+                components += mpi_components
+            if spec.satisfies('+mkl'):
+                components += mkl_components
+            if spec.satisfies('+daal'):
+                components += daal_components
+            if spec.satisfies('+ipp'):
+                components += ipp_components
+            if spec.satisfies('+tools') and (spec.satisfies('@cluster') or spec.satisfies('@professional')):
+                components += tool_components
+
+        self.intel_components = ';'.join(components)
+        IntelInstaller.install(self, spec, prefix)
+
+        absbindir = os.path.dirname(os.path.realpath(os.path.join(self.prefix.bin, "icc")))
+        abslibdir = os.path.dirname(os.path.realpath(os.path.join(self.prefix.lib, "intel64", "libimf.a")))
+
+        relbindir = absbindir.strip(os.path.commonprefix([self.prefix, absbindir]))
+        os.symlink(self.global_license_file, os.path.join(absbindir, "license.lic"))
+        if spec.satisfies('+tools') and (spec.satisfies('@cluster') or spec.satisfies('@professional')):
+            os.mkdir(os.path.join(self.prefix, "inspector_xe/licenses"))
+            os.symlink(self.global_license_file, os.path.join(self.prefix, "inspector_xe/licenses", "license.lic"))
+            os.mkdir(os.path.join(self.prefix, "advisor_xe/licenses"))
+            os.symlink(self.global_license_file, os.path.join(self.prefix, "advisor_xe/licenses", "license.lic"))
+            os.mkdir(os.path.join(self.prefix, "vtune_amplifier_xe/licenses"))
+            os.symlink(self.global_license_file, os.path.join(self.prefix, "vtune_amplifier_xe/licenses", "license.lic"))
+
+        if (spec.satisfies('+all') or spec.satisfies('+mpi')) and spec.satisfies('@cluster'):
+            os.symlink(self.global_license_file, os.path.join(self.prefix, "itac_latest", "license.lic"))
+
+        if spec.satisfies('+rpath'):
+            for compiler_command in ["icc", "icpc", "ifort"]:
+                cfgfilename = os.path.join(absbindir, "%s.cfg" %(compiler_command))
+                with open(cfgfilename, "w") as f:
+                    f.write('-Xlinker -rpath -Xlinker %s\n' %(abslibdir))
+
+        os.symlink(os.path.join(self.prefix.man, "common", "man1"), os.path.join(self.prefix.man, "man1"))
diff --git a/var/spack/repos/builtin/packages/intel-parallelstudio/package.py b/var/spack/repos/builtin/packages/intel-parallelstudio/package.py
deleted file mode 100644
index 127a89654d..0000000000
--- a/var/spack/repos/builtin/packages/intel-parallelstudio/package.py
+++ /dev/null
@@ -1,112 +0,0 @@
-from spack import *
-import sys, os, re
-
-from spack.pkg.builtin.intel import IntelInstaller, filter_pick
-
-class IntelParallelstudio(IntelInstaller):
-    """Intel Parallel Studio.
-
-    Note: You will have to add the download file to a
-    mirror so that Spack can find it. For instructions on how to set up a
-    mirror, see http://software.llnl.gov/spack/mirrors.html"""
-
-    homepage = "https://software.intel.com/en-us/intel-parallel-studio-xe"
-
-    # TODO: can also try the online installer (will download files on demand)
-    version('composer.2016.2', '1133fb831312eb519f7da897fec223fa',
-            url="file://%s/parallel_studio_xe_2016_composer_edition_update2.tgz" % os.getcwd())
-    version('professional.2016.2', '70be832f2d34c9bf596a5e99d5f2d832',
-            url="file://%s/parallel_studio_xe_2016_update2.tgz" % os.getcwd())
-    version('cluster.2016.2', '70be832f2d34c9bf596a5e99d5f2d832',
-            url="file://%s/parallel_studio_xe_2016_update2.tgz" % os.getcwd())
-    version('composer.2016.3', '3208eeabee951fc27579177b593cefe9',
-            url="file://%s/parallel_studio_xe_2016_composer_edition_update3.tgz" % os.getcwd())
-    version('professional.2016.3', 'eda19bb0d0d19709197ede58f13443f3',
-            url="file://%s/parallel_studio_xe_2016_update3.tgz" % os.getcwd())
-    version('cluster.2016.3', 'eda19bb0d0d19709197ede58f13443f3',
-            url="file://%s/parallel_studio_xe_2016_update3.tgz" % os.getcwd())
-
-    variant('rpath', default=True, description="Add rpath to .cfg files")
-    variant('all', default=False, description="Install all files associated with the requested edition")
-    variant('mpi', default=True, description="Install the Intel MPI library and ITAC tool")
-    variant('mkl', default=True, description="Install the Intel MKL library")
-    variant('daal', default=True, description="Install the Intel DAAL libraries")
-    variant('ipp', default=True, description="Install the Intel IPP libraries")
-    variant('tools', default=True, description="Install the Intel Advisor, VTune Amplifier, and Inspector tools")
-
-    provides('mpi', when='@cluster:+mpi')
-    provides('mkl', when='+mkl')
-    provides('daal', when='+daal')
-    provides('ipp', when='+ipp')
-
-    def install(self, spec, prefix):
-
-        # remove the installation DB, otherwise it will try to install into location of other Intel builds
-        try:
-            os.remove(os.path.join(os.environ["HOME"], "intel", "intel_sdp_products.db"))
-        except OSError:
-            pass # if the file does not exist
-
-        base_components = "ALL" # when in doubt, install everything
-        mpi_components = ""
-        mkl_components = ""
-        daal_components = ""
-        ipp_components = ""
-        tools_components = ""
-
-        if spec.satisfies('+all'):
-            base_components = "ALL"
-        else:
-            with open("pset/mediaconfig.xml", "r") as f:
-                lines = f.readlines()
-                all_components = []
-                for line in lines:
-                    if line.find('<Abbr>') != -1:
-                        component = line[line.find('<Abbr>') + 6:line.find('</Abbr>')]
-                        all_components.append(component)
-                base_components = filter_pick(all_components, re.compile('(comp|openmp|intel-tbb|icc|ifort|psxe|icsxe-pset)').search)
-                mpi_components = filter_pick(all_components, re.compile('(icsxe|imb|mpi|itac|intel-tc|clck)').search)
-                mkl_components = filter_pick(all_components, re.compile('(mkl)').search)
-                daal_components = filter_pick(all_components, re.compile('(daal)').search)
-                ipp_components = filter_pick(all_components, re.compile('(ipp)').search)
-                tool_components = filter_pick(all_components, re.compile('(gdb|vtune|inspector|advisor)').search)
-
-        components = base_components
-        if not spec.satisfies('+all'):
-            if spec.satisfies('+mpi') and 'cluster' in str(spec.version):
-                components += mpi_components
-            if spec.satisfies('+mkl'):
-                components += mkl_components
-            if spec.satisfies('+daal'):
-                components += daal_components
-            if spec.satisfies('+ipp'):
-                components += ipp_components
-            if spec.satisfies('+tools') and (spec.satisfies('@cluster') or spec.satisfies('@professional')):
-                components += tool_components
-
-        self.intel_components = ';'.join(components)
-        IntelInstaller.install(self, spec, prefix)
-
-        absbindir = os.path.split(os.path.realpath(os.path.join(self.prefix.bin, "icc")))[0]
-        abslibdir = os.path.split(os.path.realpath(os.path.join(self.prefix.lib, "intel64", "libimf.a")))[0]
-
-        # symlink or copy?
-        os.symlink(self.global_license_file, os.path.join(absbindir, "license.lic"))
-        if spec.satisfies('+tools') and (spec.satisfies('@cluster') or spec.satisfies('@professional')):
-            os.mkdir(os.path.join(self.prefix, "inspector_xe/licenses"))
-            os.symlink(self.global_license_file, os.path.join(self.prefix, "inspector_xe/licenses", "license.lic"))
-            os.mkdir(os.path.join(self.prefix, "advisor_xe/licenses"))
-            os.symlink(self.global_license_file, os.path.join(self.prefix, "advisor_xe/licenses", "license.lic"))
-            os.mkdir(os.path.join(self.prefix, "vtune_amplifier_xe/licenses"))
-            os.symlink(self.global_license_file, os.path.join(self.prefix, "vtune_amplifier_xe/licenses", "license.lic"))
-
-        if (spec.satisfies('+all') or spec.satisfies('+mpi')) and spec.satisfies('@cluster'):
-            os.symlink(self.global_license_file, os.path.join(self.prefix, "itac_latest", "license.lic"))
-
-        if spec.satisfies('+rpath'):
-            for compiler_command in ["icc", "icpc", "ifort"]:
-                cfgfilename = os.path.join(absbindir, "%s.cfg" %(compiler_command))
-                with open(cfgfilename, "w") as f:
-                    f.write('-Xlinker -rpath -Xlinker %s\n' %(abslibdir))
-
-        os.symlink(os.path.join(self.prefix.man, "common", "man1"), os.path.join(self.prefix.man, "man1"))
diff --git a/var/spack/repos/builtin/packages/intel/package.py b/var/spack/repos/builtin/packages/intel/package.py
index e51cc773af..a547ab56db 100644
--- a/var/spack/repos/builtin/packages/intel/package.py
+++ b/var/spack/repos/builtin/packages/intel/package.py
@@ -2,12 +2,15 @@ from spack import *
 import sys, os, re
 
 def filter_pick(input_list, regex_filter):
+    """Returns the items in input_list that are found in the regex_filter"""
     return [l for l in input_list for m in (regex_filter(l),) if m]
 
 def unfilter_pick(input_list, regex_filter):
+    """Returns the items in input_list that are not found in the regex_filter"""
     return [l for l in input_list for m in (regex_filter(l),) if not m]
 
 def get_all_components():
+    """Returns a list of all the components associated with the downloaded Intel package"""
     all_components = []
     with open("pset/mediaconfig.xml", "r") as f:
         lines = f.readlines()
@@ -39,10 +42,8 @@ class IntelInstaller(Package):
     def install(self, spec, prefix):
 
         # remove the installation DB, otherwise it will try to install into location of other Intel builds
-        try:
+        if os.path.exists(os.path.join(os.environ["HOME"], "intel", "intel_sdp_products.db")):
             os.remove(os.path.join(os.environ["HOME"], "intel", "intel_sdp_products.db"))
-        except OSError:
-            pass # if the file does not exist
 
         if not hasattr(self, "intel_prefix"):
             self.intel_prefix = self.prefix
@@ -90,14 +91,8 @@ class Intel(IntelInstaller):
             pass # if the file does not exist
 
         components = []
-        with open("pset/mediaconfig.xml", "r") as f:
-            lines = f.readlines()
-            all_components = []
-            for line in lines:
-                if line.find('<Abbr>') != -1:
-                    component = line[line.find('<Abbr>') + 6:line.find('</Abbr>')]
-                    all_components.append(component)
-            components = filter_pick(all_components, re.compile('(comp|openmp|intel-tbb|icc|ifort|psxe|icsxe-pset)').search)
+        all_components = get_all_components()
+        components = filter_pick(all_components, re.compile('(comp|openmp|intel-tbb|icc|ifort|psxe|icsxe-pset)').search)
 
         self.intel_components = ';'.join(components)
         IntelInstaller.install(self, spec, prefix)
-- 
cgit v1.2.3-70-g09d2


From e3cd0a67d020b73e5fdc6cfeb4ee874d49f2c305 Mon Sep 17 00:00:00 2001
From: "Gregory L. Lee" <lee218@llnl.gov>
Date: Fri, 13 May 2016 16:12:48 -0700
Subject: address flake8 issues

---
 var/spack/repos/builtin/packages/daal/package.py   |  3 +-
 .../packages/intel-parallel-studio/package.py      | 95 ++++++++++++++--------
 var/spack/repos/builtin/packages/intel/package.py  | 60 ++++++++------
 var/spack/repos/builtin/packages/ipp/package.py    |  3 +-
 var/spack/repos/builtin/packages/mkl/package.py    |  3 +-
 5 files changed, 104 insertions(+), 60 deletions(-)

diff --git a/var/spack/repos/builtin/packages/daal/package.py b/var/spack/repos/builtin/packages/daal/package.py
index 9fdbd7bf5e..e13dd80e19 100644
--- a/var/spack/repos/builtin/packages/daal/package.py
+++ b/var/spack/repos/builtin/packages/daal/package.py
@@ -1,8 +1,9 @@
 from spack import *
-import sys, os, re
+import os
 
 from spack.pkg.builtin.intel import IntelInstaller
 
+
 class Daal(IntelInstaller):
     """Intel Data Analytics Acceleration Library.
 
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 3a44cb32a3..db6cc888dd 100644
--- a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py
+++ b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py
@@ -1,8 +1,10 @@
 from spack import *
-import sys, os, re
+import os
+import re
 
 from spack.pkg.builtin.intel import IntelInstaller, filter_pick, get_all_components
 
+
 class IntelParallelStudio(IntelInstaller):
     """Intel Parallel Studio.
 
@@ -14,25 +16,31 @@ class IntelParallelStudio(IntelInstaller):
 
     # TODO: can also try the online installer (will download files on demand)
     version('composer.2016.2', '1133fb831312eb519f7da897fec223fa',
-            url="file://%s/parallel_studio_xe_2016_composer_edition_update2.tgz" % os.getcwd())
+        url="file://%s/parallel_studio_xe_2016_composer_edition_update2.tgz"
+        % os.getcwd())
     version('professional.2016.2', '70be832f2d34c9bf596a5e99d5f2d832',
-            url="file://%s/parallel_studio_xe_2016_update2.tgz" % os.getcwd())
+        url="file://%s/parallel_studio_xe_2016_update2.tgz" % os.getcwd())
     version('cluster.2016.2', '70be832f2d34c9bf596a5e99d5f2d832',
-            url="file://%s/parallel_studio_xe_2016_update2.tgz" % os.getcwd())
+        url="file://%s/parallel_studio_xe_2016_update2.tgz" % os.getcwd())
     version('composer.2016.3', '3208eeabee951fc27579177b593cefe9',
-            url="file://%s/parallel_studio_xe_2016_composer_edition_update3.tgz" % os.getcwd())
+        url="file://%s/parallel_studio_xe_2016_composer_edition_update3.tgz"
+        % os.getcwd())
     version('professional.2016.3', 'eda19bb0d0d19709197ede58f13443f3',
-            url="file://%s/parallel_studio_xe_2016_update3.tgz" % os.getcwd())
+        url="file://%s/parallel_studio_xe_2016_update3.tgz" % os.getcwd())
     version('cluster.2016.3', 'eda19bb0d0d19709197ede58f13443f3',
-            url="file://%s/parallel_studio_xe_2016_update3.tgz" % os.getcwd())
+        url="file://%s/parallel_studio_xe_2016_update3.tgz" % os.getcwd())
 
     variant('rpath', default=True, description="Add rpath to .cfg files")
-    variant('all', default=False, description="Install all files associated with the requested edition")
-    variant('mpi', default=True, description="Install the Intel MPI library and ITAC tool")
+    variant('all', default=False,
+        description="Install all files associated with the requested edition")
+    variant('mpi', default=True,
+        description="Install the Intel MPI library and ITAC tool")
     variant('mkl', default=True, description="Install the Intel MKL library")
-    variant('daal', default=True, description="Install the Intel DAAL libraries")
+    variant('daal',
+        default=True, description="Install the Intel DAAL libraries")
     variant('ipp', default=True, description="Install the Intel IPP libraries")
-    variant('tools', default=True, description="Install the Intel Advisor, VTune Amplifier, and Inspector tools")
+    variant('tools', default=True, description="""Install the Intel Advisor,\
+VTune Amplifier, and Inspector tools""")
 
     provides('mpi', when='@cluster:+mpi')
     provides('mkl', when='+mkl')
@@ -41,23 +49,29 @@ class IntelParallelStudio(IntelInstaller):
 
     def install(self, spec, prefix):
 
-        base_components = "ALL" # when in doubt, install everything
+        base_components = "ALL"  # when in doubt, install everything
         mpi_components = ""
         mkl_components = ""
         daal_components = ""
         ipp_components = ""
-        tools_components = ""
 
         if spec.satisfies('+all'):
             base_components = "ALL"
         else:
             all_components = get_all_components()
-            base_components = filter_pick(all_components, re.compile('(comp|openmp|intel-tbb|icc|ifort|psxe|icsxe-pset)').search)
-            mpi_components = filter_pick(all_components, re.compile('(icsxe|imb|mpi|itac|intel-tc|clck)').search)
-            mkl_components = filter_pick(all_components, re.compile('(mkl)').search)
-            daal_components = filter_pick(all_components, re.compile('(daal)').search)
-            ipp_components = filter_pick(all_components, re.compile('(ipp)').search)
-            tool_components = filter_pick(all_components, re.compile('(gdb|vtune|inspector|advisor)').search)
+            base_components = filter_pick(all_components,
+                re.compile('(comp|openmp|intel-tbb|icc|ifort|psxe|icsxe-pset)'
+                    ).search)
+            mpi_components = filter_pick(all_components,
+                re.compile('(icsxe|imb|mpi|itac|intel-tc|clck)').search)
+            mkl_components = filter_pick(all_components,
+                re.compile('(mkl)').search)
+            daal_components = filter_pick(all_components,
+                re.compile('(daal)').search)
+            ipp_components = filter_pick(all_components,
+                re.compile('(ipp)').search)
+            tool_components = filter_pick(all_components,
+                re.compile('(gdb|vtune|inspector|advisor)').search)
 
         components = base_components
         if not spec.satisfies('+all'):
@@ -69,32 +83,45 @@ class IntelParallelStudio(IntelInstaller):
                 components += daal_components
             if spec.satisfies('+ipp'):
                 components += ipp_components
-            if spec.satisfies('+tools') and (spec.satisfies('@cluster') or spec.satisfies('@professional')):
+            if spec.satisfies('+tools') and (spec.satisfies('@cluster') or\
+                spec.satisfies('@professional')):
                 components += tool_components
 
         self.intel_components = ';'.join(components)
         IntelInstaller.install(self, spec, prefix)
 
-        absbindir = os.path.dirname(os.path.realpath(os.path.join(self.prefix.bin, "icc")))
-        abslibdir = os.path.dirname(os.path.realpath(os.path.join(self.prefix.lib, "intel64", "libimf.a")))
-
-        relbindir = absbindir.strip(os.path.commonprefix([self.prefix, absbindir]))
-        os.symlink(self.global_license_file, os.path.join(absbindir, "license.lic"))
-        if spec.satisfies('+tools') and (spec.satisfies('@cluster') or spec.satisfies('@professional')):
+        absbindir = os.path.dirname(os.path.realpath(os.path.join(
+            self.prefix.bin, "icc")))
+        abslibdir = os.path.dirname(os.path.realpath(os.path.join
+            (self.prefix.lib, "intel64", "libimf.a")))
+
+        relbindir = absbindir.strip(os.path.commonprefix([self.prefix,
+            absbindir]))
+        os.symlink(self.global_license_file, os.path.join(absbindir,
+            "license.lic"))
+        if spec.satisfies('+tools') and (spec.satisfies('@cluster') or\
+            spec.satisfies('@professional')):
             os.mkdir(os.path.join(self.prefix, "inspector_xe/licenses"))
-            os.symlink(self.global_license_file, os.path.join(self.prefix, "inspector_xe/licenses", "license.lic"))
+            os.symlink(self.global_license_file, os.path.join(
+                self.prefix, "inspector_xe/licenses", "license.lic"))
             os.mkdir(os.path.join(self.prefix, "advisor_xe/licenses"))
-            os.symlink(self.global_license_file, os.path.join(self.prefix, "advisor_xe/licenses", "license.lic"))
+            os.symlink(self.global_license_file, os.path.join(
+                self.prefix, "advisor_xe/licenses", "license.lic"))
             os.mkdir(os.path.join(self.prefix, "vtune_amplifier_xe/licenses"))
-            os.symlink(self.global_license_file, os.path.join(self.prefix, "vtune_amplifier_xe/licenses", "license.lic"))
+            os.symlink(self.global_license_file, os.path.join(
+                self.prefix, "vtune_amplifier_xe/licenses", "license.lic"))
 
-        if (spec.satisfies('+all') or spec.satisfies('+mpi')) and spec.satisfies('@cluster'):
-            os.symlink(self.global_license_file, os.path.join(self.prefix, "itac_latest", "license.lic"))
+        if (spec.satisfies('+all') or spec.satisfies('+mpi')) and\
+            spec.satisfies('@cluster'):
+            os.symlink(self.global_license_file, os.path.join(
+                self.prefix, "itac_latest", "license.lic"))
 
         if spec.satisfies('+rpath'):
             for compiler_command in ["icc", "icpc", "ifort"]:
-                cfgfilename = os.path.join(absbindir, "%s.cfg" %(compiler_command))
+                cfgfilename = os.path.join(absbindir, "%s.cfg" %\
+                    compiler_command)
                 with open(cfgfilename, "w") as f:
-                    f.write('-Xlinker -rpath -Xlinker %s\n' %(abslibdir))
+                    f.write('-Xlinker -rpath -Xlinker %s\n' % abslibdir)
 
-        os.symlink(os.path.join(self.prefix.man, "common", "man1"), os.path.join(self.prefix.man, "man1"))
+        os.symlink(os.path.join(self.prefix.man, "common", "man1"),
+            os.path.join(self.prefix.man, "man1"))
diff --git a/var/spack/repos/builtin/packages/intel/package.py b/var/spack/repos/builtin/packages/intel/package.py
index a547ab56db..2d6929fc73 100644
--- a/var/spack/repos/builtin/packages/intel/package.py
+++ b/var/spack/repos/builtin/packages/intel/package.py
@@ -1,16 +1,22 @@
 from spack import *
-import sys, os, re
+import os
+import re
+
 
 def filter_pick(input_list, regex_filter):
     """Returns the items in input_list that are found in the regex_filter"""
     return [l for l in input_list for m in (regex_filter(l),) if m]
 
+
 def unfilter_pick(input_list, regex_filter):
-    """Returns the items in input_list that are not found in the regex_filter"""
+    """Returns the items in input_list that are not found in the
+       regex_filter"""
     return [l for l in input_list for m in (regex_filter(l),) if not m]
 
+
 def get_all_components():
-    """Returns a list of all the components associated with the downloaded Intel package"""
+    """Returns a list of all the components associated with the downloaded
+       Intel package"""
     all_components = []
     with open("pset/mediaconfig.xml", "r") as f:
         lines = f.readlines()
@@ -20,6 +26,7 @@ def get_all_components():
                 all_components.append(component)
     return all_components
 
+
 class IntelInstaller(Package):
     """Base package containing common methods for installing Intel software"""
 
@@ -29,7 +36,8 @@ class IntelInstaller(Package):
     license_comment = '#'
     license_files = ['Licenses/license.lic']
     license_vars = ['INTEL_LICENSE_FILE']
-    license_url = 'https://software.intel.com/en-us/articles/intel-license-manager-faq'
+    license_url = \
+        'https://software.intel.com/en-us/articles/intel-license-manager-faq'
 
     @property
     def global_license_file(self):
@@ -41,9 +49,12 @@ class IntelInstaller(Package):
 
     def install(self, spec, prefix):
 
-        # remove the installation DB, otherwise it will try to install into location of other Intel builds
-        if os.path.exists(os.path.join(os.environ["HOME"], "intel", "intel_sdp_products.db")):
-            os.remove(os.path.join(os.environ["HOME"], "intel", "intel_sdp_products.db"))
+        # Remove the installation DB, otherwise it will try to install into
+        # location of other Intel builds
+        if os.path.exists(os.path.join(os.environ["HOME"], "intel",
+            "intel_sdp_products.db")):
+            os.remove(os.path.join(os.environ["HOME"], "intel",
+                "intel_sdp_products.db"))
 
         if not hasattr(self, "intel_prefix"):
             self.intel_prefix = self.prefix
@@ -58,6 +69,7 @@ PSET_INSTALL_DIR=%s
 ACTIVATION_LICENSE_FILE=%s
 ACTIVATION_TYPE=license_file
 PHONEHOME_SEND_USAGE_DATA=no
+CONTINUE_WITH_OPTIONAL_ERROR=yes
 COMPONENTS=%s
 """ %(self.intel_prefix, self.global_license_file, self.intel_components))
 
@@ -76,37 +88,39 @@ class Intel(IntelInstaller):
 
     # TODO: can also try the online installer (will download files on demand)
     version('16.0.2', '1133fb831312eb519f7da897fec223fa',
-            url="file://%s/parallel_studio_xe_2016_composer_edition_update2.tgz" % os.getcwd())
+        url="file://%s/parallel_studio_xe_2016_composer_edition_update2.tgz"\
+        % os.getcwd())
     version('16.0.3', '3208eeabee951fc27579177b593cefe9',
-            url="file://%s/parallel_studio_xe_2016_composer_edition_update3.tgz" % os.getcwd())
+        url="file://%s/parallel_studio_xe_2016_composer_edition_update3.tgz"\
+        % os.getcwd())
 
     variant('rpath', default=True, description="Add rpath to .cfg files")
 
     def install(self, spec, prefix):
-
-        # remove the installation DB, otherwise it will try to install into location of other Intel builds
-        try:
-            os.remove(os.path.join(os.environ["HOME"], "intel", "intel_sdp_products.db"))
-        except OSError:
-            pass # if the file does not exist
-
         components = []
         all_components = get_all_components()
-        components = filter_pick(all_components, re.compile('(comp|openmp|intel-tbb|icc|ifort|psxe|icsxe-pset)').search)
+        components = filter_pick(all_components,
+            re.compile('(comp|openmp|intel-tbb|icc|ifort|psxe|icsxe-pset)'
+            ).search)
 
         self.intel_components = ';'.join(components)
         IntelInstaller.install(self, spec, prefix)
 
-        absbindir = os.path.split(os.path.realpath(os.path.join(self.prefix.bin, "icc")))[0]
-        abslibdir = os.path.split(os.path.realpath(os.path.join(self.prefix.lib, "intel64", "libimf.a")))[0]
+        absbindir = os.path.split(os.path.realpath(os.path.join(
+            self.prefix.bin, "icc")))[0]
+        abslibdir = os.path.split(os.path.realpath(os.path.join(
+            self.prefix.lib, "intel64", "libimf.a")))[0]
 
         # symlink or copy?
-        os.symlink(self.global_license_file, os.path.join(absbindir, "license.lic"))
+        os.symlink(self.global_license_file, os.path.join(absbindir,
+            "license.lic"))
 
         if spec.satisfies('+rpath'):
             for compiler_command in ["icc", "icpc", "ifort"]:
-                cfgfilename = os.path.join(absbindir, "%s.cfg" %(compiler_command))
+                cfgfilename = os.path.join(absbindir, "%s.cfg" %\
+                    compiler_command)
                 with open(cfgfilename, "w") as f:
-                    f.write('-Xlinker -rpath -Xlinker %s\n' %(abslibdir))
+                    f.write('-Xlinker -rpath -Xlinker %s\n' % abslibdir)
 
-        os.symlink(os.path.join(self.prefix.man, "common", "man1"), os.path.join(self.prefix.man, "man1"))
+        os.symlink(os.path.join(self.prefix.man, "common", "man1"),
+            os.path.join(self.prefix.man, "man1"))
diff --git a/var/spack/repos/builtin/packages/ipp/package.py b/var/spack/repos/builtin/packages/ipp/package.py
index 23c944c2d5..2bd931d5bd 100644
--- a/var/spack/repos/builtin/packages/ipp/package.py
+++ b/var/spack/repos/builtin/packages/ipp/package.py
@@ -1,8 +1,9 @@
 from spack import *
-import sys, os, re
+import os
 
 from spack.pkg.builtin.intel import IntelInstaller
 
+
 class Ipp(IntelInstaller):
     """Intel Integrated Performance Primitives.
 
diff --git a/var/spack/repos/builtin/packages/mkl/package.py b/var/spack/repos/builtin/packages/mkl/package.py
index 1d4553b7f5..454e78d29c 100644
--- a/var/spack/repos/builtin/packages/mkl/package.py
+++ b/var/spack/repos/builtin/packages/mkl/package.py
@@ -1,8 +1,9 @@
 from spack import *
-import os, re, sys
+import os
 
 from spack.pkg.builtin.intel import IntelInstaller
 
+
 class Mkl(IntelInstaller):
     """Intel Math Kernel Library.
 
-- 
cgit v1.2.3-70-g09d2


From c2ca5f44b4091821fbda36ce2dce77af3e4087f5 Mon Sep 17 00:00:00 2001
From: Greg Lee <lee218@llnl.gov>
Date: Sun, 15 May 2016 08:19:55 -0700
Subject: flake8 fixes

---
 .../packages/intel-parallel-studio/package.py      | 77 +++++++++++-----------
 var/spack/repos/builtin/packages/intel/package.py  | 23 ++++---
 2 files changed, 50 insertions(+), 50 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 db6cc888dd..a176af101d 100644
--- a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py
+++ b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py
@@ -2,7 +2,8 @@ from spack import *
 import os
 import re
 
-from spack.pkg.builtin.intel import IntelInstaller, filter_pick, get_all_components
+from spack.pkg.builtin.intel import IntelInstaller, filter_pick, \
+    get_all_components
 
 
 class IntelParallelStudio(IntelInstaller):
@@ -16,28 +17,28 @@ class IntelParallelStudio(IntelInstaller):
 
     # TODO: can also try the online installer (will download files on demand)
     version('composer.2016.2', '1133fb831312eb519f7da897fec223fa',
-        url="file://%s/parallel_studio_xe_2016_composer_edition_update2.tgz"
+        url="file://%s/parallel_studio_xe_2016_composer_edition_update2.tgz"  # NOQA: ignore=E501
         % os.getcwd())
     version('professional.2016.2', '70be832f2d34c9bf596a5e99d5f2d832',
-        url="file://%s/parallel_studio_xe_2016_update2.tgz" % os.getcwd())
+        url="file://%s/parallel_studio_xe_2016_update2.tgz" % os.getcwd())  # NOQA: ignore=E501
     version('cluster.2016.2', '70be832f2d34c9bf596a5e99d5f2d832',
-        url="file://%s/parallel_studio_xe_2016_update2.tgz" % os.getcwd())
+        url="file://%s/parallel_studio_xe_2016_update2.tgz" % os.getcwd())  # NOQA: ignore=E501
     version('composer.2016.3', '3208eeabee951fc27579177b593cefe9',
-        url="file://%s/parallel_studio_xe_2016_composer_edition_update3.tgz"
+        url="file://%s/parallel_studio_xe_2016_composer_edition_update3.tgz"  # NOQA: ignore=E501
         % os.getcwd())
     version('professional.2016.3', 'eda19bb0d0d19709197ede58f13443f3',
-        url="file://%s/parallel_studio_xe_2016_update3.tgz" % os.getcwd())
+        url="file://%s/parallel_studio_xe_2016_update3.tgz" % os.getcwd())  # NOQA: ignore=E501
     version('cluster.2016.3', 'eda19bb0d0d19709197ede58f13443f3',
-        url="file://%s/parallel_studio_xe_2016_update3.tgz" % os.getcwd())
+        url="file://%s/parallel_studio_xe_2016_update3.tgz" % os.getcwd())  # NOQA: ignore=E501
 
     variant('rpath', default=True, description="Add rpath to .cfg files")
     variant('all', default=False,
-        description="Install all files associated with the requested edition")
+            description="Install all files with the requested edition")
     variant('mpi', default=True,
-        description="Install the Intel MPI library and ITAC tool")
+            description="Install the Intel MPI library and ITAC tool")
     variant('mkl', default=True, description="Install the Intel MKL library")
     variant('daal',
-        default=True, description="Install the Intel DAAL libraries")
+            default=True, description="Install the Intel DAAL libraries")
     variant('ipp', default=True, description="Install the Intel IPP libraries")
     variant('tools', default=True, description="""Install the Intel Advisor,\
 VTune Amplifier, and Inspector tools""")
@@ -59,19 +60,21 @@ VTune Amplifier, and Inspector tools""")
             base_components = "ALL"
         else:
             all_components = get_all_components()
-            base_components = filter_pick(all_components,
-                re.compile('(comp|openmp|intel-tbb|icc|ifort|psxe|icsxe-pset)'
-                    ).search)
-            mpi_components = filter_pick(all_components,
-                re.compile('(icsxe|imb|mpi|itac|intel-tc|clck)').search)
-            mkl_components = filter_pick(all_components,
-                re.compile('(mkl)').search)
-            daal_components = filter_pick(all_components,
-                re.compile('(daal)').search)
-            ipp_components = filter_pick(all_components,
-                re.compile('(ipp)').search)
-            tool_components = filter_pick(all_components,
-                re.compile('(gdb|vtune|inspector|advisor)').search)
+            regex = '(comp|openmp|intel-tbb|icc|ifort|psxe|icsxe-pset)'
+            base_components = \
+                filter_pick(all_components, re.compile(regex).search)
+            regex = '(icsxe|imb|mpi|itac|intel-tc|clck)'
+            mpi_components = \
+                filter_pick(all_components, re.compile(regex).search)
+            mkl_components = \
+                filter_pick(all_components, re.compile('(mkl)').search)
+            daal_components = \
+                filter_pick(all_components, re.compile('(daal)').search)
+            ipp_components = \
+                filter_pick(all_components, re.compile('(ipp)').search)
+            regex = '(gdb|vtune|inspector|advisor)'
+            tool_components = \
+                filter_pick(all_components, re.compile(regex).search)
 
         components = base_components
         if not spec.satisfies('+all'):
@@ -83,8 +86,8 @@ VTune Amplifier, and Inspector tools""")
                 components += daal_components
             if spec.satisfies('+ipp'):
                 components += ipp_components
-            if spec.satisfies('+tools') and (spec.satisfies('@cluster') or\
-                spec.satisfies('@professional')):
+            if spec.satisfies('+tools') and (spec.satisfies('@cluster') or
+               spec.satisfies('@professional')):
                 components += tool_components
 
         self.intel_components = ';'.join(components)
@@ -93,14 +96,12 @@ VTune Amplifier, and Inspector tools""")
         absbindir = os.path.dirname(os.path.realpath(os.path.join(
             self.prefix.bin, "icc")))
         abslibdir = os.path.dirname(os.path.realpath(os.path.join
-            (self.prefix.lib, "intel64", "libimf.a")))
+                                    (self.prefix.lib, "intel64", "libimf.a")))
 
-        relbindir = absbindir.strip(os.path.commonprefix([self.prefix,
-            absbindir]))
         os.symlink(self.global_license_file, os.path.join(absbindir,
-            "license.lic"))
-        if spec.satisfies('+tools') and (spec.satisfies('@cluster') or\
-            spec.satisfies('@professional')):
+                                                          "license.lic"))
+        if spec.satisfies('+tools') and (spec.satisfies('@cluster') or
+                                         spec.satisfies('@professional')):
             os.mkdir(os.path.join(self.prefix, "inspector_xe/licenses"))
             os.symlink(self.global_license_file, os.path.join(
                 self.prefix, "inspector_xe/licenses", "license.lic"))
@@ -111,17 +112,17 @@ VTune Amplifier, and Inspector tools""")
             os.symlink(self.global_license_file, os.path.join(
                 self.prefix, "vtune_amplifier_xe/licenses", "license.lic"))
 
-        if (spec.satisfies('+all') or spec.satisfies('+mpi')) and\
-            spec.satisfies('@cluster'):
-            os.symlink(self.global_license_file, os.path.join(
-                self.prefix, "itac_latest", "license.lic"))
+        if (spec.satisfies('+all') or spec.satisfies('+mpi')) and \
+                spec.satisfies('@cluster'):
+                os.symlink(self.global_license_file, os.path.join(
+                           self.prefix, "itac_latest", "license.lic"))
 
         if spec.satisfies('+rpath'):
             for compiler_command in ["icc", "icpc", "ifort"]:
-                cfgfilename = os.path.join(absbindir, "%s.cfg" %\
-                    compiler_command)
+                cfgfilename = os.path.join(absbindir, "%s.cfg" %
+                                           compiler_command)
                 with open(cfgfilename, "w") as f:
                     f.write('-Xlinker -rpath -Xlinker %s\n' % abslibdir)
 
         os.symlink(os.path.join(self.prefix.man, "common", "man1"),
-            os.path.join(self.prefix.man, "man1"))
+                   os.path.join(self.prefix.man, "man1"))
diff --git a/var/spack/repos/builtin/packages/intel/package.py b/var/spack/repos/builtin/packages/intel/package.py
index 2d6929fc73..ec3192380a 100644
--- a/var/spack/repos/builtin/packages/intel/package.py
+++ b/var/spack/repos/builtin/packages/intel/package.py
@@ -52,9 +52,9 @@ class IntelInstaller(Package):
         # Remove the installation DB, otherwise it will try to install into
         # location of other Intel builds
         if os.path.exists(os.path.join(os.environ["HOME"], "intel",
-            "intel_sdp_products.db")):
+                          "intel_sdp_products.db")):
             os.remove(os.path.join(os.environ["HOME"], "intel",
-                "intel_sdp_products.db"))
+                      "intel_sdp_products.db"))
 
         if not hasattr(self, "intel_prefix"):
             self.intel_prefix = self.prefix
@@ -71,7 +71,7 @@ ACTIVATION_TYPE=license_file
 PHONEHOME_SEND_USAGE_DATA=no
 CONTINUE_WITH_OPTIONAL_ERROR=yes
 COMPONENTS=%s
-""" %(self.intel_prefix, self.global_license_file, self.intel_components))
+""" % (self.intel_prefix, self.global_license_file, self.intel_components))
 
         install_script = which("install.sh")
         install_script('--silent', silent_config_filename)
@@ -88,10 +88,10 @@ class Intel(IntelInstaller):
 
     # TODO: can also try the online installer (will download files on demand)
     version('16.0.2', '1133fb831312eb519f7da897fec223fa',
-        url="file://%s/parallel_studio_xe_2016_composer_edition_update2.tgz"\
+        url="file://%s/parallel_studio_xe_2016_composer_edition_update2.tgz"  # NOQA: ignore=E501
         % os.getcwd())
     version('16.0.3', '3208eeabee951fc27579177b593cefe9',
-        url="file://%s/parallel_studio_xe_2016_composer_edition_update3.tgz"\
+        url="file://%s/parallel_studio_xe_2016_composer_edition_update3.tgz"  # NOQA: ignore=E501
         % os.getcwd())
 
     variant('rpath', default=True, description="Add rpath to .cfg files")
@@ -99,9 +99,8 @@ class Intel(IntelInstaller):
     def install(self, spec, prefix):
         components = []
         all_components = get_all_components()
-        components = filter_pick(all_components,
-            re.compile('(comp|openmp|intel-tbb|icc|ifort|psxe|icsxe-pset)'
-            ).search)
+        regex = '(comp|openmp|intel-tbb|icc|ifort|psxe|icsxe-pset)'
+        components = filter_pick(all_components, re.compile(regex).search)
 
         self.intel_components = ';'.join(components)
         IntelInstaller.install(self, spec, prefix)
@@ -113,14 +112,14 @@ class Intel(IntelInstaller):
 
         # symlink or copy?
         os.symlink(self.global_license_file, os.path.join(absbindir,
-            "license.lic"))
+                   "license.lic"))
 
         if spec.satisfies('+rpath'):
             for compiler_command in ["icc", "icpc", "ifort"]:
-                cfgfilename = os.path.join(absbindir, "%s.cfg" %\
-                    compiler_command)
+                cfgfilename = os.path.join(absbindir, "%s.cfg" %
+                                           compiler_command)
                 with open(cfgfilename, "w") as f:
                     f.write('-Xlinker -rpath -Xlinker %s\n' % abslibdir)
 
         os.symlink(os.path.join(self.prefix.man, "common", "man1"),
-            os.path.join(self.prefix.man, "man1"))
+                   os.path.join(self.prefix.man, "man1"))
-- 
cgit v1.2.3-70-g09d2


From 582d01784aa44024da598187c654947bfd2e55de Mon Sep 17 00:00:00 2001
From: Greg Lee <lee218@llnl.gov>
Date: Tue, 17 May 2016 21:18:34 -0700
Subject: added newdtags variant, default to false (i.e., remove
 --enable-new-dtags)

---
 .../builtin/packages/intel-parallel-studio/package.py    | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

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 a176af101d..493ca16417 100644
--- a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py
+++ b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py
@@ -32,6 +32,8 @@ class IntelParallelStudio(IntelInstaller):
         url="file://%s/parallel_studio_xe_2016_update3.tgz" % os.getcwd())  # NOQA: ignore=E501
 
     variant('rpath', default=True, description="Add rpath to .cfg files")
+    variant('newdtags', default=False,
+            description="Allow use of --enable-new-dtags in MPI wrappers")
     variant('all', default=False,
             description="Install all files with the requested edition")
     variant('mpi', default=True,
@@ -116,6 +118,20 @@ VTune Amplifier, and Inspector tools""")
                 spec.satisfies('@cluster'):
                 os.symlink(self.global_license_file, os.path.join(
                            self.prefix, "itac_latest", "license.lic"))
+                if spec.satisfies('~newdtags'):
+                    wrappers = ["mpif77", "mpif77", "mpif90", "mpif90",
+                                "mpigcc", "mpigcc", "mpigxx", "mpigxx",
+                                "mpiicc", "mpiicc", "mpiicpc", "mpiicpc",
+                                "mpiifort", "mpiifort"]
+                    wrapper_paths = []
+                    for root, dirs, files in os.walk(spec.prefix):
+                        for name in files:
+                            if name in wrappers:
+                                wrapper_paths.append(os.path.join(spec.prefix,
+                                                                  root, name))
+                    for wrapper in wrapper_paths:
+                        filter_file(r'-Xlinker --enable-new-dtags', r' ',
+                                    wrapper)
 
         if spec.satisfies('+rpath'):
             for compiler_command in ["icc", "icpc", "ifort"]:
-- 
cgit v1.2.3-70-g09d2