diff options
author | Mario Melara <maamelara@gmail.com> | 2015-11-04 13:21:33 -0800 |
---|---|---|
committer | Mario Melara <maamelara@gmail.com> | 2015-11-04 13:21:33 -0800 |
commit | 2bc73b4a274f68730bea36f7a5af849a4217e5a4 (patch) | |
tree | ca8ce6d9a07d3bf682568d6497a07e7d78bc157c /lib | |
parent | 9bf8e8573cff42581074ed9e492ab0e0bc6c7253 (diff) | |
parent | 3a73ae1683c4e83791f273d2034a99824e81aeca (diff) | |
download | spack-2bc73b4a274f68730bea36f7a5af849a4217e5a4.tar.gz spack-2bc73b4a274f68730bea36f7a5af849a4217e5a4.tar.bz2 spack-2bc73b4a274f68730bea36f7a5af849a4217e5a4.tar.xz spack-2bc73b4a274f68730bea36f7a5af849a4217e5a4.zip |
Merge branch 'features/spackathon' of https://github.com/NERSC/spack into features/spackathon
Diffstat (limited to 'lib')
-rw-r--r-- | lib/spack/spack/architectures/cray.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/spack/spack/architectures/cray.py b/lib/spack/spack/architectures/cray.py index 420b7c589e..640a3933e0 100644 --- a/lib/spack/spack/architectures/cray.py +++ b/lib/spack/spack/architectures/cray.py @@ -1,20 +1,20 @@ import os -from spack.architecture import Architecture +from spack.architecture import Architecture, Target class Cray(Architecture): priority = 20 front_end = 'sandybridge' back_end = 'ivybridge' - default = os.environ["CRAY_CPU_TARGET"] + default = 'ivybridge' def __init__(self): super(Cray, self).__init__('cray') # Back End compiler needs the proper target module loaded. - self.add_target('ivybridge','craype-ivybridge') + self.add_target('ivybridge', Target('ivybridge','craype-ivybridge')) # Could switch to use modules and fe targets for front end # Currently using compilers by path for front end. - self.add_target('sandybridge') + self.add_target('sandybridge', Target('sandybridge')) @classmethod def detect(self): |