User: knarf Date: 2014/01/30 03:41 PM
Modified: /trunk/VirtualBox/ create_ET, install_ET_2013_11
Log: use number of available cores in VM, fix typo in simfactory call, don't create stuff for mvapich, as we don't currently use it, split VM properties into two possibilities
File Changes:
Directory: /trunk/VirtualBox/ =============================
File [modified]: create_ET Delta lines: +11 -1 =================================================================== --- trunk/VirtualBox/create_ET 2014-01-30 20:41:34 UTC (rev 31) +++ trunk/VirtualBox/create_ET 2014-01-30 21:41:51 UTC (rev 32) @@ -27,7 +27,17 @@ rm -rf $CD_DST
VBoxManage createvm --name $RELEASE --register -VBoxManage modifyvm $RELEASE --ostype Debian_64 --acpi on --memory 1024 --cpus 1 --biosbootmenu disabled + +# standard settings +VBoxManage modifyvm $RELEASE --ostype Debian_64 --acpi on --biosbootmenu disabled --rtcuseutc on + +### minimal system +#VBoxManage modifyvm $RELEASE --memory 1024 --cpus 1 + +### workstation class +VBoxManage modifyvm $RELEASE --memory 4096 --cpus 8 --ioapic on --vram 64 --usb on + +# rest of standard settings 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
File [modified]: install_ET_2013_11 Delta lines: +11 -4 =================================================================== --- trunk/VirtualBox/install_ET_2013_11 2014-01-30 20:41:34 UTC (rev 31) +++ trunk/VirtualBox/install_ET_2013_11 2014-01-30 21:41:51 UTC (rev 32) @@ -1,18 +1,25 @@ #!/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 +# necessary for mpich, but not openmpi +#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 + +# figure out how many cores we have +logic_cores=`cat /proc/cpuinfo | grep "model name" | wc -l` +fake_cores_per_core=`cat /proc/cpuinfo | grep "physical id" | sort | uniq | wc -l` +cores=$((($logic_cores-$fake_cores_per_core)/$fake_cores_per_core+1)) + +./simfactory/bin/sim setup-silent --optionlist=debian.cfg --ppn=$cores --submitscript=debian.sub --runscript=without.run mkdir -p ~/simulations set +e -time ./simfactory/bin/sim build --thornlist=./thornlists/einsteintoolkit.th 2>&1 | tee ET_build.log +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