Merge pull request #1729 from jgphpc/pgi

PrgEnv-pgi support

easybuild/toolchains/compiler/craype.py

@@ -42,6 +42,7 @@
 import easybuild.tools.environment as env
 from easybuild.toolchains.compiler.gcc import TC_CONSTANT_GCC, Gcc
 from easybuild.toolchains.compiler.inteliccifort import TC_CONSTANT_INTELCOMP, IntelIccIfort
+from easybuild.toolchains.compiler.pgi import TC_CONSTANT_PGI, Pgi
 from easybuild.tools.build_log import EasyBuildError
 from easybuild.tools.config import build_option
 from easybuild.tools.toolchain.compiler import Compiler
@@ -152,6 +153,18 @@ def __init__(self, *args, **kwargs):
             self.COMPILER_UNIQUE_OPTION_MAP[precflag] = IntelIccIfort.COMPILER_UNIQUE_OPTION_MAP[precflag]
 
 
+class CrayPEPGI(CrayPECompiler):
+    """Support for using the Cray PGI compiler wrappers."""
+    PRGENV_MODULE_NAME_SUFFIX = 'pgi'  # PrgEnv-pgi
+    COMPILER_FAMILY = TC_CONSTANT_PGI
+
+    def __init__(self, *args, **kwargs):
+        """CrayPEPGI constructor."""
+        super(CrayPEPGI, self).__init__(*args, **kwargs)
+        for precflag in self.COMPILER_PREC_FLAGS:
+            self.COMPILER_UNIQUE_OPTION_MAP[precflag] = Pgi.COMPILER_UNIQUE_OPTION_MAP[precflag]
+
+
 class CrayPECray(CrayPECompiler):
     """Support for using the Cray CCE compiler wrappers."""
     PRGENV_MODULE_NAME_SUFFIX = 'cray'  # PrgEnv-cray

easybuild/toolchains/craycce.py

@@ -38,7 +38,3 @@ class CrayCCE(CrayPECray, CrayMPICH, LibSci):
     """Compiler toolchain for Cray Programming Environment for Cray Compiling Environment (CCE) (PrgEnv-cray)."""
     NAME = 'CrayCCE'
     SUBTOOLCHAIN = DUMMY_TOOLCHAIN_NAME
-
-    def prepare(self, *args, **kwargs):
-        """Prepare to use this toolchain."""
-        super(CrayCCE, self).prepare(*args, **kwargs)

easybuild/toolchains/craygnu.py

@@ -38,7 +38,3 @@ class CrayGNU(CrayPEGCC, CrayMPICH, LibSci):
     """Compiler toolchain for Cray Programming Environment for GCC compilers (PrgEnv-gnu)."""
     NAME = 'CrayGNU'
     SUBTOOLCHAIN = DUMMY_TOOLCHAIN_NAME
-
-    def prepare(self, *args, **kwargs):
-        """Prepare to use this toolchain."""
-        super(CrayGNU, self).prepare(*args, **kwargs)

easybuild/toolchains/crayintel.py

@@ -38,7 +38,3 @@ class CrayIntel(CrayPEIntel, CrayMPICH, LibSci):
     """Compiler toolchain for Cray Programming Environment for Intel compilers (PrgEnv-intel)."""
     NAME = 'CrayIntel'
     SUBTOOLCHAIN = DUMMY_TOOLCHAIN_NAME
-
-    def prepare(self, *args, **kwargs):
-        """Prepare to use this toolchain."""
-        super(CrayIntel, self).prepare(*args, **kwargs)

easybuild/toolchains/craypgi.py

@@ -0,0 +1,36 @@
+##
+# Copyright 2014-2015 Ghent University
+#
+# This file is part of EasyBuild,
+# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
+# with support of Ghent University (http://ugent.be/hpc),
+# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Hercules foundation (http://www.herculesstichting.be/in_English)
+# and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
+#
+# http://github.com/hpcugent/easybuild
+#
+# EasyBuild is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation v2.
+#
+# EasyBuild 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
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with EasyBuild.  If not, see <http://www.gnu.org/licenses/>.
+##
+"""
+CrayPGI toolchain: Cray compilers (PGI) and MPI via Cray compiler drivers (PrgEnv-pgi) minus LibSci minus Cray FFTW
+@author: Jg Piccinali (CSCS)
+"""
+from easybuild.toolchains.compiler.craype import CrayPEPGI
+from easybuild.toolchains.mpi.craympich import CrayMPICH
+from easybuild.tools.toolchain import DUMMY_TOOLCHAIN_NAME
+
+class CrayPGI(CrayPEPGI, CrayMPICH):
+    """Compiler toolchain for Cray Programming Environment for Cray Compiling Environment (PGI) (PrgEnv-pgi)."""
+    NAME = 'CrayPGI'
+    SUBTOOLCHAIN = DUMMY_TOOLCHAIN_NAME