Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (2ea260227acbd05f598b4747b468c0a400bc6f8b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (2ea260227acbd05f598b4747b468c0a400bc6f8b)
  • Date: Mon, 4 Jun 2007 05:43:39 -0500

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

cluster/atlas/BUILD | 14 +++++++++++++-
cluster/atlas/HISTORY | 6 ++++++
cluster/atlas/atlas-alpha.config | 12 ++++++++++++
cluster/atlas/atlas-nog77.config | 2 +-
4 files changed, 32 insertions(+), 2 deletions(-)

New commits:
commit 2ea260227acbd05f598b4747b468c0a400bc6f8b
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

atlas: make it work on alpha, make the .config files more readable by
naming the FORTRAN bit.

diff --git a/cluster/atlas/BUILD b/cluster/atlas/BUILD
index 7d40b47..f84d0df 100755
--- a/cluster/atlas/BUILD
+++ b/cluster/atlas/BUILD
@@ -1,8 +1,20 @@
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")
+ fi
+fi &&
if is_depends_enabled $SPELL fortran; then
- config=$(sed 's/0$/\ngfortran/' <<< "$config")
+ 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.//'` &&
diff --git a/cluster/atlas/HISTORY b/cluster/atlas/HISTORY
index 186775b..5eb474a 100644
--- a/cluster/atlas/HISTORY
+++ b/cluster/atlas/HISTORY
@@ -1,3 +1,9 @@
+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
+ * atlas-nog77.config: use symbol FORTRAN instead of
+ anonymous 0
+
2006-11-01 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DEPENDS: add optional fortran
* BUILD: add fortran when requested and fix #9380
diff --git a/cluster/atlas/atlas-alpha.config
b/cluster/atlas/atlas-alpha.config
new file mode 100644
index 0000000..ce59b75
--- /dev/null
+++ b/cluster/atlas/atlas-alpha.config
@@ -0,0 +1,12 @@
+025
+y
+y
+EV5GEMM
+n
+y
+
+
+
+FORTRAN
+
+y
diff --git a/cluster/atlas/atlas-nog77.config
b/cluster/atlas/atlas-nog77.config
index 8b96497..f1e3f08 100644
--- a/cluster/atlas/atlas-nog77.config
+++ b/cluster/atlas/atlas-nog77.config
@@ -5,5 +5,5 @@ n
y


-0
+FORTRAN




  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (2ea260227acbd05f598b4747b468c0a400bc6f8b), Thomas Orgis, 06/04/2007

Archive powered by MHonArc 2.6.24.

Top of Page