Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Peng Chang (Charles) (18373637d59174a1a89f57d23349c65b1c0c5256)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: "Peng Chang \(Charles\)" <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Peng Chang (Charles) (18373637d59174a1a89f57d23349c65b1c0c5256)
  • Date: Sat, 14 May 2011 09:34:49 -0500

GIT changes to master grimoire by Peng Chang (Charles) <chp AT sourcemage.org>:

cluster/atlas/BUILD | 17 +++++++++--------
cluster/atlas/CONFIGURE | 5 +----
cluster/atlas/DETAILS | 2 +-
cluster/atlas/HISTORY | 12 ++++++++++++
cluster/atlas/INSTALL | 17 +++++++++++++----
cluster/atlas/PRE_BUILD | 1 +
cluster/atlas/configure.patch | 12 ++++++++++++
7 files changed, 49 insertions(+), 17 deletions(-)

New commits:
commit 18373637d59174a1a89f57d23349c65b1c0c5256
Author: Peng Chang (Charles) <chp AT sourcemage.org>
Commit: Peng Chang (Charles) <chp AT sourcemage.org>

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

commit 3e06e9b979131cf2208b4237bab45aeb924d05d3
Author: Peng Chang (Charles) <chp AT sourcemage.org>
Commit: Peng Chang (Charles) <chp AT sourcemage.org>

atlas: patch for configure for compatibility with lapack

diff --git a/cluster/atlas/BUILD b/cluster/atlas/BUILD
index 6935078..6fe1c64 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 13ae5e6..3751a6f 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 ba91f46..071e758 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 4c8c9d8..bc1bade 100644
--- a/cluster/atlas/HISTORY
+++ b/cluster/atlas/HISTORY
@@ -1,3 +1,15 @@
+2011-05-14 Peng Chang (Charles) <chp AT 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
+
2011-05-13 Peng Chang (Charles) <chp AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* BUILD, CONFIGURE: clean up ineffective options
diff --git a/cluster/atlas/INSTALL b/cluster/atlas/INSTALL
index b007c00..3fe412b 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
diff --git a/cluster/atlas/PRE_BUILD b/cluster/atlas/PRE_BUILD
index ce52e77..1486f51 100755
--- a/cluster/atlas/PRE_BUILD
+++ b/cluster/atlas/PRE_BUILD
@@ -2,4 +2,5 @@ default_pre_build &&
mkdir $SOURCE_DIRECTORY/bld &&

cd $SOURCE_DIRECTORY &&
+patch configure $SPELL_DIRECTORY/configure.patch &&
patch tune/blas/gemm/emit_mm.c $SPELL_DIRECTORY/emit_mm.patch
diff --git a/cluster/atlas/configure.patch b/cluster/atlas/configure.patch
new file mode 100644
index 0000000..f457d5b
--- /dev/null
+++ b/cluster/atlas/configure.patch
@@ -0,0 +1,12 @@
+--- configure 2009-02-19 02:47:35.000000000 +0800
++++ configure 2011-05-14 16:49:30.470003020 +0800
+@@ -262,7 +262,8 @@
+ if test $flapack != "ATL_NoOverride"
+ then
+ cp -f $flapack lib/liblapack.a
+- ar d lib/liblapack.a lsame.o xerbla.o csrot.o zdrot.o
++ ar d lib/liblapack.a lsame.o xerbla.o csrot.o zdrot.o \
++ spotrf.o cpotrs.o cgetrs.o cpotrf.o cgetrf.o
+ fi
+ echo "DONE configure"
+ #



  • [SM-Commit] GIT changes to master grimoire by Peng Chang (Charles) (18373637d59174a1a89f57d23349c65b1c0c5256), Peng Chang (Charles), 05/14/2011

Archive powered by MHonArc 2.6.24.

Top of Page