[svn:einsteintoolkit] tools/ (Rev. 31) - Commits

30 Jan 2014

User: knarf
Date: 2014/01/30 02:41 PM
Added:
 /trunk/VirtualBox/
  install_ET_2013_11
Removed:
 /trunk/VirtualBox/
  create_ET_i386, et.cfg, install_ET_2011_10
Modified:
 /trunk/VirtualBox/
  create_ET, preseed.cfg
Log:
 update VM scripts for ET_2013_11 release
Directory Changes:
Directory: /svn:executable/
===========================
+ *
File Changes:
Directory: /trunk/VirtualBox/
=============================
File [modified]: create_ET
Delta lines: +2 -2
===================================================================

--- trunk/VirtualBox/create_ET	2013-05-06 17:10:10 UTC (rev 30)
+++ trunk/VirtualBox/create_ET	2014-01-30 20:41:34 UTC (rev 31)
@@ -9,8 +9,8 @@
 CD_DST=debian_$RELEASE
 rm -rf $CD_DST
 mkdir $CD_DST
-wget -N http://cdimage.debian.org/debian-cd/7.0.0/amd64/iso-cd/debian-7.0.0-amd64-ne...
-bsdtar -C $CD_DST -xf debian-7.0.0-amd64-netinst.iso
+wget -N http://cdimage.debian.org/debian-cd/7.3.0/amd64/iso-cd/debian-7.3.0-amd64-ne...
+bsdtar -C $CD_DST -xf debian-7.3.0-amd64-netinst.iso
 chmod -R +w $CD_DST
 cd $CD_DST
 perl -pi -e 's/initrd.gz/initrd.gz auto-install/enable=true preseed/file=/cdrom/preseed.cfg/'  isolinux/txt.cfg
File [removed]: create_ET_i386
Delta lines: +0 -38
===================================================================
--- trunk/VirtualBox/create_ET_i386	2013-05-06 17:10:10 UTC (rev 30)
+++ trunk/VirtualBox/create_ET_i386	2014-01-30 20:41:34 UTC (rev 31)
@@ -1,38 +0,0 @@
-#!/bin/bash
-set -e
-RELEASE=$1
-if [ ! -f install_$RELEASE ] ; then
-  echo "You need to specify a release and the file install_$RELEASE needs to be present.";
-  exit 1
-fi
-
-CD_DST=debian_$RELEASE
-rm -rf $CD_DST
-mkdir $CD_DST
-wget -N http://cdimage.debian.org/debian-cd/7.0.0/i386/iso-cd/debian-7.0.0-i386-neti...
-bsdtar -C $CD_DST -xf debian-7.0.0-i386-netinst.iso
-chmod -R +w $CD_DST
-cd $CD_DST
-perl -pi -e 's/initrd.gz/initrd.gz auto-install/enable=true preseed/file=/cdrom/preseed.cfg/'  isolinux/txt.cfg
-perl -pi -e 's/timeout 0/timeout 1/' isolinux/isolinux.cfg
-cp ../preseed.cfg ../postseed .
-mkdir et_misc
-if [ "X$RELEASE" = "XET_2011_10" ]; then
-  cp ../et.cfg et_misc/
-fi
-cp ../install_$RELEASE et_misc/
-md5sum `find ! -name "md5sum.txt" ! -path "./isolinux/*" -follow -type f` > md5sum.txt
-cd ..
-genisoimage -o $RELEASE.iso -r -J -no-emul-boot -boot-load-size 4 -boot-info-table -b isolinux/isolinux.bin -c isolinux/boot.cat $CD_DST
-rm -rf $CD_DST
-
-VBoxManage createvm --name $RELEASE --register
-VBoxManage modifyvm      $RELEASE --ostype Debian --acpi on --memory 1024 --cpus 1 --biosbootmenu disabled 
-VBoxManage storagectl    $RELEASE --name "IDE Controller" --add ide --controller PIIX4
-VBoxManage storagectl    $RELEASE --name "SATA Controller" --add sata --controller IntelAhci
-VBoxManage storageattach $RELEASE --storagectl "IDE Controller" --port 0 --device 0 --type dvddrive --medium `pwd`/$RELEASE.iso
-VBoxManage createhd --filename $RELEASE.vdi --size 32768
-VBoxManage storageattach $RELEASE --storagectl "SATA Controller" --port 0 --device 0 --type hdd --medium $RELEASE.vdi
-VBoxManage modifyvm      $RELEASE --nic1 nat --nictype1 82540EM 
-VBoxManage modifyvm      $RELEASE --audio alsa
-VBoxManage startvm       $RELEASE
File [removed]: et.cfg
Delta lines: +0 -85
===================================================================
--- trunk/VirtualBox/et.cfg	2013-05-06 17:10:10 UTC (rev 30)
+++ trunk/VirtualBox/et.cfg	2014-01-30 20:41:34 UTC (rev 31)
@@ -1,85 +0,0 @@
-# NOTE: This file is only used for a ET_2011_10 checkout. After that simfactory
-# contains debian.cfg which can be used.
-#
-# Configuration for a Debian installation, assuming the following list of
-# packages is installed:
-#
-#   perl gfortran g++ libmpich2-dev
-#
-# In addition, installing the following list of packaed will prevent Cactus
-# from compiling it's own versions of these libraries:
-#
-#   libfftw3-dev libgsl0-dev libatlas-base-dev libjpeg-dev libssl-dev libhdf5-serial-dev
-#
-# Tools like GetComponents and Simfactory like to have the following list
-# installed too
-#
-#   python subversion git mercurial
-
-# Whenever this version string changes, the application is configured
-# and rebuilt from scratch
-VERSION = 2012-04-11
-
-CPP = cpp
-CC  = gcc
-CXX = g++
-
-FPP = cpp
-F77 = gfortran
-F90 = gfortran
-
-FPPFLAGS = -traditional
-
-CFLAGS   = -fopenmp -g -rdynamic -std=gnu99
-CXXFLAGS = -fopenmp -g -rdynamic
-F77FLAGS = -fopenmp -g
-F90FLAGS = -fopenmp -g
-
-DEBUG           = no
-CPP_DEBUG_FLAGS =
-FPP_DEBUG_FLAGS =
-C_DEBUG_FLAGS   =
-CXX_DEBUG_FLAGS =
-F77_DEBUG_FLAGS =
-F90_DEBUG_FLAGS =
-
-OPTIMISE           = yes
-CPP_OPTIMISE_FLAGS =
-FPP_OPTIMISE_FLAGS =
-C_OPTIMISE_FLAGS   = -O2
-CXX_OPTIMISE_FLAGS = -O2
-F77_OPTIMISE_FLAGS = -O2
-F90_OPTIMISE_FLAGS = -O2
-
-PROFILE           = no
-CPP_PROFILE_FLAGS =
-FPP_PROFILE_FLAGS =
-C_PROFILE_FLAGS   = -pg
-CXX_PROFILE_FLAGS = -pg
-F77_PROFILE_FLAGS = -pg
-F90_PROFILE_FLAGS = -pg
-
-WARN           = yes
-CPP_WARN_FLAGS = -Wall
-C_WARN_FLAGS   = -Wall
-CXX_WARN_FLAGS = -Wall
-F77_WARN_FLAGS = -Wall
-F90_WARN_FLAGS = -Wall
-
-PTHREADS = yes
-
-# necessary for the Maxwell release, should not be needed for the
-# 2012_05 release
-LAPACK_DIR = /usr/lib/atlas-base/atlas
-
-# necessary for the Maxwell release, should not be needed for the
-# 2012_05 release
-HDF5_DIR = /usr/.
-
-# OpenMPI would work as well, but in practice gives problems with
-# calling system() and fork(), e.g. via OpenCL SDKs.
-MPI             = CUSTOM
-MPI_LIB_DIRS    = /usr/lib
-MPI_INC_DIRS    = /usr/include/mpich2
-MPI_LIBS        = mpich
-
File [removed]: install_ET_2011_10
Delta lines: +0 -23
===================================================================
--- trunk/VirtualBox/install_ET_2011_10	2013-05-06 17:10:10 UTC (rev 30)
+++ trunk/VirtualBox/install_ET_2011_10	2014-01-30 20:41:34 UTC (rev 31)
@@ -1,23 +0,0 @@
-#!/bin/sh
-set -e
-
-perl -le 'printf "MPD_SECRETWORD=";print map { ("a".."z","A".."Z")[rand 52] } 1..40' > $HOME/.mpd.conf
-chmod 600 $HOME/.mpd.conf
-
-RELEASE=ET_2011_10
-wget --no-check-certificate https://github.com/gridaphobe/CRL/raw/$RELEASE/GetComponents
-chmod +x GetComponents
-./GetComponents -p -a http://svn.einsteintoolkit.org/manifest/branches/$RELEASE/einsteintoolkit.th
-cd Cactus
-./simfactory/bin/sim setup-silent
-echo "thornlist       = thornlists/einsteintoolkit.th" >> ./simfactory/etc/defs.local.ini
-cp ../misc/et.cfg ./simfactory/mdb/optionlists/
-perl -pi -e 's/^(optionlist\s*=\s*)generic.cfg/$1et.cfg/' ./simfactory/mdb/machines/et-vm-debian.*
-mkdir ~/simulations
-set +e
-./simfactory/bin/sim build
-set -e
-make sim
-./simfactory/bin/sim create-run tests_1 --testsuite --procs 1
-#./simfactory/bin/sim create-run tests_2 --testsuite --procs 2
-
File [added]: install_ET_2013_11
Delta lines: +20 -0
===================================================================
--- trunk/VirtualBox/install_ET_2013_11	                        (rev 0)
+++ trunk/VirtualBox/install_ET_2013_11	2014-01-30 20:41:34 UTC (rev 31)
@@ -0,0 +1,20 @@
+#!/bin/bash
+set -e
+
+perl -le 'printf "MPD_SECRETWORD=";print map { ("a".."z","A".."Z")[rand 52] } 1..40' > $HOME/.mpd.conf
+chmod 600 $HOME/.mpd.conf
+
+RELEASE=ET_2013_11
+wget --no-check-certificate https://github.com/gridaphobe/CRL/raw/$RELEASE/GetComponents
+chmod +x GetComponents
+./GetComponents -p -a http://svn.einsteintoolkit.org/manifest/branches/$RELEASE/einsteintoolkit.th
+cd Cactus
+./simfactory/bin/sim setup-silent --optionlist=debian.cfg --ppn=8
+mkdir -p ~/simulations
+set +e
+time ./simfactory/bin/sim build --thornlist=./thornlists/einsteintoolkit.th 2>&1 | tee ET_build.log
+set -e
+make sim
+./simfactory/bin/sim create-run tests_1 --testsuite --procs 1
+./simfactory/bin/sim create-run tests_2 --testsuite --procs 2
+
Property changes on: trunk/VirtualBox/install_ET_2013_11
___________________________________________________________________
File [modified]: preseed.cfg
Delta lines: +1 -1
===================================================================
--- trunk/VirtualBox/preseed.cfg	2013-05-06 17:10:10 UTC (rev 30)
+++ trunk/VirtualBox/preseed.cfg	2014-01-30 20:41:34 UTC (rev 31)
@@ -42,4 +42,4 @@
 #d-i debian-installer/exit/poweroff boolean true
 pularity-contest popularity-contest/participate boolean false
 d-i preseed/late_command string cp /cdrom/postseed /target/etc/init.d/; chroot /target update-rc.d postseed defaults; cp -r /cdrom/et_misc /target/home/et/misc
-d-i pkgsel/include string sudo perl python subversion git mercurial gfortran g++ libfftw3-dev libgsl0-dev libatlas-base-dev libjpeg-dev libssl-dev libhdf5-serial-dev libopenmpi-dev openmpi-bin make
+d-i pkgsel/include string sudo perl python subversion git gfortran g++ libfftw3-dev libgsl0-dev libatlas-base-dev libjpeg-dev libssl-dev libhdf5-serial-dev libopenmpi-dev openmpi-bin make

    