@@ -1937,7 +1937,7 @@ def validate_queue_config(self, job):
1937
1937
'queue_name': {
1938
1938
'min_nodes' : minimum number of nodes,
1939
1939
'max_nodes' : maximum number of nodes,
1940
- 'max_time ' : maximum walltime in hours,
1940
+ 'max_walltime ' : maximum walltime in hours,
1941
1941
'cores_per_node': cores per node,
1942
1942
'ram_per_node' : RAM per node in GB,
1943
1943
'constraints' : {
@@ -1956,26 +1956,31 @@ def validate_queue_config(self, job):
1956
1956
if self .queue_configs is None :
1957
1957
return True
1958
1958
#end if
1959
-
1960
- # Check if queue is specified
1959
+
1960
+ # Use only warnings here, as smaller computers may not have a queue
1961
1961
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 :
1964
1963
job .queue = self .queue_configs ['default' ]
1964
+ self .warn ('No default queue is specified. Using default queue {}' .format (job .queue ))
1965
1965
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
1968
1969
#end if
1969
1970
#end if
1970
1971
1971
1972
# Check if queue exists
1972
1973
if job .queue not in self .queue_configs :
1974
+ # Queue is defined but config is not available
1973
1975
self .warn ('Queue "{}" is not available. Available queues: {}' .format (
1974
1976
job .queue , list (self .queue_configs .keys ())))
1975
1977
return False
1978
+ else :
1979
+ # Queue is defined and config is available
1980
+ config = self .queue_configs [job .queue ]
1976
1981
#end if
1977
1982
1978
- config = self . queue_configs [ job . queue ]
1983
+
1979
1984
errors = []
1980
1985
1981
1986
# Get constraint-specific config if applicable
@@ -3384,6 +3389,7 @@ class Baseline(Supercomputer):
3384
3389
requires_account = True
3385
3390
batch_capable = True
3386
3391
queue_configs = {
3392
+ 'default' : 'batch_cnms' ,
3387
3393
'batch' : {
3388
3394
'max_nodes' : 138 ,
3389
3395
'max_walltime' : '24:00:00' ,
@@ -3411,9 +3417,6 @@ class Baseline(Supercomputer):
3411
3417
}
3412
3418
def write_job_header (self ,job ):
3413
3419
self .validate_queue_config (job )
3414
- if job .queue is None :
3415
- job .queue = 'batch_cnms'
3416
- #end if
3417
3420
3418
3421
c = '#!/bin/bash\n '
3419
3422
c += '#SBATCH -A {}\n ' .format (job .account )
0 commit comments