zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1484 from mpbelhorn/olcf/correct_cce_compiler_name

Browse Source 
Olcf/correct cce compiler name
This commit is contained in:
becker33 2016-08-11 11:30:36 -07:00 committed by GitHub
commit 1be63348b5
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/spack/spack/compilers/craype.py → lib/spack/spack/compilers/cce.py
View File

@ -25,9 +25,8 @@
from spack.compiler import * from spack.compiler import *
class Craype(Compiler): class Cce(Compiler):
"""Cray programming environment compiler.""" """Cray compiler environment compiler."""
# Subclasses use possible names of C compiler # Subclasses use possible names of C compiler
cc_names = ['cc'] cc_names = ['cc']
@ -44,7 +43,7 @@ class Craype(Compiler):
suffixes = [r'-mp-\d\.\d'] suffixes = [r'-mp-\d\.\d']
PrgEnv = 'PrgEnv-cray' PrgEnv = 'PrgEnv-cray'
PrgEnv_compiler = 'craype' PrgEnv_compiler = 'cce'
link_paths = {'cc': 'cc', link_paths = {'cc': 'cc',
'cxx': 'c++', 'cxx': 'c++',
@ -53,4 +52,4 @@ class Craype(Compiler):
@classmethod @classmethod
def default_version(cls, comp): def default_version(cls, comp):
return get_compiler_version(comp, r'([Vv]ersion).*(\d+(\.\d+)+)') return get_compiler_version(comp, '-V', r'[Vv]ersion.*(\d+(\.\d+)+)')