Merge pull request #3161 from boegel/cuda_compute_capabilities

add --cuda-compute-capabilities configuration option

Author: bartoldeman

easybuild/tools/config.py

@@ -159,6 +159,7 @@ def mk_full_default_path(name, prefix=DEFAULT_PREFIX):
         'container_image_name',
         'container_template_recipe',
         'container_tmpdir',
+        'cuda_compute_capabilities',
         'download_timeout',
         'dump_test_report',
         'easyblock',

easybuild/tools/options.py

@@ -343,6 +343,8 @@ def override_options(self):
             'consider-archived-easyconfigs': ("Also consider archived easyconfigs", None, 'store_true', False),
             'containerize': ("Generate container recipe/image", None, 'store_true', False, 'C'),
             'copy-ec': ("Copy specified easyconfig(s) to specified location", None, 'store_true', False),
+            'cuda-compute-capabilities': ("List of CUDA compute capabilities to use when building GPU software",
+                                          'strlist', 'extend', None),
             'debug-lmod': ("Run Lmod modules tool commands in debug module", None, 'store_true', False),
             'default-opt-level': ("Specify default optimisation level", 'choice', 'store', DEFAULT_OPT_LEVEL,
                                   Compiler.COMPILER_OPT_FLAGS),
@@ -760,6 +762,15 @@ def validate(self):
             msg = "Selected module naming scheme '%s' is unknown: %s" % (self.options.module_naming_scheme, avail_mnss)
             error_msgs.append(msg)
 
+        # values passed to --cuda-compute-capabilities must be of form X.Y (with both X and Y integers),
+        # see https://developer.nvidia.com/cuda-gpus
+        if self.options.cuda_compute_capabilities:
+            cuda_cc_regex = re.compile(r'^[0-9]+\.[0-9]+$')
+            faulty_cuda_ccs = [x for x in self.options.cuda_compute_capabilities if not cuda_cc_regex.match(x)]
+            if faulty_cuda_ccs:
+                error_msg = "Incorrect values in --cuda-compute-capabilities (expected pattern: '%s'): %s"
+                error_msgs.append(error_msg % (cuda_cc_regex.pattern, ', '.join(faulty_cuda_ccs)))
+
         if error_msgs:
             raise EasyBuildError("Found problems validating the options: %s", '\n'.join(error_msgs))
 

test/framework/options.py

@@ -4668,6 +4668,14 @@ def test_sort_looseversions(self):
                     (ver5, suff3), (ver4, suff1), (ver4, suff3), (ver6, suff2)]
         self.assertEqual(sort_looseversions(input), expected)
 
+    def test_cuda_compute_capabilities(self):
+        """Test --cuda-compute-capabilities configuration option."""
+        args = ['--cuda-compute-capabilities=3.5,6.2,7.0', '--show-config']
+        txt, _ = self._run_mock_eb(args, do_build=True, raise_error=True, testing=False, strip=True)
+
+        regex = re.compile(r"^cuda-compute-capabilities\s*\(C\)\s*=\s*3\.5, 6\.2, 7\.0$", re.M)
+        self.assertTrue(regex.search(txt), "Pattern '%s' not found in: %s" % (regex.pattern, txt))
+
 
 def suite():
     """ returns all the testcases in this module """