[cig-commits] r21301 - in cs/batlab/trunk: . MAG support
ericheien at geodynamics.org
ericheien at geodynamics.org
Sun Jan 27 17:49:53 PST 2013
Author: ericheien
Date: 2013-01-27 17:49:53 -0800 (Sun, 27 Jan 2013)
New Revision: 21301
Added:
cs/batlab/trunk/MAG/
cs/batlab/trunk/MAG/build.sh
cs/batlab/trunk/MAG/build_files.scp
cs/batlab/trunk/MAG/dist_check.run-spec
cs/batlab/trunk/MAG/dist_files.scp
cs/batlab/trunk/MAG/dist_files.url
cs/batlab/trunk/MAG/repo_check.run-spec
cs/batlab/trunk/MAG/repo_checkout.svn
cs/batlab/trunk/support/build_numdiff-5.6.1.sh
Removed:
cs/batlab/trunk/MAG/build_files.scp
cs/batlab/trunk/MAG/dist_check.run-spec
cs/batlab/trunk/MAG/dist_files.scp
cs/batlab/trunk/MAG/dist_files.url
cs/batlab/trunk/MAG/openmpi-1.6.3.scp
cs/batlab/trunk/MAG/repo_check.run-spec
cs/batlab/trunk/MAG/repo_checkout.svn
Modified:
cs/batlab/trunk/MAG/README
cs/batlab/trunk/README
Log:
Added MAG build checks for repository and distribution (confirmed 12 platforms work)
Copied: cs/batlab/trunk/MAG (from rev 21292, cs/batlab/trunk/CitcomS)
Modified: cs/batlab/trunk/MAG/README
===================================================================
--- cs/batlab/trunk/CitcomS/README 2013-01-25 07:26:09 UTC (rev 21292)
+++ cs/batlab/trunk/MAG/README 2013-01-28 01:49:53 UTC (rev 21301)
@@ -5,6 +5,9 @@
Description of Files
+build.sh
+ Shell script containing build commands for SVN repository code.
+
build_files.scp
Metronome input file describing build scripts/files needed for runs.
@@ -18,12 +21,6 @@
dist_files.url
Metronome input file describing location of distribution on CIG website.
-build_files/build_dist.sh
- Shell script containing build commands for distribution code.
-
-build_files/build_repo.sh
- Shell script containing build commands for SVN repository code.
-
repo_check.run-spec
Metronome input file describing SVN repository based run.
Copied: cs/batlab/trunk/MAG/build.sh (from rev 21292, cs/batlab/trunk/CitcomS/build_files/build_dist.sh)
===================================================================
--- cs/batlab/trunk/MAG/build.sh (rev 0)
+++ cs/batlab/trunk/MAG/build.sh 2013-01-28 01:49:53 UTC (rev 21301)
@@ -0,0 +1,22 @@
+#!/bin/bash
+#
+# $Id$
+
+# Builds multiple variants of MAG
+cd MAG*
+cd src
+
+GFORT_LOC=`which gfortran`
+ln -s $GFORT_LOC g77
+export PATH=$PATH:.
+
+for PARAM in 32s1 32s4 32s6 96s6
+do
+ ln -sf param$PARAM.f param.f
+ make
+ mv magx ../magx$PARAM
+ make clean
+done
+
+exit $?
+
Deleted: cs/batlab/trunk/MAG/build_files.scp
===================================================================
--- cs/batlab/trunk/CitcomS/build_files.scp 2013-01-25 07:26:09 UTC (rev 21292)
+++ cs/batlab/trunk/MAG/build_files.scp 2013-01-28 01:49:53 UTC (rev 21301)
@@ -1,6 +0,0 @@
-# $Id
-
-method = scp
-scp_file = ~/trunk/CitcomS/build_files/*
-recursive = true
-
Copied: cs/batlab/trunk/MAG/build_files.scp (from rev 21294, cs/batlab/trunk/CitcomS/build_files.scp)
===================================================================
--- cs/batlab/trunk/MAG/build_files.scp (rev 0)
+++ cs/batlab/trunk/MAG/build_files.scp 2013-01-28 01:49:53 UTC (rev 21301)
@@ -0,0 +1,5 @@
+# $Id$
+
+method = scp
+scp_file = ~/trunk/MAG/build.sh
+
Deleted: cs/batlab/trunk/MAG/dist_check.run-spec
===================================================================
--- cs/batlab/trunk/CitcomS/dist_check.run-spec 2013-01-25 07:26:09 UTC (rev 21292)
+++ cs/batlab/trunk/MAG/dist_check.run-spec 2013-01-28 01:49:53 UTC (rev 21301)
@@ -1,29 +0,0 @@
-# $Id
-
-project = CIG
-component = CitcomS
-description = Build test of CitcomS distribution
-run_type = build
-inputs = dist_files.scp, build_files.scp, openmpi-1.6.3.scp
-x86_64_Fedora16_remote_pre = build_openmpi.sh
-x86_64_Fedora17_remote_pre = build_openmpi.sh
-x86_64_MacOSX7_remote_pre = build_openmpi.sh
-x86_64_RedHat5_remote_pre = build_openmpi.sh
-x86_64_RedHat6_remote_pre = build_openmpi.sh
-x86_64_SL6_remote_pre = build_openmpi.sh
-x86_64_Solaris11_remote_pre = build_openmpi.sh
-x86_64_macos_10.7_remote_pre = build_openmpi.sh
-x86_RedHat5_remote_pre = build_openmpi.sh
-x86_RedHat6_remote_pre = build_openmpi.sh
-x86_SL5_remote_pre = build_openmpi.sh
-
-remote_task = build_dist.sh
-
-# These platforms mostly work (still some minor tweaks needed)
-platforms = x86_64_Debian5, x86_64_Debian6, x86_64_Ubuntu10, x86_64_Ubuntu12, x86_Debian6, x86_64_Fedora16, x86_64_Fedora17, x86_64_MacOSX7, x86_64_RedHat5, x86_64_RedHat6, x86_64_SL6, x86_64_Solaris11, x86_64_macos_10.7, x86_RedHat5, x86_RedHat6, x86_SL5
-
-# These platforms fail
-#platforms = x86_64_Windows7, x86_WindowsXP
-
-notify = emheien at geodynamics.org
-
Copied: cs/batlab/trunk/MAG/dist_check.run-spec (from rev 21294, cs/batlab/trunk/CitcomS/dist_check.run-spec)
===================================================================
--- cs/batlab/trunk/MAG/dist_check.run-spec (rev 0)
+++ cs/batlab/trunk/MAG/dist_check.run-spec 2013-01-28 01:49:53 UTC (rev 21301)
@@ -0,0 +1,21 @@
+# $Id$
+
+project = CIG
+component = MAG
+description = Build test of MAG distribution
+run_type = build
+inputs = dist_files.scp, build_files.scp, ../support/numdiff-5.6.1.scp, ../support/lib_scripts.scp
+
+remote_pre = build_support.sh
+remote_pre_args = build_numdiff-5.6.1.sh
+
+remote_task = build.sh
+
+# These platforms mostly work (still some minor tweaks needed)
+platforms = x86_64_Debian5, x86_64_Debian6, x86_64_Ubuntu10, x86_64_Ubuntu12, x86_Debian6, x86_64_Fedora16, x86_64_Fedora17, x86_64_MacOSX7, x86_64_RedHat5, x86_64_RedHat6, x86_64_SL6, x86_64_Solaris11, x86_64_macos_10.7, x86_RedHat5, x86_RedHat6, x86_SL5
+
+# These platforms fail
+#platforms = x86_64_Windows7, x86_WindowsXP
+
+notify = emheien at geodynamics.org
+
Deleted: cs/batlab/trunk/MAG/dist_files.scp
===================================================================
--- cs/batlab/trunk/CitcomS/dist_files.scp 2013-01-25 07:26:09 UTC (rev 21292)
+++ cs/batlab/trunk/MAG/dist_files.scp 2013-01-28 01:49:53 UTC (rev 21301)
@@ -1,6 +0,0 @@
-# $Id
-
-method = scp
-scp_file = ~/trunk/distributions/CitcomS-3.2.0.tar.gz
-untar = true
-
Copied: cs/batlab/trunk/MAG/dist_files.scp (from rev 21294, cs/batlab/trunk/CitcomS/dist_files.scp)
===================================================================
--- cs/batlab/trunk/MAG/dist_files.scp (rev 0)
+++ cs/batlab/trunk/MAG/dist_files.scp 2013-01-28 01:49:53 UTC (rev 21301)
@@ -0,0 +1,6 @@
+# $Id$
+
+method = scp
+scp_file = ~/trunk/distributions/MAG-1.0.2.tar.gz
+untar = true
+
Deleted: cs/batlab/trunk/MAG/dist_files.url
===================================================================
--- cs/batlab/trunk/CitcomS/dist_files.url 2013-01-25 07:26:09 UTC (rev 21292)
+++ cs/batlab/trunk/MAG/dist_files.url 2013-01-28 01:49:53 UTC (rev 21301)
@@ -1,6 +0,0 @@
-# $Id
-
-method = url
-url = http://www.geodynamics.org/cig/software/citcoms/CitcomS-3.2.0.tar.gz
-untar = true
-
Copied: cs/batlab/trunk/MAG/dist_files.url (from rev 21294, cs/batlab/trunk/CitcomS/dist_files.url)
===================================================================
--- cs/batlab/trunk/MAG/dist_files.url (rev 0)
+++ cs/batlab/trunk/MAG/dist_files.url 2013-01-28 01:49:53 UTC (rev 21301)
@@ -0,0 +1,6 @@
+# $Id$
+
+method = url
+url = http://www.geodynamics.org/cig/software/mag/MAG-1.0.2.tar.gz
+untar = true
+
Deleted: cs/batlab/trunk/MAG/openmpi-1.6.3.scp
===================================================================
--- cs/batlab/trunk/CitcomS/openmpi-1.6.3.scp 2013-01-25 07:26:09 UTC (rev 21292)
+++ cs/batlab/trunk/MAG/openmpi-1.6.3.scp 2013-01-28 01:49:53 UTC (rev 21301)
@@ -1,6 +0,0 @@
-# $Id
-
-method = scp
-scp_file = ~/trunk/support/openmpi-1.6.3.tar.bz2
-untar = true
-
Deleted: cs/batlab/trunk/MAG/repo_check.run-spec
===================================================================
--- cs/batlab/trunk/CitcomS/repo_check.run-spec 2013-01-25 07:26:09 UTC (rev 21292)
+++ cs/batlab/trunk/MAG/repo_check.run-spec 2013-01-28 01:49:53 UTC (rev 21301)
@@ -1,30 +0,0 @@
-# $Id
-
-project = CIG
-component = CitcomS
-description = Build test of CitcomS SVN
-run_type = build
-inputs = repo_checkout.svn, build_files.scp, openmpi-1.6.3.scp
-
-x86_64_Fedora16_remote_pre = build_openmpi.sh
-x86_64_Fedora17_remote_pre = build_openmpi.sh
-x86_64_MacOSX7_remote_pre = build_openmpi.sh
-x86_64_RedHat5_remote_pre = build_openmpi.sh
-x86_64_RedHat6_remote_pre = build_openmpi.sh
-x86_64_SL6_remote_pre = build_openmpi.sh
-x86_64_Solaris11_remote_pre = build_openmpi.sh
-x86_64_macos_10.7_remote_pre = build_openmpi.sh
-x86_RedHat5_remote_pre = build_openmpi.sh
-x86_RedHat6_remote_pre = build_openmpi.sh
-x86_SL5_remote_pre = build_openmpi.sh
-
-remote_task = build_repo.sh
-
-# These platforms mostly work (still some minor tweaks needed)
-platforms = x86_64_Debian5, x86_64_Debian6, x86_64_Ubuntu10, x86_64_Ubuntu12, x86_Debian6, x86_64_Fedora16, x86_64_Fedora17, x86_64_MacOSX7, x86_64_RedHat5, x86_64_RedHat6, x86_64_SL6, x86_64_Solaris11, x86_64_macos_10.7, x86_RedHat5, x86_RedHat6, x86_SL5
-
-# These platforms fail
-#platforms = x86_64_Windows7, x86_WindowsXP
-
-notify = emheien at geodynamics.org
-
Copied: cs/batlab/trunk/MAG/repo_check.run-spec (from rev 21292, cs/batlab/trunk/CitcomS/dist_check.run-spec)
===================================================================
--- cs/batlab/trunk/MAG/repo_check.run-spec (rev 0)
+++ cs/batlab/trunk/MAG/repo_check.run-spec 2013-01-28 01:49:53 UTC (rev 21301)
@@ -0,0 +1,21 @@
+# $Id$
+
+project = CIG
+component = MAG
+description = Build test of MAG SVN repository
+run_type = build
+inputs = repo_checkout.svn, build_files.scp, ../support/numdiff-5.6.1.scp, ../support/lib_scripts.scp
+
+remote_pre = build_support.sh
+remote_pre_args = build_numdiff-5.6.1.sh
+
+remote_task = build.sh
+
+# These platforms mostly work (still some minor tweaks needed)
+platforms = x86_64_Debian5, x86_64_Debian6, x86_64_Ubuntu10, x86_64_Ubuntu12, x86_Debian6, x86_64_Fedora16, x86_64_Fedora17, x86_64_MacOSX7, x86_64_RedHat5, x86_64_RedHat6, x86_64_SL6, x86_64_Solaris11, x86_64_macos_10.7, x86_RedHat5, x86_RedHat6, x86_SL5
+
+# These platforms fail
+#platforms = x86_64_Windows7, x86_WindowsXP
+
+notify = emheien at geodynamics.org
+
Deleted: cs/batlab/trunk/MAG/repo_checkout.svn
===================================================================
--- cs/batlab/trunk/CitcomS/repo_checkout.svn 2013-01-25 07:26:09 UTC (rev 21292)
+++ cs/batlab/trunk/MAG/repo_checkout.svn 2013-01-28 01:49:53 UTC (rev 21301)
@@ -1,5 +0,0 @@
-# $Id
-
-method = svn
-url = http://geodynamics.org/svn/cig/mc/3D/CitcomS/trunk CitcomS
-
Copied: cs/batlab/trunk/MAG/repo_checkout.svn (from rev 21300, cs/batlab/trunk/CitcomS/repo_checkout.svn)
===================================================================
--- cs/batlab/trunk/MAG/repo_checkout.svn (rev 0)
+++ cs/batlab/trunk/MAG/repo_checkout.svn 2013-01-28 01:49:53 UTC (rev 21301)
@@ -0,0 +1,5 @@
+# $Id$
+
+method = svn
+url = http://geodynamics.org/svn/cig/geodyn/3D/MAG/trunk MAG
+
Modified: cs/batlab/trunk/README
===================================================================
--- cs/batlab/trunk/README 2013-01-26 09:01:04 UTC (rev 21300)
+++ cs/batlab/trunk/README 2013-01-28 01:49:53 UTC (rev 21301)
@@ -67,3 +67,22 @@
RELAX x86_64_macos_10.7 1/24/2013 FN FN
RELAX x86_RedHat5 1/24/2013 FN FN
+MAG x86_64_Debian5 1/27/2013 BN BN
+MAG x86_64_Debian6 1/27/2013 BN BN
+MAG x86_64_Fedora16 1/27/2013 BN BN
+MAG x86_64_Fedora17 1/27/2013 BN BN
+MAG x86_64_MacOSX7 1/27/2013 FN FN
+MAG x86_64_RedHat5 1/27/2013 N N
+MAG x86_64_RedHat6 1/27/2013 BN BN
+MAG x86_64_SL6 1/27/2013 BN BN
+MAG x86_64_Solaris11 1/27/2013 FN FN
+MAG x86_64_Ubuntu10 1/27/2013 BN BN
+MAG x86_64_Ubuntu12 1/27/2013 BN BN
+MAG x86_64_macos_10.7 1/27/2013 FN FN
+MAG x86_Debian6 1/27/2013 BN BN
+MAG x86_RedHat5 1/27/2013 BN BN
+MAG x86_RedHat6 1/27/2013 BN BN
+MAG x86_SL5 1/27/2013 BN BN
+MAG x86_64_Windows7 1/27/2013 FN FN
+MAG x86_WindowsXP 1/27/2013 FN FN
+
Copied: cs/batlab/trunk/support/build_numdiff-5.6.1.sh (from rev 21299, cs/batlab/trunk/support/build_openmpi.sh)
===================================================================
--- cs/batlab/trunk/support/build_numdiff-5.6.1.sh (rev 0)
+++ cs/batlab/trunk/support/build_numdiff-5.6.1.sh 2013-01-28 01:49:53 UTC (rev 21301)
@@ -0,0 +1,9 @@
+#!/bin/bash
+#
+# $Id$
+
+# Builds and installs OpenMPI to support platforms that don't already have it
+cd numdiff-5.6.1 && ./configure --prefix=$HOME/local/ && make && make install
+
+exit $?
+
More information about the CIG-COMMITS
mailing list