From 94a0cca080f1cd27ca5eaa6dc3c470bb541f4b34 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Sat, 22 Apr 2017 14:30:51 +0200 Subject: add Intel mpi package and add MPI wrappers to Intel parallel studio (#3905) * intel-mpi: add new package * fix hashes * fix typo * flake8 * add install * blank line * error * add bin64 * fix MPI wrappers in intel-parallel-studio * add missing I_MPI_FC * use shorter hashes --- lib/spack/spack/util/prefix.py | 1 + .../repos/builtin/packages/intel-mpi/package.py | 68 ++++++++++++++++++++++ .../packages/intel-parallel-studio/package.py | 21 +++++++ 3 files changed, 90 insertions(+) create mode 100644 var/spack/repos/builtin/packages/intel-mpi/package.py diff --git a/lib/spack/spack/util/prefix.py b/lib/spack/spack/util/prefix.py index bc6808f350..e39b81a4c6 100644 --- a/lib/spack/spack/util/prefix.py +++ b/lib/spack/spack/util/prefix.py @@ -61,6 +61,7 @@ class Prefix(str): def __new__(cls, path): s = super(Prefix, cls).__new__(cls, path) s.bin = join_path(s, 'bin') + s.bin64 = join_path(s, 'bin64') s.sbin = join_path(s, 'sbin') s.etc = join_path(s, 'etc') s.include = join_path(s, 'include') diff --git a/var/spack/repos/builtin/packages/intel-mpi/package.py b/var/spack/repos/builtin/packages/intel-mpi/package.py new file mode 100644 index 0000000000..c4d3df8f74 --- /dev/null +++ b/var/spack/repos/builtin/packages/intel-mpi/package.py @@ -0,0 +1,68 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * +import os + +from spack.pkg.builtin.intel import IntelInstaller + + +class IntelMpi(IntelInstaller): + """Intel MPI""" + + homepage = "https://software.intel.com/en-us/intel-mpi-library" + + version('2017.2', 'b6c2e62c3fb9b1558ede72ccf72cf1d6', + url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11334/l_mpi_2017.2.174.tgz') + version('2017.1', 'd5e941ac2bcf7c5576f85f6bcfee4c18', + url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11014/l_mpi_2017.1.132.tgz') + version('5.1.3', '4316e78533a932081b1a86368e890800', + url='http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9278/l_mpi_p_5.1.3.223.tgz') + + provides('mpi') + + def install(self, spec, prefix): + self.intel_prefix = prefix + IntelInstaller.install(self, spec, prefix) + + def setup_dependent_environment(self, spack_env, run_env, dependent_spec): + spack_env.set('I_MPI_CC', spack_cc) + spack_env.set('I_MPI_CXX', spack_cxx) + spack_env.set('I_MPI_F77', spack_fc) + spack_env.set('I_MPI_F90', spack_f77) + spack_env.set('I_MPI_FC', spack_fc) + + def setup_dependent_package(self, module, dep_spec): + # Check for presence of bin64 or bin directory + if os.path.isdir(self.prefix.bin): + bindir = self.prefix.bin + elif os.path.isdir(self.prefix.bin64): + bindir = self.prefix.bin64 + else: + raise RuntimeError('No suitable bindir found') + + self.spec.mpicc = join_path(bindir, 'mpicc') + self.spec.mpicxx = join_path(bindir, 'mpicxx') + self.spec.mpifc = join_path(bindir, 'mpif90') + self.spec.mpif77 = join_path(bindir, 'mpif77') 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 d4ae5fe20f..8bc489f1cb 100644 --- a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py +++ b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py @@ -403,3 +403,24 @@ class IntelParallelStudio(IntelInstaller): run_env.prepend_path('VTUNE_AMPLIFIER_XE_{0}_DIR'.format( major_ver), join_path(self.prefix, 'vtune_amplifier_xe')) + + def setup_dependent_environment(self, spack_env, run_env, dependent_spec): + spack_env.set('I_MPI_CC', spack_cc) + spack_env.set('I_MPI_CXX', spack_cxx) + spack_env.set('I_MPI_F77', spack_fc) + spack_env.set('I_MPI_F90', spack_f77) + spack_env.set('I_MPI_FC', spack_fc) + + def setup_dependent_package(self, module, dep_spec): + # Check for presence of bin64 or bin directory + if os.path.isdir(self.prefix.bin): + bindir = self.prefix.bin + elif os.path.isdir(self.prefix.bin64): + bindir = self.prefix.bin64 + else: + raise RuntimeError('No suitable bindir found') + + self.spec.mpicc = join_path(bindir, 'mpicc') + self.spec.mpicxx = join_path(bindir, 'mpic++') + self.spec.mpifc = join_path(bindir, 'mpif90') + self.spec.mpif77 = join_path(bindir, 'mpif77') -- cgit v1.2.3-70-g09d2