Merge pull request #1 from robertdfrench/olcf/unified_cray_platform

PEP8 Goodness

lib/spack/spack/operating_systems/cnl.py

@@ -7,6 +7,7 @@
 from spack.util.multiproc import parmap
 import spack.compilers
 
+
 class Cnl(OperatingSystem):
     """ Compute Node Linux (CNL) is the operating system used for the Cray XC
     series super computers. It is a very stripped down version of GNU/Linux.
@@ -24,14 +25,14 @@ def __str__(self):
 
     def find_compilers(self, *paths):
         types = spack.compilers.all_compiler_types()
-        compiler_lists = parmap(lambda cmp_cls: self.find_compiler(cmp_cls, *paths), types)
+        compiler_lists = parmap(
+            lambda cmp_cls: self.find_compiler(cmp_cls, *paths), types)
 
         # ensure all the version calls we made are cached in the parent
         # process, as well.  This speeds up Spack a lot.
-        clist = reduce(lambda x,y: x+y, compiler_lists)
+        clist = reduce(lambda x, y: x + y, compiler_lists)
         return clist
 
-
     def find_compiler(self, cmp_cls, *paths):
         compilers = []
         if cmp_cls.PrgEnv:
@@ -48,12 +49,15 @@ def find_compiler(self, cmp_cls, *paths):
                 module_paths = ':' + ':'.join(p for p in paths)
                 os.environ['MODULEPATH'] = module_paths
 
-            output = modulecmd('avail', cmp_cls.PrgEnv_compiler, output=str, error=str)
-            matches = re.findall(r'(%s)/([\d\.]+[\d])' % cmp_cls.PrgEnv_compiler, output)
+            output = modulecmd(
+                'avail', cmp_cls.PrgEnv_compiler, output=str, error=str)
+            matches = re.findall(
+                r'(%s)/([\d\.]+[\d])' % cmp_cls.PrgEnv_compiler, output)
             for name, version in matches:
                 v = version
-                comp = cmp_cls(spack.spec.CompilerSpec(name + '@' + v), self,
-                           ['cc', 'CC', 'ftn'], [cmp_cls.PrgEnv, name +'/' + v])
+                comp = cmp_cls(
+                    spack.spec.CompilerSpec(name + '@' + v), self,
+                    ['cc', 'CC', 'ftn'], [cmp_cls.PrgEnv, name + '/' + v])
 
                 compilers.append(comp)
 

lib/spack/spack/platforms/cray.py

@@ -1,9 +1,6 @@
 import os
 import re
-import platform as py_platform
-#from subprocess import check_output
 import spack.config
-from spack.util.executable import which
 from spack.architecture import Platform, Target, NoPlatformError
 from spack.operating_systems.linux_distro import LinuxDistro
 from spack.operating_systems.cnl import Cnl
@@ -57,7 +54,8 @@ def __init__(self):
 
         if self.back_end is not None:
             self.default = self.back_end
-            self.add_target('default', Target(self.default, 'craype-' + self.default))
+            self.add_target(
+                'default', Target(self.default, 'craype-' + self.default))
         else:
             raise NoPlatformError()