[Scipy-svn] r4531 - in trunk/scipy: integrate interpolate optimize sparse/linalg/dsolve sparse/linalg/eigen/arpack stats

scipy-svn@scip... scipy-svn@scip...
Sun Jul 6 11:41:06 CDT 2008


Author: cdavid
Date: 2008-07-06 11:40:48 -0500 (Sun, 06 Jul 2008)
New Revision: 4531

Modified:
   trunk/scipy/integrate/SConscript
   trunk/scipy/interpolate/SConscript
   trunk/scipy/optimize/SConscript
   trunk/scipy/sparse/linalg/dsolve/SConscript
   trunk/scipy/sparse/linalg/eigen/arpack/SConscript
   trunk/scipy/stats/SConscript
Log:
Remove most Glob usage as a temp workaround for Glob scons ordering bug.

Modified: trunk/scipy/integrate/SConscript
===================================================================
--- trunk/scipy/integrate/SConscript	2008-07-06 13:33:56 UTC (rev 4530)
+++ trunk/scipy/integrate/SConscript	2008-07-06 16:40:48 UTC (rev 4531)
@@ -26,20 +26,37 @@
 # XXX: lapack integration
 
 # Build linpack_lite
-src = [str(s) for s in env.Glob(pjoin('linpack_lite', '*.f'))]
+src = [pjoin("linpack_lite", s) for s in [ "dgbfa.f", "dgbsl.f", "dgefa.f",
+"dgesl.f", "dgtsl.f", "zgbfa.f", "zgbsl.f", "zgefa.f", "zgesl.f"]]
 linpack_lite = env.DistutilsStaticExtLibrary('linpack_lite', source = src)
 
 # Build mach
 # XXX: do not use optimization flags for mach
-src = [str(s) for s in env.Glob(pjoin('mach', '*.f'))]
+src = [pjoin("mach", s) for s in ["d1mach.f", "i1mach.f", "r1mach.f",
+"xerror.f"]]
 mach = env.DistutilsStaticExtLibrary('mach', source = src)
 
 # Build quadpack
-src = [str(s) for s in env.Glob(pjoin('quadpack', '*.f'))]
+src = [pjoin("quadpack", s) for s in ["dqag.f", "dqage.f", "dqagi.f",
+"dqagie.f", "dqagp.f", "dqagpe.f", "dqags.f", "dqagse.f", "dqawc.f",
+"dqawce.f", "dqawf.f", "dqawfe.f", "dqawo.f", "dqawoe.f", "dqaws.f",
+"dqawse.f", "dqc25c.f", "dqc25f.f", "dqc25s.f", "dqcheb.f", "dqelg.f",
+"dqk15.f", "dqk15i.f", "dqk15w.f", "dqk21.f", "dqk31.f", "dqk41.f", "dqk51.f",
+"dqk61.f", "dqmomo.f", "dqng.f", "dqpsrt.f", "dqwgtc.f", "dqwgtf.f",
+"dqwgts.f"]]
 quadpack = env.DistutilsStaticExtLibrary('quadpack', source = src)
 
 # Build odepack
-src = [str(s) for s in env.Glob(pjoin('odepack', '*.f'))]
+src = [pjoin("odepack", s) for s in [ "adjlr.f", "aigbt.f", "ainvg.f",
+"blkdta000.f", "bnorm.f", "cdrv.f", "cfode.f", "cntnzu.f", "ddasrt.f",
+"ddassl.f", "decbt.f", "ewset.f", "fnorm.f", "intdy.f", "iprep.f", "jgroup.f",
+"lsoda.f", "lsodar.f", "lsode.f", "lsodes.f", "lsodi.f", "lsoibt.f", "md.f",
+"mdi.f", "mdm.f", "mdp.f", "mdu.f", "nnfc.f", "nnsc.f", "nntc.f", "nroc.f",
+"nsfc.f", "odrv.f", "pjibt.f", "prep.f", "prepj.f", "prepji.f", "prja.f",
+"prjs.f", "rchek.f", "roots.f", "slsbt.f", "slss.f", "solbt.f",
+"solsy.f", "srcar.f", "srcma.f", "srcms.f", "srcom.f", "sro.f", "stoda.f",
+"stode.f", "stodi.f", "vmnorm.f", "vnorm.f", "vode.f", "xerrwv.f", "xsetf.f",
+"xsetun.f", "zvode.f"]]
 odepack = env.DistutilsStaticExtLibrary('odepack', source = src)
 
 env.AppendUnique(LIBPATH = '.')

Modified: trunk/scipy/interpolate/SConscript
===================================================================
--- trunk/scipy/interpolate/SConscript	2008-07-06 13:33:56 UTC (rev 4530)
+++ trunk/scipy/interpolate/SConscript	2008-07-06 16:40:48 UTC (rev 4531)
@@ -18,7 +18,21 @@
 env.AppendUnique(LINKFLAGSEND = env['F77_LDFLAGS'])
 
 # Build fitpack
-src = [str(s) for s in env.Glob(pjoin('fitpack', '*.f'))]
+src = [pjoin("fitpack", s) for s in ["bispev.f", "clocur.f", "cocosp.f",
+"concon.f", "concur.f", "cualde.f", "curev.f", "curfit.f", "dblint.f",
+"evapol.f", "fourco.f", "fpader.f", "fpadno.f", "fpadpo.f", "fpback.f",
+"fpbacp.f", "fpbfout.f", "fpbisp.f", "fpbspl.f", "fpchec.f", "fpched.f",
+"fpchep.f", "fpclos.f", "fpcoco.f", "fpcons.f", "fpcosp.f", "fpcsin.f",
+"fpcurf.f", "fpcuro.f", "fpcyt1.f", "fpcyt2.f", "fpdeno.f", "fpdisc.f",
+"fpfrno.f", "fpgivs.f", "fpgrdi.f", "fpgrpa.f", "fpgrre.f", "fpgrsp.f",
+"fpinst.f", "fpintb.f", "fpknot.f", "fpopdi.f", "fpopsp.f", "fporde.f",
+"fppara.f", "fppasu.f", "fpperi.f", "fppocu.f", "fppogr.f", "fppola.f",
+"fprank.f", "fprati.f", "fpregr.f", "fprota.f", "fprppo.f", "fprpsp.f",
+"fpseno.f", "fpspgr.f", "fpsphe.f", "fpsuev.f", "fpsurf.f", "fpsysy.f",
+"fptrnp.f", "fptrpe.f", "insert.f", "parcur.f", "parder.f", "parsur.f",
+"percur.f", "pogrid.f", "polar.f", "profil.f", "regrid.f", "spalde.f",
+"spgrid.f", "sphere.f", "splder.f", "splev.f", "splint.f", "sproot.f",
+"surev.f", "surfit.f"]]
 fitpack = env.DistutilsStaticExtLibrary('fitpack', source = src)
 
 env.PrependUnique(LIBS = ['fitpack'])

Modified: trunk/scipy/optimize/SConscript
===================================================================
--- trunk/scipy/optimize/SConscript	2008-07-06 13:33:56 UTC (rev 4530)
+++ trunk/scipy/optimize/SConscript	2008-07-06 16:40:48 UTC (rev 4531)
@@ -48,11 +48,16 @@
 #==========
 
 # minpack lib
-minpack_src = [str(s) for s in env.Glob(pjoin('minpack', '*.f'))]
+minpack_src = [pjoin("minpack", s) for s in ["chkder.f", "dogleg.f",
+"dpmpar.f", "enorm.f", "fdjac1.f", "fdjac2.f", "hybrd.f", "hybrd1.f",
+"hybrj.f", "hybrj1.f", "lmder.f", "lmder1.f", "lmdif.f", "lmdif1.f", "lmpar.f",
+"lmstr.f", "lmstr1.f", "minpack.txt", "qform.f", "qrfac.f", "qrsolv.f",
+"r1mpyq.f", "r1updt.f", "rwupdt.f"]]
 env.DistutilsStaticExtLibrary('minpack', source = minpack_src)
 
 # rootfind lib
-rootfind_src = [str(s) for s in env.Glob(pjoin('Zeros', '*.c'))]
+rootfind_src  = [pjoin("Zeros", s) for s in ["bisect.c", "brenth.c",
+"brentq.c", "ridder.c"]]
 env.DistutilsStaticExtLibrary('rootfind', source = rootfind_src)
 
 env.AppendUnique(LIBS = ['minpack', 'rootfind'])

Modified: trunk/scipy/sparse/linalg/dsolve/SConscript
===================================================================
--- trunk/scipy/sparse/linalg/dsolve/SConscript	2008-07-06 13:33:56 UTC (rev 4530)
+++ trunk/scipy/sparse/linalg/dsolve/SConscript	2008-07-06 16:40:48 UTC (rev 4531)
@@ -32,7 +32,30 @@
 superlu_def['USE_VENDOR_BLAS'] = 2
 superlu_env.Append(CPPDEFINES = superlu_def)
 
-superlu_src = superlu_env.Glob(pjoin('SuperLU', 'SRC', '*.c'))
+superlu_src = [pjoin('SuperLU', 'SRC', s) for s in [ "ccolumn_bmod.c",
+"ccolumn_dfs.c", "ccopy_to_ucol.c", "cgscon.c", "cgsequ.c", "cgsrfs.c",
+"cgssv.c", "cgssvx.c", "cgstrf.c", "cgstrs.c", "clacon.c", "clangs.c",
+"claqgs.c", "cmemory.c", "colamd.c", "cpanel_bmod.c", "cpanel_dfs.c",
+"cpivotL.c", "cpivotgrowth.c", "cpruneL.c", "creadhb.c", "csnode_bmod.c",
+"csnode_dfs.c", "csp_blas2.c", "csp_blas3.c", "cutil.c", "dGetDiagU.c",
+"dcolumn_bmod.c", "dcolumn_dfs.c", "dcomplex.c", "dcopy_to_ucol.c", "dgscon.c",
+"dgsequ.c", "dgsrfs.c", "dgssv.c", "dgssvx.c", "dgstrf.c", "dgstrs.c",
+"dgstrsL.c", "dlacon.c", "dlamch.c", "dlangs.c", "dlaqgs.c", "dmemory.c",
+"dpanel_bmod.c", "dpanel_dfs.c", "dpivotL.c", "dpivotgrowth.c", "dpruneL.c",
+"dreadhb.c", "dsnode_bmod.c", "dsnode_dfs.c", "dsp_blas2.c", "dsp_blas3.c",
+"dutil.c", "dzsum1.c", "get_perm_c.c", "heap_relax_snode.c", "icmax1.c",
+"izmax1.c", "lsame.c", "memory.c", "mmd.c", "relax_snode.c", "scolumn_bmod.c",
+"scolumn_dfs.c", "scomplex.c", "scopy_to_ucol.c", "scsum1.c", "sgscon.c",
+"sgsequ.c", "sgsrfs.c", "sgssv.c", "sgssvx.c", "sgstrf.c", "sgstrs.c",
+"slacon.c", "slamch.c", "slangs.c", "slaqgs.c", "smemory.c", "sp_coletree.c",
+"sp_ienv.c", "sp_preorder.c", "spanel_bmod.c", "spanel_dfs.c", "spivotL.c",
+"spivotgrowth.c", "spruneL.c", "sreadhb.c", "ssnode_bmod.c", "ssnode_dfs.c",
+"ssp_blas2.c", "ssp_blas3.c", "superlu_timer.c", "sutil.c", "util.c",
+"xerbla.c", "zcolumn_bmod.c", "zcolumn_dfs.c", "zcopy_to_ucol.c", "zgscon.c",
+"zgsequ.c", "zgsrfs.c", "zgssv.c", "zgssvx.c", "zgstrf.c", "zgstrs.c",
+"zlacon.c", "zlangs.c", "zlaqgs.c", "zmemory.c", "zpanel_bmod.c",
+"zpanel_dfs.c", "zpivotL.c", "zpivotgrowth.c", "zpruneL.c", "zreadhb.c",
+"zsnode_bmod.c", "zsnode_dfs.c", "zsp_blas2.c", "zsp_blas3.c", "zutil.c"]]
 superlu = superlu_env.DistutilsStaticExtLibrary('superlu_src', source = superlu_src)
 
 # Build python extensions

Modified: trunk/scipy/sparse/linalg/eigen/arpack/SConscript
===================================================================
--- trunk/scipy/sparse/linalg/eigen/arpack/SConscript	2008-07-06 13:33:56 UTC (rev 4530)
+++ trunk/scipy/sparse/linalg/eigen/arpack/SConscript	2008-07-06 16:40:48 UTC (rev 4531)
@@ -27,10 +27,26 @@
 write_info(env)
 
 # Build arpack
-arpack_src = env.Glob(pjoin('ARPACK', 'SRC', '*.f'))
-arpack_src += env.Glob(pjoin('ARPACK', 'UTIL', '*.f'))
-arpack_src += env.Glob(pjoin('ARPACK', 'LAPACK', '*.f'))
+arpack_src = [pjoin("ARPACK", "SRC", s) for s in [ "cgetv0.f", "cnaitr.f",
+"cnapps.f", "cnaup2.f", "cnaupd.f", "cneigh.f", "cneupd.f", "cngets.f",
+"csortc.f", "cstatn.f", "dgetv0.f", "dlaqrb.f", "dnaitr.f", "dnapps.f",
+"dnaup2.f", "dnaupd.f", "dnconv.f", "dneigh.f", "dneupd.f", "dngets.f",
+"dsaitr.f", "dsapps.f", "dsaup2.f", "dsaupd.f", "dsconv.f", "dseigt.f",
+"dsesrt.f", "dseupd.f", "dsgets.f", "dsortc.f", "dsortr.f", "dstatn.f",
+"dstats.f", "dstqrb.f", "sgetv0.f", "slaqrb.f", "snaitr.f", "snapps.f",
+"snaup2.f", "snaupd.f", "snconv.f", "sneigh.f", "sneupd.f", "sngets.f",
+"ssaitr.f", "ssapps.f", "ssaup2.f", "ssaupd.f", "ssconv.f", "sseigt.f",
+"ssesrt.f", "sseupd.f", "ssgets.f", "ssortc.f", "ssortr.f", "sstatn.f",
+"sstats.f", "sstqrb.f", "zgetv0.f", "znaitr.f", "znapps.f", "znaup2.f",
+"znaupd.f", "zneigh.f", "zneupd.f", "zngets.f", "zsortc.f", "zstatn.f"]]
 
+arpack_src += [pjoin('ARPACK', 'UTIL', s) for s in [ "cmout.f", "cvout.f",
+"dmout.f", "dvout.f", "icnteq.f", "icopy.f", "iset.f", "iswap.f", "ivout.f",
+"second.f", "smout.f", "svout.f", "zmout.f", "zvout.f"]]
+
+arpack_src += [pjoin('ARPACK', 'LAPACK', s) for s in [ "clahqr.f", "dlahqr.f",
+"slahqr.f", "zlahqr.f"]]
+
 src = [str(s) for s in arpack_src]
 
 env.AppendUnique(CPPPATH = pjoin('ARPACK', 'SRC'))

Modified: trunk/scipy/stats/SConscript
===================================================================
--- trunk/scipy/stats/SConscript	2008-07-06 13:33:56 UTC (rev 4530)
+++ trunk/scipy/stats/SConscript	2008-07-06 16:40:48 UTC (rev 4531)
@@ -18,7 +18,7 @@
 config.Finish()
 
 # Statlib library
-src = env.Glob(pjoin('statlib', '*.f' ))
+src = [pjoin("statlib", s) for s in [ "ansari.f", "spearman.f", "swilk.f"]]
 env.DistutilsStaticExtLibrary('statlibimp', source = src)
 
 env.AppendUnique(LIBPATH = '.')



More information about the Scipy-svn mailing list