summaryrefslogtreecommitdiff
path: root/environment
diff options
context:
space:
mode:
authorChris Dyer <redpony@gmail.com>2014-09-07 13:57:52 -0400
committerChris Dyer <redpony@gmail.com>2014-09-07 13:57:52 -0400
commitffd0096320770325a8925dd17453d1fdd9375bb9 (patch)
tree200b1a6d1b14853d8ed6acb649ab9add881cc99b /environment
parent49c105dfc1fc3a0334d03de4d361abf23a6f1898 (diff)
parente6f2dd6892e277d0a868c22f726c4a83c86da016 (diff)
Merge pull request #50 from pks/master
alignment features, PassThroughN features, dtrain update, mira qsub, and pro fix
Diffstat (limited to 'environment')
-rw-r--r--environment/LocalConfig.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/environment/LocalConfig.pm b/environment/LocalConfig.pm
index 4fa0ab74..29a1cbea 100644
--- a/environment/LocalConfig.pm
+++ b/environment/LocalConfig.pm
@@ -69,10 +69,10 @@ my $CCONFIG = {
# 'DefaultJobs' => 12,
# },
'cluster.cl.uni-heidelberg.de' => {
- 'HOST_REGEXP' => qr/node25/,
+ 'HOST_REGEXP' => qr/(node\d\d\.cluster\.lan|cluster\.cl\.uni-heidelberg\.de)/i,
'JobControl' => 'qsub',
- 'QSubMemFlag' => '-l h_vmem=',
- 'DefaultJobs' => 13,
+ 'QSubMemFlag' => '-l mem_free=',
+ 'DefaultJobs' => 14,
},
'LOCAL' => { # LOCAL must be last in the list!!!
'HOST_REGEXP' => qr//,