[Numpy-svn] r4045 - in numpy.sunperf: . numpy/distutils

[numpy-svn at scipy.org]

Author: cdavid
Date: 2007-09-16 09:33:39 -0500 (Sun, 16 Sep 2007)
New Revision: 4045

Modified:
   numpy.sunperf/numpy/distutils/system_info.py
   numpy.sunperf/test_sunperf.sh
Log:
Add mtsk and fui libs for linking for sunperf_info

Modified: numpy.sunperf/numpy/distutils/system_info.py
===================================================================
--- numpy.sunperf/numpy/distutils/system_info.py	2007-09-16 11:48:23 UTC (rev 4044)
+++ numpy.sunperf/numpy/distutils/system_info.py	2007-09-16 14:33:39 UTC (rev 4045)
@@ -850,7 +850,8 @@
 class sunperf_info(system_info):
     section = 'sunperf'
     dir_env_var = 'SUNPERF'
-    _lib_sunperf = ['sunperf', 'fsu', 'mtsk']
+    _lib_sunperf = ['sunperf', 'fsu', 'fui']
+    _lib_sunperf_suplink = ['mtsk']
 
     def get_sunperf_rootdir(self):
         sunperfroot = os.environ.get('SUNPERF',None)
@@ -887,19 +888,20 @@
             system_info.__init__(self)
         else:
             from cpuinfo import cpu
-            # XXX we really just want to detect whereas we are on x86...
-            if cpu._is_AMD() or cpu._is_Intel():
-                if cpu.is_64bits():
-                    print "amd64 version of sunperf"
-                elif cpu.has_sse2(): 
-                    print "SSE2 version of sunperf"
-                else:
-                    print "generic x86 version of sunperf"
-            else:
-                "No x86 detected"
+            ## # XXX we really just want to detect whereas we are on x86...
+            ## if cpu._is_AMD() or cpu._is_Intel():
+            ##     if cpu.is_64bits():
+            ##         print "amd64 version of sunperf"
+            ##     elif cpu.has_sse2(): 
+            ##         print "SSE2 version of sunperf"
+            ##     else:
+            ##         print "generic x86 version of sunperf"
+            ## else:
+            ##     "No x86 detected"
             system_info.__init__(self,
                                  default_lib_dirs = 
-                                    [os.path.join(sunperfroot, 'lib')],
+                                    [os.path.join(sunperfroot, 'lib'),
+                                    os.path.join(sunperfroot, 'rtlibs')],
                                  default_include_dirs = 
                                     [os.path.join(sunperfroot, 'include')])
 
@@ -916,6 +918,19 @@
             return
         info = {}
         dict_append(info,**sunperf)
+
+	# Look for mtsk: we basically assume that mtsk is here once sunperf is
+	# detected.
+        mtsk = None
+        for d in lib_dirs:
+            mtsk = self.check_libs2(d,self._lib_sunperf_suplink)
+            if mtsk is not None:
+                break
+        if mtsk is None:
+            return
+        dict_append(info,**mtsk)
+
+	# Now, the info is complete
         dict_append(info,
                     define_macros=[('SCIPY_SUNPERF_H',None)],
                     include_dirs = incl_dirs)

Modified: numpy.sunperf/test_sunperf.sh
===================================================================
--- numpy.sunperf/test_sunperf.sh	2007-09-16 11:48:23 UTC (rev 4044)
+++ numpy.sunperf/test_sunperf.sh	2007-09-16 14:33:39 UTC (rev 4045)
@@ -1,12 +1,13 @@
-INSTALL_PREFIX=/usr/media/src/src/dsp/numpy/numpy.sunperf/tmp
-SUNSTUDIOPATH=$HOME/opt/sun/sunstudio12
+INSTALL_PREFIX=/home/david/numpy.sunperf/tmp
+SUNSTUDIOPATH=/opt/sun/sunstudio12
 PATH=$SUNSTUDIOPATH/bin/:$PATH
 
+LD_LIBRARY_PATH=$SUNSTUDIOPATH/lib/:$SUNSTUDIOPATH/rtlibs/:$LD_LIBRARY_PATH
+SUNPERF=$SUNSTUDIOPATH
+
 #ATLAS=None
 #BLAS=None
 #LAPACK=None
-SUNPERF=$SUNSTUDIOPATH
-LD_LIBRARY_PATH=$SUNSTUDIOPATH/lib
 
 rm -rf $INSTALL_PREFIX
 rm -rf build
@@ -16,4 +17,4 @@
 python setup.py install --prefix=$INSTALL_PREFIX
 echo "======================================"
 echo "              TESTING "
-(cd tmp && PYTHONPATH=$INSTALL_PREFIX/lib/python2.5/site-packages python -c "import numpy; numpy.test()")
+(cd tmp && LD_LIBRARY_PATH=$LD_LIBRARY_PATH PYTHONPATH=$INSTALL_PREFIX/lib/python2.5/site-packages python -c "import numpy; numpy.test()")