8000 Merge pull request #446 from cgohlke/patch-1 · numpy/numpy@58aefff · GitHub
[go: up one dir, main page]
Skip to content

Commit 58aefff

Browse files
njsmithnjsmith
committed
Merge pull request #446 from cgohlke/patch-1
Style: consistently use spaces instead of tabs in .py files
2 parents ccbf5cf + 0ab86f0 commit 58aefff

File tree

3 files changed

+29
-29
lines changed

3 files changed

+29
-29
lines changed

‎numpy/build_utils/waf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ def check_declarati 8000 on(self, symbol, **kw):
123123
def check_type(self, type_name, **kw):
124124
code = r"""
125125
int main() {
126-
if ((%(type_name)s *) 0)
126+
if ((%(type_name)s *) 0)
127127
return 0;
128-
if (sizeof (%(type_name)s))
128+
if (sizeof (%(type_name)s))
129129
return 0;
130130
}
131131
""" % {"type_name": type_name}

‎numpy/distutils/fcompiler/gnu.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ def version_match(self, version_string):
251251
executables = {
252252
'version_cmd' : ["<F90>", "--version"],
253253
'compiler_f77' : [None, "-Wall", "-ffixed-form",
254-
"-fno-second-underscore"] + _EXTRAFLAGS,
254+
"-fno-second-underscore"] + _EXTRAFLAGS,
255255
'compiler 8000 _f90' : [None, "-Wall", "-fno-second-underscore"] + _EXTRAFLAGS,
256256
'compiler_fix' : [None, "-Wall", "-ffixed-form",
257257
"-fno-second-underscore"] + _EXTRAFLAGS,

‎numpy/distutils/fcompiler/pathf95.py

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,33 @@
44

55
class PathScaleFCompiler(FCompiler):
66

7-
compiler_type = 'pathf95'
8-
description = 'PathScale Fortran Compiler'
9-
version_pattern = r'PathScale\(TM\) Compiler Suite: Version (?P<version>[\d.]+)'
7+
compiler_type = 'pathf95'
8+
description = 'PathScale Fortran Compiler'
9+
version_pattern = r'PathScale\(TM\) Compiler Suite: Version (?P<version>[\d.]+)'
1010

11-
executables = {
12-
'version_cmd' : ["pathf95", "-version"],
13-
'compiler_f77' : ["pathf95", "-fixedform"],
14-
'compiler_fix' : ["pathf95", "-fixedform"],
15-
'compiler_f90' : ["pathf95"],
16-
'linker_so' : ["pathf95", "-shared"],
17-
'archiver' : ["ar", "-cr"],
18-
'ranlib' : ["ranlib"]
19-
}
20-
pic_flags = ['-fPIC']
21-
module_dir_switch = '-module ' # Don't remove ending space!
22-
module_include_switch = '-I'
11+
executables = {
12+
'version_cmd' : ["pathf95", "-version"],
13+
'compiler_f77' : ["pathf95", "-fixedform"],
14+
'compiler_fix' : ["pathf95", "-fixedform"],
15+
'compiler_f90' : ["pathf95"],
16+
'linker_so' : ["pathf95", "-shared"],
17+
'archiver' : ["ar", "-cr"],
18+
'ranlib' : ["ranlib"]
19+
}
20+
pic_flags = ['-fPIC']
21+
module_dir_switch = '-module ' # Don't remove ending space!
22+
module_include_switch = '-I'
2323

24-
def get_flags_opt(self):
25-
return ['-O3']
26-
def get_flags_debug(self):
27-
return ['-g']
24+
def get_flags_opt(self):
25+
return ['-O3']
26+
def get_flags_debug(self):
27+
return ['-g']
2828

2929
if __name__ == '__main__':
30-
from distutils import log
31-
log.set_verbosity(2)
32-
#compiler = PathScaleFCompiler()
33-
from numpy.distutils.fcompiler import new_fcompiler
34-
compiler = new_fcompiler(compiler='pathf95')
35-
compiler.customize()
36-
print compiler.get_version()
30+
from distutils import log
31+
log.set_verbosity(2)
32+
#compiler = PathScaleFCompiler()
33+
from numpy.distutils.fcompiler import new_fcompiler
34+
compiler = new_fcompiler(compiler='pathf95')
35+
compiler.customize()
36+
print compiler.get_version()

0 commit comments

Comments
 (0)
0