diff options
| author | Peng Chang (Charles) | 2011-05-14 22:16:43 +0800 |
|---|---|---|
| committer | Peng Chang (Charles) | 2011-05-14 22:26:51 +0800 |
| commit | 18373637d59174a1a89f57d23349c65b1c0c5256 (patch) | |
| tree | 14749ca2b09841bc98a24aab0e9837737f313fe7 /cluster | |
| parent | 3e06e9b979131cf2208b4237bab45aeb924d05d3 (diff) | |
atlas: shared library is no longer an option (practically)
shared library is common practice and required by nearly all dependents;
so it is no longer an option, and shared library is built nonetheless;
and pt libraries will never be used if they are named thus, so decide
what kind of libraries will be used at compilation time; I trust you can
make the choice if you really care how atlas performs
Diffstat (limited to 'cluster')
| -rwxr-xr-x | cluster/atlas/BUILD | 17 | ||||
| -rwxr-xr-x | cluster/atlas/CONFIGURE | 5 | ||||
| -rwxr-xr-x | cluster/atlas/DETAILS | 2 | ||||
| -rw-r--r-- | cluster/atlas/HISTORY | 7 | ||||
| -rwxr-xr-x | cluster/atlas/INSTALL | 17 |
5 files changed, 31 insertions, 17 deletions
diff --git a/cluster/atlas/BUILD b/cluster/atlas/BUILD index 69350786b9..6fe1c64a84 100755 --- a/cluster/atlas/BUILD +++ b/cluster/atlas/BUILD @@ -11,14 +11,15 @@ sedit '/RANLIB/s/echo/ranlib/' Make.inc && make_single && make && -if [ $SHARED_LIB == y ]; then - cd lib && +cd lib && +if [ $PT_LIB == y ]; then + make ptshared && + # newer versions will have ptshared dependent on fat_ptshared + make fat_ptshared +else make shared && - cd .. + # newer versions will have shared dependent on fat_shared + make fat_shared fi && -if [ $PTSHARED_LIB == y ]; then - cd lib && - make ptshared && - cd .. -fi && +cd .. && make_normal diff --git a/cluster/atlas/CONFIGURE b/cluster/atlas/CONFIGURE index 13ae5e6b7b..3751a6f048 100755 --- a/cluster/atlas/CONFIGURE +++ b/cluster/atlas/CONFIGURE @@ -1,4 +1 @@ -config_query SHARED_LIB "Do you want shared libraries to be built?" y -if [ $SHARED_LIB == y ]; then - config_query PTSHARED_LIB "Do you want parallelized shared libraries to be built?" y -fi +config_query PT_LIB "Do you want parallelized libraries over serialized libraries?" y diff --git a/cluster/atlas/DETAILS b/cluster/atlas/DETAILS index ba91f4604d..071e758206 100755 --- a/cluster/atlas/DETAILS +++ b/cluster/atlas/DETAILS @@ -1,6 +1,6 @@ SPELL=atlas VERSION=3.8.3 - PATCHLEVEL=1 + PATCHLEVEL=2 SOURCE=${SPELL}$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/ATLAS SOURCE_URL[0]=$SOURCEFORGE_URL/math-atlas/$SOURCE diff --git a/cluster/atlas/HISTORY b/cluster/atlas/HISTORY index 09b8af8803..bc1badecff 100644 --- a/cluster/atlas/HISTORY +++ b/cluster/atlas/HISTORY @@ -1,4 +1,11 @@ 2011-05-14 Peng Chang (Charles) <chp@sourcemage.org> + * BUILD, CONFIGURE, INSTALL: shared library is common practice and + required by nearly all dependents; so it is no longer an option, + and shared library is built nonetheless; and pt libraries will + never be used if they are named thus, so decide what kind of libraries + will be used at compilation time; I trust you can make the choice + if you really care how atlas performs + * DETAILS: PATCHLEVEL++ * PRE_BUILD: patching configure, removing duplicate object file from liblapack.a * configure.patch: the patch diff --git a/cluster/atlas/INSTALL b/cluster/atlas/INSTALL index b007c00a92..3fe412bfe5 100755 --- a/cluster/atlas/INSTALL +++ b/cluster/atlas/INSTALL @@ -1,4 +1,13 @@ -make install && -if [ $SHARED_LIB == y ]; then - cp -v lib/*.so $INSTALL_ROOT/usr/lib -fi +make install && + +if [ $PT_LIB == y ]; then + mv -v lib/libptf77blas.so lib/libf77blas.so && + mv -v lib/libptcblas.so lib/libcblas.so && + mv -v $INSTALL_ROOT/usr/lib/libptf77blas.a $INSTALL_ROOT/usr/lib/libf77blas.a && + mv -v $INSTALL_ROOT/usr/lib/libptcblas.a $INSTALL_ROOT/usr/lib/libcblas.a +else + rm -v $INSTALL_ROOT/usr/lib/libptf77blas.a && + rm -v $INSTALL_ROOT/usr/lib/libptcblas.a +fi && + +cp -v lib/*.so $INSTALL_ROOT/usr/lib |