[cig-commits] r20042 - in cs/batlab/trunk/relax: . scripts scripts/svn scripts/wget

Fri May 4 12:34:13 PDT 2012

Author: alex
Date: 2012-05-04 12:34:13 -0700 (Fri, 04 May 2012)
New Revision: 20042

Added:
   cs/batlab/trunk/relax/scripts/
   cs/batlab/trunk/relax/scripts/README
   cs/batlab/trunk/relax/scripts/svn/
   cs/batlab/trunk/relax/scripts/svn/build.sh
   cs/batlab/trunk/relax/scripts/svn/generate_test_list.scp
   cs/batlab/trunk/relax/scripts/svn/generate_test_list.sh
   cs/batlab/trunk/relax/scripts/svn/run
   cs/batlab/trunk/relax/scripts/svn/run_test.scp
   cs/batlab/trunk/relax/scripts/svn/run_test.sh
   cs/batlab/trunk/relax/scripts/svn/simple-make.run-spec
   cs/batlab/trunk/relax/scripts/svn/simple-make.run-spec.notest
   cs/batlab/trunk/relax/scripts/svn/simple-make.run-spec.test
   cs/batlab/trunk/relax/scripts/svn/simple-make.scp
   cs/batlab/trunk/relax/scripts/svn/web-make.url
   cs/batlab/trunk/relax/scripts/wget/
   cs/batlab/trunk/relax/scripts/wget/build.sh
   cs/batlab/trunk/relax/scripts/wget/generate_test_list.scp
   cs/batlab/trunk/relax/scripts/wget/generate_test_list.sh
   cs/batlab/trunk/relax/scripts/wget/run
   cs/batlab/trunk/relax/scripts/wget/run_test.scp
   cs/batlab/trunk/relax/scripts/wget/run_test.sh
   cs/batlab/trunk/relax/scripts/wget/simple-make.run-spec
   cs/batlab/trunk/relax/scripts/wget/simple-make.run-spec.notest
   cs/batlab/trunk/relax/scripts/wget/simple-make.run-spec.test
   cs/batlab/trunk/relax/scripts/wget/simple-make.scp
   cs/batlab/trunk/relax/scripts/wget/web-make.url
   cs/batlab/trunk/relax/scripts/wgetInstallScript
Removed:
   cs/batlab/trunk/relax/relax1/
Log:
citcom should be finished and cleaned up.  starting relax, scripts in relax/scripts/wget/



Added: cs/batlab/trunk/relax/scripts/README
===================================================================

--- cs/batlab/trunk/relax/scripts/README	                        (rev 0)
+++ cs/batlab/trunk/relax/scripts/README	2012-05-04 19:34:13 UTC (rev 20042)
@@ -0,0 +1,2 @@
+svn uses mercury (hg) and batlab doesn't seem to support it.  
+Thus, we are using wget scripts to download relax onto the test nodes.
\ No newline at end of file

Added: cs/batlab/trunk/relax/scripts/svn/build.sh
===================================================================
--- cs/batlab/trunk/relax/scripts/svn/build.sh	                        (rev 0)
+++ cs/batlab/trunk/relax/scripts/svn/build.sh	2012-05-04 19:34:13 UTC (rev 20042)
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# We don't proceed unless the preceding step succeeded, and we return the success or failure of the sequence.
+#
+#cd CitcomS-*  ## this is for wget,
+# cd CitcomS and autoreconf lines are for svn only
+cd CitcomS			
+autoreconf -i \
+    && ./configure --without-pyre \
+    && make \
+    && cd .. \
+    && tar -c -z -f ./results.tar.gz ./install
+
+exit $?
\ No newline at end of file


Property changes on: cs/batlab/trunk/relax/scripts/svn/build.sh
___________________________________________________________________
Name: svn:executable
   + *

Added: cs/batlab/trunk/relax/scripts/svn/generate_test_list.scp
===================================================================
--- cs/batlab/trunk/relax/scripts/svn/generate_test_list.scp	                        (rev 0)
+++ cs/batlab/trunk/relax/scripts/svn/generate_test_list.scp	2012-05-04 19:34:13 UTC (rev 20042)
@@ -0,0 +1,2 @@
+method = scp
+scp_file = ~/cig/simple-make/generate_test_list.
\ No newline at end of file

Added: cs/batlab/trunk/relax/scripts/svn/generate_test_list.sh
===================================================================
--- cs/batlab/trunk/relax/scripts/svn/generate_test_list.sh	                        (rev 0)
+++ cs/batlab/trunk/relax/scripts/svn/generate_test_list.sh	2012-05-04 19:34:13 UTC (rev 20042)
@@ -0,0 +1,12 @@
+#!/bin/bash
+# cd CitcomS-* ## this is for wget
+cd CitcomS			# this is for svn
+cd examples/Regional/
+# make the input.sample file work
+sed -i 's|datadir="/scratch"|datadir="./scratch"|g' input.sample 
+sed -i 's|nprocx=2|nprocx=1|g' input.sample
+sed -i 's|nprocy=2|nprocy=1|g' input.sample
+# now test
+../../bin/CitcomSRegional | \
+    tail -n +3 | \
+    awk '{print $3}' > ../tasklist.nmi
\ No newline at end of file


Property changes on: cs/batlab/trunk/relax/scripts/svn/generate_test_list.sh
___________________________________________________________________
Name: svn:executable
   + *

Added: cs/batlab/trunk/relax/scripts/svn/run
===================================================================
--- cs/batlab/trunk/relax/scripts/svn/run	                        (rev 0)
+++ cs/batlab/trunk/relax/scripts/svn/run	2012-05-04 19:34:13 UTC (rev 20042)
@@ -0,0 +1,2 @@
+#!/bin/sh
+nmi_submit ~/scripts/simple-make.run-spec
\ No newline at end of file


Property changes on: cs/batlab/trunk/relax/scripts/svn/run
___________________________________________________________________
Name: svn:executable
   + *

Added: cs/batlab/trunk/relax/scripts/svn/run_test.scp
===================================================================
--- cs/batlab/trunk/relax/scripts/svn/run_test.scp	                        (rev 0)
+++ cs/batlab/trunk/relax/scripts/svn/run_test.scp	2012-05-04 19:34:13 UTC (rev 20042)
@@ -0,0 +1,2 @@
+method = scp
+scp_file = ~/cig/scripts/run_test.sh
\ No newline at end of file

Added: cs/batlab/trunk/relax/scripts/svn/run_test.sh
===================================================================
--- cs/batlab/trunk/relax/scripts/svn/run_test.sh	                        (rev 0)
+++ cs/batlab/trunk/relax/scripts/svn/run_test.sh	2012-05-04 19:34:13 UTC (rev 20042)
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+#cd CitcomS-*  ## this is for wget
+cd CitcomS 			# this is svn
+cd examples/Regional/
+../../bin/CitcomSRegional input.sample
\ No newline at end of file


Property changes on: cs/batlab/trunk/relax/scripts/svn/run_test.sh
___________________________________________________________________
Name: svn:executable
   + *

Added: cs/batlab/trunk/relax/scripts/svn/simple-make.run-spec
===================================================================
--- cs/batlab/trunk/relax/scripts/svn/simple-make.run-spec	                        (rev 0)
+++ cs/batlab/trunk/relax/scripts/svn/simple-make.run-spec	2012-05-04 19:34:13 UTC (rev 20042)
@@ -0,0 +1,11 @@
+run_type = build
+inputs = simple-make.scp, web-make.url
+remote_task = build.sh
+platforms = x86_64_ubuntu_10.04
+
+remote_pre_declare = build.sh
+remote_declare = generate_test_list.sh
+
+
+cron_hour = 13
+cron_minute=11
\ No newline at end of file

Added: cs/batlab/trunk/relax/scripts/svn/simple-make.run-spec.notest
===================================================================
--- cs/batlab/trunk/relax/scripts/svn/simple-make.run-spec.notest	                        (rev 0)
+++ cs/batlab/trunk/relax/scripts/svn/simple-make.run-spec.notest	2012-05-04 19:34:13 UTC (rev 20042)
@@ -0,0 +1,13 @@
+run_type = build
+inputs = simple-make.scp, web-make.url
+remote_task = build.sh
+platforms = x86_64_ubuntu_10.04
+
+remote_pre_declare = build.sh
+remote_declare = generate_test_list.sh
+
+
+cron_hour = 13
+cron_minute=11
+
+notify = alextakakuwa at gmail.com
\ No newline at end of file

Added: cs/batlab/trunk/relax/scripts/svn/simple-make.run-spec.test
===================================================================
--- cs/batlab/trunk/relax/scripts/svn/simple-make.run-spec.test	                        (rev 0)
+++ cs/batlab/trunk/relax/scripts/svn/simple-make.run-spec.test	2012-05-04 19:34:13 UTC (rev 20042)
@@ -0,0 +1,13 @@
+run_type = build
+inputs = simple-make.scp, web-make.url, run_test.scp, generate_test_list.sh
+remote_task = build.sh
+platforms = x86_64_ubuntu_10.04
+
+remote_pre_declare = build.sh
+remote_declare = generate_test_list.sh
+remote_task = run_test.sh
+
+cron_hour = 13
+cron_minute=11
+
+notify = alextakakuwa at gmail.com
\ No newline at end of file

Added: cs/batlab/trunk/relax/scripts/svn/simple-make.scp
===================================================================
--- cs/batlab/trunk/relax/scripts/svn/simple-make.scp	                        (rev 0)
+++ cs/batlab/trunk/relax/scripts/svn/simple-make.scp	2012-05-04 19:34:13 UTC (rev 20042)
@@ -0,0 +1,3 @@
+method = scp
+scp_file = ~/scripts/build.sh
+recursive = true
\ No newline at end of file

Added: cs/batlab/trunk/relax/scripts/svn/web-make.url
===================================================================
--- cs/batlab/trunk/relax/scripts/svn/web-make.url	                        (rev 0)
+++ cs/batlab/trunk/relax/scripts/svn/web-make.url	2012-05-04 19:34:13 UTC (rev 20042)
@@ -0,0 +1,6 @@
+method = svn
+url = http://geodynamics.org/svn/cig/mc/3D/CitcomS/trunk CitcomS
+
+# method = url
+# url = www.geodynamics.org/cig/software/citcoms/CitcomS-3.2.0.tar.gz
+# untar = true
\ No newline at end of file

Added: cs/batlab/trunk/relax/scripts/wget/build.sh
===================================================================
--- cs/batlab/trunk/relax/scripts/wget/build.sh	                        (rev 0)
+++ cs/batlab/trunk/relax/scripts/wget/build.sh	2012-05-04 19:34:13 UTC (rev 20042)
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# We don't proceed unless the preceding step succeeded, and we return the success or failure of the sequence.
+#should already be untarred from the wget script.
+cd relax-*  
+./waf configure \
+    && ./waf \ 
+    && make \
+    && cd .. \
+    && tar -c -z -f ./results.tar.gz ./install
+
+exit $?
\ No newline at end of file


Property changes on: cs/batlab/trunk/relax/scripts/wget/build.sh
___________________________________________________________________
Name: svn:executable
   + *

Added: cs/batlab/trunk/relax/scripts/wget/generate_test_list.scp
===================================================================
--- cs/batlab/trunk/relax/scripts/wget/generate_test_list.scp	                        (rev 0)
+++ cs/batlab/trunk/relax/scripts/wget/generate_test_list.scp	2012-05-04 19:34:13 UTC (rev 20042)
@@ -0,0 +1,2 @@
+method = scp
+scp_file = ~/scripts/generate_test_list.
\ No newline at end of file

Added: cs/batlab/trunk/relax/scripts/wget/generate_test_list.sh
===================================================================
--- cs/batlab/trunk/relax/scripts/wget/generate_test_list.sh	                        (rev 0)
+++ cs/batlab/trunk/relax/scripts/wget/generate_test_list.sh	2012-05-04 19:34:13 UTC (rev 20042)
@@ -0,0 +1,11 @@
+#!/bin/bash
+cd CitcomS-*
+cd examples/Regional/
+# make the input.sample file work
+sed -i 's|datadir="/scratch"|datadir="./scratch"|g' input.sample 
+sed -i 's|nprocx=2|nprocx=1|g' input.sample
+sed -i 's|nprocy=2|nprocy=1|g' input.sample
+# now test
+../../bin/CitcomSRegional | \
+    tail -n +3 | \
+    awk '{print $3}' > ../tasklist.nmi
\ No newline at end of file


Property changes on: cs/batlab/trunk/relax/scripts/wget/generate_test_list.sh
___________________________________________________________________
Name: svn:executable
   + *

Added: cs/batlab/trunk/relax/scripts/wget/run
===================================================================
--- cs/batlab/trunk/relax/scripts/wget/run	                        (rev 0)
+++ cs/batlab/trunk/relax/scripts/wget/run	2012-05-04 19:34:13 UTC (rev 20042)
@@ -0,0 +1,2 @@
+#!/bin/sh
+nmi_submit ~/scripts/simple-make.run-spec
\ No newline at end of file


Property changes on: cs/batlab/trunk/relax/scripts/wget/run
___________________________________________________________________
Name: svn:executable
   + *

Added: cs/batlab/trunk/relax/scripts/wget/run_test.scp
===================================================================
--- cs/batlab/trunk/relax/scripts/wget/run_test.scp	                        (rev 0)
+++ cs/batlab/trunk/relax/scripts/wget/run_test.scp	2012-05-04 19:34:13 UTC (rev 20042)
@@ -0,0 +1,2 @@
+method = scp
+scp_file = ~/scripts/run_test.sh
\ No newline at end of file

Added: cs/batlab/trunk/relax/scripts/wget/run_test.sh
===================================================================
--- cs/batlab/trunk/relax/scripts/wget/run_test.sh	                        (rev 0)
+++ cs/batlab/trunk/relax/scripts/wget/run_test.sh	2012-05-04 19:34:13 UTC (rev 20042)
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cd relax-* 
+cd examples/Regional/
+../../bin/CitcomSRegional input.sample
\ No newline at end of file


Property changes on: cs/batlab/trunk/relax/scripts/wget/run_test.sh
___________________________________________________________________
Name: svn:executable
   + *

Added: cs/batlab/trunk/relax/scripts/wget/simple-make.run-spec
===================================================================
--- cs/batlab/trunk/relax/scripts/wget/simple-make.run-spec	                        (rev 0)
+++ cs/batlab/trunk/relax/scripts/wget/simple-make.run-spec	2012-05-04 19:34:13 UTC (rev 20042)
@@ -0,0 +1,13 @@
+run_type = build
+inputs = simple-make.scp, web-make.url
+remote_task = build.sh
+platforms = x86_64_ubuntu_10.04
+
+remote_pre_declare = build.sh
+remote_declare = generate_test_list.sh
+
+
+cron_hour = 13
+cron_minute=11
+
+notify = alextakakuwa at gmail.com
\ No newline at end of file

Added: cs/batlab/trunk/relax/scripts/wget/simple-make.run-spec.notest
===================================================================
--- cs/batlab/trunk/relax/scripts/wget/simple-make.run-spec.notest	                        (rev 0)
+++ cs/batlab/trunk/relax/scripts/wget/simple-make.run-spec.notest	2012-05-04 19:34:13 UTC (rev 20042)
@@ -0,0 +1,13 @@
+run_type = build
+inputs = simple-make.scp, web-make.url
+remote_task = build.sh
+platforms = x86_64_ubuntu_10.04
+
+remote_pre_declare = build.sh
+remote_declare = generate_test_list.sh
+
+
+cron_hour = 13
+cron_minute=11
+
+notify = alextakakuwa at gmail.com
\ No newline at end of file

Added: cs/batlab/trunk/relax/scripts/wget/simple-make.run-spec.test
===================================================================
--- cs/batlab/trunk/relax/scripts/wget/simple-make.run-spec.test	                        (rev 0)
+++ cs/batlab/trunk/relax/scripts/wget/simple-make.run-spec.test	2012-05-04 19:34:13 UTC (rev 20042)
@@ -0,0 +1,13 @@
+run_type = build
+inputs = simple-make.scp, web-make.url, run_test.scp, generate_test_list.sh
+remote_task = build.sh
+platforms = x86_64_ubuntu_10.04
+
+remote_pre_declare = build.sh
+remote_declare = generate_test_list.sh
+remote_task = run_test.sh
+
+cron_hour = 13
+cron_minute=11
+
+notify = alextakakuwa at gmail.com
\ No newline at end of file

Added: cs/batlab/trunk/relax/scripts/wget/simple-make.scp
===================================================================
--- cs/batlab/trunk/relax/scripts/wget/simple-make.scp	                        (rev 0)
+++ cs/batlab/trunk/relax/scripts/wget/simple-make.scp	2012-05-04 19:34:13 UTC (rev 20042)
@@ -0,0 +1,3 @@
+method = scp
+scp_file = ~/scripts/build.sh
+recursive = true
\ No newline at end of file

Added: cs/batlab/trunk/relax/scripts/wget/web-make.url
===================================================================
--- cs/batlab/trunk/relax/scripts/wget/web-make.url	                        (rev 0)
+++ cs/batlab/trunk/relax/scripts/wget/web-make.url	2012-05-04 19:34:13 UTC (rev 20042)
@@ -0,0 +1,3 @@
+method = url
+url = http://www.geodynamics.org/cig/software/relax/Relax-1.0.0.tgz
+untar = true
\ No newline at end of file

Added: cs/batlab/trunk/relax/scripts/wgetInstallScript
===================================================================
--- cs/batlab/trunk/relax/scripts/wgetInstallScript	                        (rev 0)
+++ cs/batlab/trunk/relax/scripts/wgetInstallScript	2012-05-04 19:34:13 UTC (rev 20042)
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# set up directories
+
+currentVersion=CitcomS-3.2.0
+cigDirectory=/home/at/cig
+wgetLogFile=/home/at/cig/wgetLogFile
+configureLogFile=/home/at/cig/$currentVersion/configureLogFile
+makeLogFile=/home/at/cig/$currentVersion/makeLogFile
+testLogFile=$cigDirectory/$currentVersion/examples/Cookbook1/testLogFile
+webAddress=www.geodynamics.org/cig/software/citcoms
+citcomS=$currentVersion.tar.gz
+cookbooks=$cigDirectory/examples/
+
+# clean up to prepare for install
+
+cd $cigDirectory/
+rm -r CitcomS-*
+mpd&				# run mpd in background ##todo shut off mpd after this is finished, and ignore error here if there's a prolllem
+
+set -e				# kills program if there's an error
+
+# download, unpack, remove zip
+wget -r --output-file=$wgetLogFile --output-document=$cigDirectory/$citcomS $webAddress/$citcomS
+tar -xzvf $cigDirectory/$citcomS
+rm $cigDirectory/$citcomS
+mv $wgetLogFile $cigDirectory/$currentVersion/
+
+cd $currentVersion/
+
+# configure and make
+./configure --without-pyre >> $configureLogFile
+make >> $makeLogFile
+
+# test Regional input.sample
+cd $cigDirectory/$currentVersion/examples/Regional/
+# update the input.sample file to work
+sed -i 's|datadir="/scratch"|datadir="./scratch"|g' input.sample 
+sed -i 's|nprocx=2|nprocx=1|g' input.sample
+sed -i 's|nprocy=2|nprocy=1|g' input.sample
+$cigDirectory/$currentVersion/bin/CitcomSRegional input.sample >> testLogFile
\ No newline at end of file


Property changes on: cs/batlab/trunk/relax/scripts/wgetInstallScript
___________________________________________________________________
Name: svn:executable
   + *

