Skip to content

Commit e440871

Browse files
committed
update passing tests
1 parent a8a0f90 commit e440871

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

nexus/lib/machines.py

+14-11
Original file line numberDiff line numberDiff line change
@@ -1937,7 +1937,7 @@ def validate_queue_config(self, job):
19371937
'queue_name': {
19381938
'min_nodes' : minimum number of nodes,
19391939
'max_nodes' : maximum number of nodes,
1940-
'max_time' : maximum walltime in hours,
1940+
'max_walltime' : maximum walltime in hours,
19411941
'cores_per_node': cores per node,
19421942
'ram_per_node' : RAM per node in GB,
19431943
'constraints' : {
@@ -1956,26 +1956,31 @@ def validate_queue_config(self, job):
19561956
if self.queue_configs is None:
19571957
return True
19581958
#end if
1959-
1960-
# Check if queue is specified
1959+
1960+
# Use only warnings here, as smaller computers may not have a queue
19611961
if job.queue is None:
1962-
self.warn('Queue must be specified. Default queue is {}. Available queues: {}'.format(self.queue_configs['default'], list(self.queue_configs.keys())))
1963-
if self.queue_configs['default'] is not None:
1962+
if 'default' in self.queue_configs:
19641963
job.queue = self.queue_configs['default']
1964+
self.warn('No default queue is specified. Using default queue {}'.format(job.queue))
19651965
else:
1966-
self.error('No default queue is specified. Please specify a queue in the job configuration.')
1967-
return False
1966+
# No queue or default queue is specified
1967+
self.warn('No queue or default queue is specified.')
1968+
return True
19681969
#end if
19691970
#end if
19701971

19711972
# Check if queue exists
19721973
if job.queue not in self.queue_configs:
1974+
# Queue is defined but config is not available
19731975
self.warn('Queue "{}" is not available. Available queues: {}'.format(
19741976
job.queue, list(self.queue_configs.keys())))
19751977
return False
1978+
else:
1979+
# Queue is defined and config is available
1980+
config = self.queue_configs[job.queue]
19761981
#end if
19771982

1978-
config = self.queue_configs[job.queue]
1983+
19791984
errors = []
19801985

19811986
# Get constraint-specific config if applicable
@@ -3384,6 +3389,7 @@ class Baseline(Supercomputer):
33843389
requires_account = True
33853390
batch_capable = True
33863391
queue_configs={
3392+
'default': 'batch_cnms',
33873393
'batch': {
33883394
'max_nodes': 138,
33893395
'max_walltime': '24:00:00',
@@ -3411,9 +3417,6 @@ class Baseline(Supercomputer):
34113417
}
34123418
def write_job_header(self,job):
34133419
self.validate_queue_config(job)
3414-
if job.queue is None:
3415-
job.queue = 'batch_cnms'
3416-
#end if
34173420

34183421
c = '#!/bin/bash\n'
34193422
c += '#SBATCH -A {}\n'.format(job.account)

0 commit comments

Comments
 (0)