[Numpy-svn] r4510 - in branches/numpy.scons/numpy/distutils: command scons/core scons/doc

[numpy-svn at scipy.org]

Author: cdavid
Date: 2007-11-26 04:16:48 -0600 (Mon, 26 Nov 2007)
New Revision: 4510

Modified:
   branches/numpy.scons/numpy/distutils/command/scons.py
   branches/numpy.scons/numpy/distutils/scons/core/default.py
   branches/numpy.scons/numpy/distutils/scons/core/numpyenv.py
   branches/numpy.scons/numpy/distutils/scons/doc/TODO
Log:

- Enable ifort on unix for scons build
- Add some optimizations for intel compiler in scons
- Add some todo for scons



Modified: branches/numpy.scons/numpy/distutils/command/scons.py
===================================================================
--- branches/numpy.scons/numpy/distutils/command/scons.py	2007-11-26 10:05:05 UTC (rev 4509)
+++ branches/numpy.scons/numpy/distutils/command/scons.py	2007-11-26 10:16:48 UTC (rev 4510)
@@ -59,8 +59,8 @@
     Example:
         --fcompiler=intel -> ifort on linux, ifl on windows"""
     if compiler.compiler_type == 'intel':
-        raise NotImplementedError('FIXME: intel fortran compiler name ?')
-        #return 'intelc'
+        #raise NotImplementedError('FIXME: intel fortran compiler name ?')
+        return 'ifort'
     elif compiler.compiler_type == 'gnu':
         return 'g77'
     elif compiler.compiler_type == 'gnu95':

Modified: branches/numpy.scons/numpy/distutils/scons/core/default.py
===================================================================
--- branches/numpy.scons/numpy/distutils/scons/core/default.py	2007-11-26 10:05:05 UTC (rev 4509)
+++ branches/numpy.scons/numpy/distutils/scons/core/default.py	2007-11-26 10:16:48 UTC (rev 4510)
@@ -1,5 +1,5 @@
 #! /usr/bin/env python
-# Last Change: Tue Nov 20 07:00 PM 2007 J
+# Last Change: Mon Nov 26 05:00 PM 2007 J
 import sys
 import distutils.sysconfig
 
@@ -141,7 +141,7 @@
             raise NotImplementedError('FIXME: intel compiler on windows not '\
                                       ' supported yet')
             
-        cfg = CompilerConfig(optim = ['-O2', '-fno-strict-aliasing', '-DNDEBUG'],
+        cfg = CompilerConfig(optim = ['-O2', '-fomit-frame-pointer', '-fno-strict-aliasing', '-DNDEBUG'],
                              warn = ['-Wall', '-Wstrict-prototypes'],
                              debug_symbol = ['-g'],
                              thread = ['-pthread'])

Modified: branches/numpy.scons/numpy/distutils/scons/core/numpyenv.py
===================================================================
--- branches/numpy.scons/numpy/distutils/scons/core/numpyenv.py	2007-11-26 10:05:05 UTC (rev 4509)
+++ branches/numpy.scons/numpy/distutils/scons/core/numpyenv.py	2007-11-26 10:16:48 UTC (rev 4510)
@@ -173,7 +173,8 @@
     if len(env['f77_opt']) > 0:
         try:
             if len(env['f77_opt_path']) > 0:
-                t = Tool(env['f77_opt'], toolpath = ['numpy/distutils/scons/tools'])
+                t = Tool(env['f77_opt'], toolpath = [os.path.dirname(numpy.distutils.scons.tools.__file__)])
+
                 t(env) 
                 path_list.append(env['f77_opt_path'])
         except EnvironmentError, e:
@@ -262,6 +263,7 @@
 
     # Add our own, custom tools (f2py, from_template, etc...)
     t = Tool('f2py', toolpath = [os.path.dirname(numpy.distutils.scons.tools.__file__)])
+
     try:
         t(env)
     except Exception, e:

Modified: branches/numpy.scons/numpy/distutils/scons/doc/TODO
===================================================================
--- branches/numpy.scons/numpy/distutils/scons/doc/TODO	2007-11-26 10:05:05 UTC (rev 4509)
+++ branches/numpy.scons/numpy/distutils/scons/doc/TODO	2007-11-26 10:16:48 UTC (rev 4510)
@@ -1,7 +1,12 @@
 Things to implement / problems to solve:
+    - Make 'real' python extension builders
     - f2py interoperability ?
     - fortran compiler optimization / option (underscore and so on)
 
+F2py:
+    - Numpy version to handle build dir issues
+    - Difference between .f and .pyf:
+
 Builder:
     - Get a PythonExtension builder independant of distutils for upstream
       integration