Allow users to specify only two types of resource for WQEX when autolabel=True (#1881)

* WQ resource spec checking logic

* refactor the if check for resource spec

* fix test

Author: ZhuozhaoLi

parsl/executors/workqueue/executor.py

@@ -336,28 +336,30 @@ def submit(self, func, resource_specification, *args, **kwargs):
         if resource_specification and isinstance(resource_specification, dict):
             logger.debug("Got resource specification: {}".format(resource_specification))
 
-            acceptable_resource_types = ['cores', 'memory', 'disk']
-            keys = list(resource_specification.keys())
-            if len(keys) != 3:
-                logger.error("Task resource specification requires "
+            acceptable_resource_types = set(['cores', 'memory', 'disk'])
+            keys = set(resource_specification.keys())
+            if self.autolabel:
+                if not keys.issubset(acceptable_resource_types):
+                    logger.error("Task resource specification only accepts "
+                                 "three types of resources: cores, memory, and disk")
+                    raise ExecutorError(self, "Task resource specification only accepts "
+                                              "three types of resources: cores, memory, and disk")
+
+            elif keys != acceptable_resource_types:
+                logger.error("Running with `autolabel=False`. In this mode, "
+                             "task resource specification requires "
                              "three resources to be specified simultaneously: cores, memory, and disk")
                 raise ExecutorError(self, "Task resource specification requires "
                                           "three resources to be specified simultaneously: cores, memory, and disk, "
-                                          "and only takes these three resource types.")
-
-            if not all(k.lower() in acceptable_resource_types for k in keys):
-                logger.error("Task resource specification only accepts "
-                             "three types of resources: cores, memory, and disk")
-                raise ExecutorError(self, "Task resource specification requires "
-                                          "three resources to be specified simultaneously: cores, memory, and disk, "
-                                          "and only takes these three resource types.")
+                                          "and only takes these three resource types, when running with `autolabel=False`. "
+                                          "Try setting autolabel=True if you are unsure of the resource usage")
 
             for k in keys:
-                if k.lower() == 'cores':
+                if k == 'cores':
                     cores = resource_specification[k]
-                elif k.lower() == 'memory':
+                elif k == 'memory':
                     memory = resource_specification[k]
-                elif k.lower() == 'disk':
+                elif k == 'disk':
                     disk = resource_specification[k]
 
         self.task_counter += 1

parsl/tests/test_error_handling/test_resource_spec.py

@@ -41,16 +41,6 @@ def test_resource(n=2):
     except Exception as e:
         assert isinstance(e, ExecutorError)
 
-    # Correct specification, case insensitive
-    spec = {'COREs': 2, 'MEMory': 1000, 'Disk': 1000}
-    fut = double(n, parsl_resource_specification=spec)
-    try:
-        fut.result()
-    except UnsupportedFeatureError:
-        assert not isinstance(executor, WorkQueueExecutor)
-    else:
-        assert isinstance(executor, WorkQueueExecutor)
-
 
 if __name__ == '__main__':
     local_config = config