[SM-Commit] GIT changes to master grimoire by Jaka Kranjc (58bb0a7b3d4dc0688b854c13ad308ea955ccf613)

Jaka Kranjc scm at sourcemage.org
Tue May 19 11:00:07 EDT 2009


GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx at sourcemage.org>:

 cluster/atlas/BUILD              |   49 +++++++++++++++++++++++----------------
 cluster/atlas/CONFIGURE          |   13 ++++++++++
 cluster/atlas/CONFLICTS          |    1 
 cluster/atlas/DEPENDS            |    5 +++
 cluster/atlas/DETAILS            |    5 +--
 cluster/atlas/HISTORY            |   15 +++++++++++
 cluster/atlas/INSTALL            |   15 +++--------
 cluster/atlas/PREPARE            |   13 ++++++++++
 cluster/atlas/PRE_BUILD          |    2 +
 cluster/atlas/TRIGGERS           |    3 ++
 cluster/atlas/atlas-alpha.config |   12 ---------
 cluster/atlas/atlas-nog77.config |    9 -------
 cluster/lapack/CONFLICTS         |    3 --
 cluster/lapack/DEPENDS           |    1 
 cluster/lapack/DETAILS           |    4 +--
 cluster/lapack/HISTORY           |    5 +++
 cluster/lapack/PRE_BUILD         |    4 ++-
 volatiles                        |    1 
 18 files changed, 98 insertions(+), 62 deletions(-)

New commits:
commit 58bb0a7b3d4dc0688b854c13ad308ea955ccf613
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    atlas: update and fixes by chp #15230
    fixes also some older bugs

commit 4f6fd3ed86b4559c46cbe0e872d5ac0a6433040f
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    lapack: update and fixes from chp #15231

diff --git a/cluster/atlas/BUILD b/cluster/atlas/BUILD
index f84d0df..e16378d 100755
--- a/cluster/atlas/BUILD
+++ b/cluster/atlas/BUILD
@@ -1,22 +1,31 @@
-persistent_add  SOURCE_LIB                           &&
-make_single                                          &&
-local config=$(<$SCRIPT_DIRECTORY/atlas-nog77.config) &&
-if [[ "${SMGL_COMPAT_ARCHS[1]}" == alpha ]]; then
-  config=$(<$SCRIPT_DIRECTORY/atlas-alpha.config) &&
-  # Tricky: The question may come even if generic chosen,
-  # when cpu is ev5/6/7 nevertheless!
-  if [[ "${SMGL_COMPAT_ARCHS[3]}" =~ ^ev[567] ]]; then
-    config=$(sed 's/EV5GEMM/y/' <<< "$config")
-  else # Assume that question is not posed.
-    config=$(sed '/EV5GEMM/d' <<< "$config")
+cd  $SOURCE_DIRECTORY/bld                            &&
+if is_depends_enabled $SPELL lapack; then
+  OPTS="--with-netlib-lapack=$INSTALL_ROOT/usr/lib/liblapack.a $OPTS"
+fi                                                   &&
+if [ $WALL_TIMER == y ]; then
+  if [[ ${SMGL_COMPAT_ARCHS[1]} == "ia32" || ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]; then
+    OPTS="-D c -DPentiumCPS=$CPU_FREQ $OPTS"
+  else
+    OPTS="-D c -DWALL $OPTS"
   fi
+fi                                                   &&
+
+../configure -Si cputhrchk 0 \
+             -Fa alg -fPIC \
+             -b ${SMGL_COMPAT_ARCHS[0]} \
+             --prefix=$INSTALL_ROOT/usr              &&
+sedit '/RANLIB/s/echo/ranlib/' Make.inc              &&
+
+make_single &&
+make                                                 &&
+if [ $SHARED_LIB == y ]; then
+  cd lib                                             &&
+  make shared                                        &&
+  cd ..
+fi                                                   &&
+if [ $PTSHARED_LIB == y ]; then
+  cd lib                                             &&
+  make ptshared                                      &&
+  cd ..
 fi &&
-if is_depends_enabled $SPELL fortran; then
-  config=$(sed 's/FORTRAN/1\ngfortran/' <<< "$config")
-else
-  config=$(sed 's/FORTRAN/0/' <<< "$config")
-fi &&
-echo "$config" | make      &&
-ARCH=`ls -1 Make.Linux* | sed -e 's/Make.//'`        &&
-make  install  arch=$ARCH                            &&
-SOURCE_LIB=$SOURCE_DIRECTORY/lib/$ARCH
+make_normal
diff --git a/cluster/atlas/CONFIGURE b/cluster/atlas/CONFIGURE
new file mode 100755
index 0000000..72d9da5
--- /dev/null
+++ b/cluster/atlas/CONFIGURE
@@ -0,0 +1,13 @@
+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 WALL_TIMER "Do you want to enable wall timer? (if your comupter load is not high, this will provide a higher resolution timer)" y
+
+# Haven't tried with other archs than ia32 yet
+if [ $WALL_TIMER == y ]; then
+  if [[ ${SMGL_COMPAT_ARCHS[1]} == "ia32" || ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]; then
+    config_query_string CPU_FREQ "What is your CPU frequency in MHz?" 1000
+  fi
+fi
diff --git a/cluster/atlas/CONFLICTS b/cluster/atlas/CONFLICTS
index a3fe481..d7c014b 100755
--- a/cluster/atlas/CONFLICTS
+++ b/cluster/atlas/CONFLICTS
@@ -1,2 +1 @@
-conflicts lapack    &&
 conflicts clapack
diff --git a/cluster/atlas/DEPENDS b/cluster/atlas/DEPENDS
index 0497e32..e0d753e 100755
--- a/cluster/atlas/DEPENDS
+++ b/cluster/atlas/DEPENDS
@@ -1 +1,4 @@
-optional_depends fortran "" "" "for fortran bindings"
+optional_depends fortran "" "--nof77" "for fortran bindings"
+if is_depends_enabled $SPELL fortran; then
+  optional_depends lapack "" "" "to build enhanced liblapack.a"
+fi
diff --git a/cluster/atlas/DETAILS b/cluster/atlas/DETAILS
index 6702046..b6122a4 100755
--- a/cluster/atlas/DETAILS
+++ b/cluster/atlas/DETAILS
@@ -1,12 +1,11 @@
            SPELL=atlas
-         VERSION=3.6.0
+         VERSION=3.8.3
           SOURCE=${SPELL}$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/ATLAS
    SOURCE_URL[0]=$SOURCEFORGE_URL/math-atlas/$SOURCE
-     SOURCE_HASH=sha512:0272f94e4e452d240741336a65450d9767150c886681e3f88bcdbebeb18ceba7d489f848ec2824ef0ce1dd33f8cb122e8d87e64d5f19407d02801b775fce2f73
+     SOURCE_HASH=sha512:4c152f1f5c49d9b0275e3c8755fc7808f5b298c9f92ea9958dbb771bc656da950e5136e36cbc3ff39542f17d12b719d9acd2c8ecc66382c6fe2dc4ad82bd9aa2
         WEB_SITE=http://math-atlas.sourceforge.net
          ENTERED=20020514
-      PATCHLEVEL=1
       LICENSE[0]=BSD
         KEYWORDS="algebra cluster"
            SHORT="Automatically Tuned Linear Algebra Software (ATLAS)"
diff --git a/cluster/atlas/HISTORY b/cluster/atlas/HISTORY
index 5eb474a..2c2d89f 100644
--- a/cluster/atlas/HISTORY
+++ b/cluster/atlas/HISTORY
@@ -1,3 +1,18 @@
+2009-05-17 Peng Chang (Charles) <chp516 at gmail.com>
+	* BUILD: changed accordingly
+	* CONFIGURE: added this file to query various options
+	* DEPENDS: added optional_depends lapack
+	* DETAILS: version 3.8.3, this version has a new building and
+	  installing scheme
+	* CONFLICTS: resolved conflict with lapack. atlas should work
+	  _with_ lapack, rather than conflict lapack
+	* INSTALL: changed accordingly
+	* PRE_BUILD: added accordingly
+	* README: attentions before building atlas
+	* TRIGGERS: used to resolve conflicts with lapack
+	* atlas-nog77.config, atlas-alpha.config: probably no longer
+	  needed
+
 2007-06-04 Thomas Orgis <sobukus at sourcemage.org>
 	* BUILD, atlas-alpha.config: make it work on alphas,
 	  prepare for better fortran handling for others, too
diff --git a/cluster/atlas/INSTALL b/cluster/atlas/INSTALL
index f38b090..b007c00 100755
--- a/cluster/atlas/INSTALL
+++ b/cluster/atlas/INSTALL
@@ -1,11 +1,4 @@
-make_normal                                          &&
-install -m 0644 $SOURCE_LIB/libatlas.a    /usr/lib   &&
-install -m 0644 $SOURCE_LIB/libcblas.a    /usr/lib   &&
-install -m 0644 $SOURCE_LIB/libf77blas.a  /usr/lib   &&
-install -m 0644 $SOURCE_LIB/liblapack.a   /usr/lib   &&
-install -m 0644 $SOURCE_DIRECTORY/include/cblas.h    \
-  /usr/include                                       &&
-install -m 0644 $SOURCE_DIRECTORY/include/clapack.h  \
-  /usr/include
-
-persistent_remove  SOURCE_LIB
+make install                               &&
+if [ $SHARED_LIB == y ]; then
+  cp -v lib/*.so $INSTALL_ROOT/usr/lib
+fi
diff --git a/cluster/atlas/PREPARE b/cluster/atlas/PREPARE
new file mode 100755
index 0000000..03c1baa
--- /dev/null
+++ b/cluster/atlas/PREPARE
@@ -0,0 +1,13 @@
+cat <<EOF
+Before casting atlas spell, you'd better turn off cpu throttling for
+every cpu(core) according to the official installation documentation.
+
+Tune your freq governor to "performance" somewhere like:
+/sys/devices/system/cpu/cpu?/cpufreq/scaling_governor
+
+During configuration, you'll be asked whether enabling wall timer.
+According to official documentation, "if you are installing ATLAS on a
+machine which is not heavily loaded, you will want to improve your
+install by instructing ATLAS to use one of its higher resolution wall
+timers.
+EOF
diff --git a/cluster/atlas/PRE_BUILD b/cluster/atlas/PRE_BUILD
new file mode 100755
index 0000000..cc0a8ec
--- /dev/null
+++ b/cluster/atlas/PRE_BUILD
@@ -0,0 +1,2 @@
+default_pre_build             &&
+mkdir  $SOURCE_DIRECTORY/bld
diff --git a/cluster/atlas/TRIGGERS b/cluster/atlas/TRIGGERS
new file mode 100755
index 0000000..370e78f
--- /dev/null
+++ b/cluster/atlas/TRIGGERS
@@ -0,0 +1,3 @@
+if is_depends_enabled $SPELL lapack; then
+  on_cast lapack cast_self;
+fi
diff --git a/cluster/atlas/atlas-alpha.config b/cluster/atlas/atlas-alpha.config
deleted file mode 100644
index ce59b75..0000000
--- a/cluster/atlas/atlas-alpha.config
+++ /dev/null
@@ -1,12 +0,0 @@
-025
-y
-y
-EV5GEMM
-n
-y
-
-
-
-FORTRAN
-
-y
diff --git a/cluster/atlas/atlas-nog77.config b/cluster/atlas/atlas-nog77.config
deleted file mode 100644
index f1e3f08..0000000
--- a/cluster/atlas/atlas-nog77.config
+++ /dev/null
@@ -1,9 +0,0 @@
-025
-y
-y
-n
-y
-
-
-FORTRAN
-
diff --git a/cluster/lapack/CONFLICTS b/cluster/lapack/CONFLICTS
index ab12794..d7c014b 100755
--- a/cluster/lapack/CONFLICTS
+++ b/cluster/lapack/CONFLICTS
@@ -1,2 +1 @@
-conflicts clapack   &&
-conflicts atlas
+conflicts clapack
diff --git a/cluster/lapack/DEPENDS b/cluster/lapack/DEPENDS
new file mode 100755
index 0000000..8e5f286
--- /dev/null
+++ b/cluster/lapack/DEPENDS
@@ -0,0 +1 @@
+depends fortran
diff --git a/cluster/lapack/DETAILS b/cluster/lapack/DETAILS
index 616a291..2cb8e12 100755
--- a/cluster/lapack/DETAILS
+++ b/cluster/lapack/DETAILS
@@ -1,8 +1,8 @@
             SPELL=lapack
-          VERSION=3.2
+          VERSION=3.2.1
        VERSIONMAN=3.2.0
            SOURCE=$SPELL-$VERSION.tgz
-      SOURCE_HASH=sha512:03cb908f184842cbe3cd45b6f09676960f2d10685ab80975e13e44d8c3edc2324b41cc5da28c17a9799bf55c176f316a4234dfd2225e1542e67d79a1a91b9421
+      SOURCE_HASH=sha512:a89b88540f8e5b05b7c58e8e301a5068729ceb35fcb2143edfff1644458ff1a375e5185492cf116b50409fe0c17b51c253a2987f4df83e9f9c3968a4b77e5d97
           SOURCE2=manpages-$VERSIONMAN.tgz
      SOURCE2_HASH=sha512:111c33821bcc1158a49e0501e63e867a9c6cdfb0677eba5604e78dee4fe90c509ee447e8665e9b8f25b2e6f63923b8398c4ed8fea16f109ca9c327334e7863ff
  SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/cluster/lapack/HISTORY b/cluster/lapack/HISTORY
index 8a99670..b8c440a 100644
--- a/cluster/lapack/HISTORY
+++ b/cluster/lapack/HISTORY
@@ -1,3 +1,8 @@
+2009-05-17 Peng Chang (Charles) <chp516 at gmail.com>
+	* DETAILS: lapack 3.2.1
+	* PRE_BUILD: added -fPIC to support shared library in atlas
+	* CONFLICTS: resolved conflict with atlas
+
 2009-01-30 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: lapack 3.2, manpages 3.2.0, switched to versioned sources
 	* BUILD, PRE_BUILD, INSTALL: updated to new version
diff --git a/cluster/lapack/PRE_BUILD b/cluster/lapack/PRE_BUILD
index 2f09d49..8faebb9 100755
--- a/cluster/lapack/PRE_BUILD
+++ b/cluster/lapack/PRE_BUILD
@@ -1,4 +1,6 @@
 default_pre_build                   &&
 cd  $SOURCE_DIRECTORY               &&
 unpack_file 2                       &&
-cp make.inc.example make.inc
+cp make.inc.example make.inc        &&
+sed -i "s/OPTS     =/& ${CFLAGS} -fPIC/" make.inc  &&
+sed -i "s/NOOPT    =/& -fPIC/" make.inc
diff --git a/volatiles b/volatiles
index aa3955e..00b5b21 100644
--- a/volatiles
+++ b/volatiles
@@ -7,3 +7,4 @@
 ^/usr/share/icons/.*/icon-theme.cache$
 ^/usr/share/applications/mimeinfo.cache$
 ^/usr/share/icons/.*/index.theme$
+^/usr/lib/liblapack.a



More information about the SM-Commit mailing list