Bug fixes

Author: ddtm

scripts/smart-dispatch

@@ -148,12 +148,17 @@ def main():
 
     queue = Queue(args.queueName, CLUSTER_NAME, args.walltime, args.coresPerNode, args.gpusPerNode, args.memPerNode, args.modules)
 
-    # Check that requested core number does not exceed node total
+    # Check that requested per command resources do not exceed node total
     if args.coresPerCommand > queue.nb_cores_per_node:
         sys.stderr.write("smart-dispatch: error: coresPerCommand exceeds nodes total: asked {req_cores} cores, nodes have {node_cores}\n"
                          .format(req_cores=args.coresPerCommand, node_cores=queue.nb_cores_per_node))
         sys.exit(2)
 
+    if args.memPerCommand > queue.mem_per_node:
+        sys.stderr.write("smart-dispatch: error: memPerCommand exceeds nodes total: asked {req_mem} Gb, nodes have {node_mem} Gb\n"
+                         .format(req_mem=args.memPerCommand, node_mem=queue.mem_per_node))
+        sys.exit(2)
+
     command_params = {'nb_cores_per_command': args.coresPerCommand,
                       'nb_gpus_per_command': args.gpusPerCommand,
                       'mem_per_command': None  # args.memPerCommand
@@ -223,7 +228,9 @@ def parse_arguments():
         if args.queueName not in AVAILABLE_QUEUES and ((args.coresPerNode is None and args.gpusPerNode is None) or args.walltime is None):
             parser.error("Unknown queue, --coresPerNode/--gpusPerNode and --walltime must be set.")
         if args.coresPerCommand < 1:
-            parser.error("coresPerNode must be at least 1")
+            parser.error("coresPerCommand must be at least 1")
+        if args.memPerCommand is not None and args.memPerCommand < 0:
+            parser.error("memPerCommand must be positive")
 
     return args
 

tests/test_smart_dispatch.py

@@ -34,6 +34,9 @@ def setUp(self):
         smart_dispatch_command_with_cores = '{} -C 1 -M 1 -c {{cores}} -q test -t 5:00 -x {{0}}'.format(pjoin(scripts_path, 'smart-dispatch'))
         self.launch_command_with_cores = smart_dispatch_command_with_cores.format('launch ' + self.folded_commands, cores='{cores}')
 
+        smart_dispatch_command_with_memory = '{} -C 1 -M 1 -m {{memory}} -q test -t 5:00 -x {{0}}'.format(pjoin(scripts_path, 'smart-dispatch'))
+        self.launch_command_with_memory = smart_dispatch_command_with_memory.format('launch ' + self.folded_commands, memory='{memory}')
+
         self._cwd = os.getcwd()
         os.chdir(self.testing_dir)
 
@@ -95,6 +98,18 @@ def test_main_launch_with_cores_command(self):
         assert_equal(exit_status_100, 2)        
         assert_true(os.path.isdir(self.logs_dir))
 
+    def test_main_launch_with_memory_command(self):
+        # Actual test
+        exit_status_0 = call(self.launch_command_with_memory.format(memory=0), shell=True)
+        exit_status_05 = call(self.launch_command_with_memory.format(memory=0.5), shell=True)
+        exit_status_100 = call(self.launch_command_with_memory.format(memory=100), shell=True)
+
+        # Test validation
+        assert_equal(exit_status_0, 2)
+        assert_equal(exit_status_05, 0)
+        assert_equal(exit_status_100, 2)        
+        assert_true(os.path.isdir(self.logs_dir))
+
     def test_main_resume(self):
         # Setup
         call(self.launch_command, shell=True)