Revision: 525
http://rpy.svn.sourceforge.net/rpy/?rev=525&view=rev
Author: lgautier
Date: 2008-05-14 22:21:26 -0700 (Wed, 14 May 2008)
Log Message:
-----------
Propagated the recent fix in RPy-1.x (case where R is compiled to use
already installed BLAS/LAPACK libraries)
(see thread from Dirk and Greg on the mailing-list).
Modified Paths:
--------------
branches/rpy_nextgen/setup.py
Modified: branches/rpy_nextgen/setup.py
===================================================================
--- branches/rpy_nextgen/setup.py 2008-05-14 18:33:26 UTC (rev 524)
+++ branches/rpy_nextgen/setup.py 2008-05-15 05:21:26 UTC (rev 525)
@@ -29,7 +29,7 @@
def get_rversion(RHOME):
r_exec = os.path.join(RHOME, 'bin', 'R')
# Twist if Win32
- if sys.platform=="win32":
+ if sys.platform == "win32":
rp = os.popen3('"'+r_exec+'" --version')[2]
else:
rp = os.popen('"'+r_exec+'" --version')
@@ -52,6 +52,20 @@
return 0
return cmp_version(x[1:], y[1:])
+def get_rconfig(RHOME, about):
+ r_exec = os.path.join(RHOME, 'bin', 'R')
+ # Twist if Win32
+ if sys.platform == "win32":
+ rp = os.popen3('"'+r_exec+'" CMD config '+about)[2]
+ else:
+ rp = os.popen('"'+r_exec+'" CMD config '+about)
+ rconfig = rp.readline()
+ #Twist if 'R RHOME' spits out a warning
+ if rconfig.startswith("WARNING"):
+ rconfig = rp.readline()
+ rconfig = rconfig.strip()
+ return rconfig
+
rnewest = [0, 0, 0]
rversions = []
for RHOME in RHOMES:
@@ -92,7 +106,8 @@
libraries=['R', 'Rlapack', 'Rblas'],
library_dirs=r_libs,
runtime_library_dirs=r_libs,
- #extra_link_args=[],
+ extra_link_args=[get_rconfig(RHOME, 'LAPACK_LIBS'),
+ get_rconfig(RHOME, 'BLAS_LIBS')],
)
setup(name = "rpython",
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
rpy-list mailing list
rpy-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rpy-list
