cudaDeviceCountMin / cudaDeviceCountMin accept expressions

Author: tetron

cwltool/process.py

@@ -1016,14 +1016,14 @@ def evalResources(
                 mn = cast(
                     Union[int, float],
                     eval_resource(
-                        builder, cast(Union[str, int, float], resourceReq[a + "Min"])
+                        builder, cast(Union[str, int, float], rsc[a + "Min"])
                     ),
                 )
             if rsc.get(a + "Max"):
                 mx = cast(
                     Union[int, float],
                     eval_resource(
-                        builder, cast(Union[str, int, float], resourceReq[a + "Max"])
+                        builder, cast(Union[str, int, float], rsc[a + "Max"])
                     ),
                 )
             if mn is None:

tests/wf/nvidia-smi.cwl

@@ -6,7 +6,11 @@ requirements:
   cwltool:CUDARequirement:
     cudaVersionMin: "1.0"
     cudaComputeCapability: "1.0"
-inputs: []
+    cudaDeviceCountMin: $(inputs.gpus)
+inputs:
+  gpus:
+    type: int
+    default: 1
 outputs: []
 # Assume this will exit non-zero (resulting in a failing test case) if
 # nvidia-smi doesn't detect any devices.