diff options
| author | Jonathan Clark <jon.h.clark@gmail.com> | 2011-03-24 09:48:04 -0400 |
|---|---|---|
| committer | Jonathan Clark <jon.h.clark@gmail.com> | 2011-03-24 09:48:04 -0400 |
| commit | ba4f147f84aa0d4623da640a2d0de7e6242a53af (patch) | |
| tree | ded3a9ed85ef128a5cf239126da28ee3b1a5a3fc /environment | |
| parent | 70d909f695fdb8207ce251bae9e860c3787d7711 (diff) | |
| parent | cb8e10b896d4d19a3d7c9b997a74f9bd39a5c714 (diff) | |
Undo some silly local changes so we can pull
Diffstat (limited to 'environment')
| -rw-r--r-- | environment/LocalConfig.pm | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/environment/LocalConfig.pm b/environment/LocalConfig.pm index f365319c..7b3d950c 100644 --- a/environment/LocalConfig.pm +++ b/environment/LocalConfig.pm @@ -12,6 +12,10 @@ my $host = domainname; # keys are: HOST_REGEXP, MERTMem, QSubQueue, QSubMemFlag, QSubExtraFlags my $CCONFIG = { + 'StarCluster' => { + 'HOST_REGEXP' => qr/compute-\d+\.internal$/, + 'QSubMemFlag' => '-l mem', + }, 'LTICluster' => { 'HOST_REGEXP' => qr/^cluster\d+\.lti\.cs\.cmu\.edu$/, 'QSubMemFlag' => '-l h_vmem=', @@ -36,9 +40,13 @@ my $CCONFIG = { 'HOST_REGEXP' => qr/^(tg-login1.blacklight.psc.teragrid.org|blacklight.psc.edu|bl1.psc.teragrid.org|bl0.psc.teragrid.org)$/, 'QSubMemFlag' => '-l pmem=', }, + 'Barrow/Chicago' => { + 'HOST_REGEXP' => qr/^(barrow|chicago).lti.cs.cmu.edu$/, + 'QSubMemFlag' => '-l pmem=', + }, 'LOCAL' => { - 'HOST_REGEXP' => qr/local\.net$/, - 'QSubMemFlag' => '', + 'HOST_REGEXP' => qr/local\./, + 'QSubMemFlag' => ' ', }, }; @@ -63,6 +71,7 @@ sub environment_name { sub qsub_args { my $mem = shift @_; die "qsub_args requires a memory amount as a parameter, e.g. 4G" unless $mem; + return 'qsub -V -cwd' if environment_name() eq 'StarCluster'; my $mf = $CONFIG{'QSubMemFlag'} or die "QSubMemFlag not set for $senvironment_name"; my $cmd = "qsub -S /bin/bash ${mf}${mem}"; if ($CONFIG{'QSubQueue'}) { $cmd .= ' ' . $CONFIG{'QSubQueue'}; } |