Merge pull request #3098 from OliverPerks/feature/environment_nvccpath

[feat] Add `nvcc` as an environment configuration parameter
reframe-hpc · Jan 31, 2024 · 5c136e8 · 5c136e8
2 parents 35fce1e + 7580506
commit 5c136e8
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 0 deletions.
diff --git a/docs/config_reference.rst b/docs/config_reference.rst
@@ -898,6 +898,16 @@ They are associated with `system partitions <#system-partition-configuration>`__
    A list of linker flags to be used with this environment by default.
 
 
+.. py:attribute:: environments.nvcc
+
+   :required: No
+   :default: ``"nvcc"``
+
+   The NVIDIA CUDA compiler to be used with this environment.
+
+   .. versionadded:: 4.6
+
+
 .. py:attribute:: environments.target_systems
 
    :required: No

diff --git a/reframe/core/environments.py b/reframe/core/environments.py
@@ -219,6 +219,7 @@ class ProgEnvironment(Environment):
     _cc = fields.TypedField(str)
     _cxx = fields.TypedField(str)
     _ftn = fields.TypedField(str)
+    _nvcc = fields.TypedField(str)
     _cppflags = fields.TypedField(typ.List[str])
     _cflags = fields.TypedField(typ.List[str])
     _cxxflags = fields.TypedField(typ.List[str])
@@ -320,4 +321,8 @@ def ldflags(self):
 
     @property
     def nvcc(self):
+        '''The NVIDIA CUDA compiler of this programming environment.
+
+        :type: :class:`str`
+        '''
         return self._nvcc
diff --git a/reframe/core/systems.py b/reframe/core/systems.py
@@ -538,6 +538,7 @@ def create(cls, site_config):
                     cc=site_config.get(f'environments/@{e}/cc'),
                     cxx=site_config.get(f'environments/@{e}/cxx'),
                     ftn=site_config.get(f'environments/@{e}/ftn'),
+                    nvcc=site_config.get(f'environments/@{e}/nvcc'),
                     cppflags=site_config.get(f'environments/@{e}/cppflags'),
                     cflags=site_config.get(f'environments/@{e}/cflags'),
                     cxxflags=site_config.get(f'environments/@{e}/cxxflags'),

diff --git a/reframe/schemas/config.json b/reframe/schemas/config.json
@@ -371,6 +371,7 @@
                     "cc": {"type": "string"},
                     "cxx": {"type": "string"},
                     "ftn": {"type": "string"},
+                    "nvcc": {"type": "string"},
                     "cppflags": {
                         "type": "array",
                         "items": {"type": "string"}
@@ -528,6 +529,7 @@
         "environments/cc": "cc",
         "environments/cxx": "CC",
         "environments/ftn": "ftn",
+        "environments/nvcc": "nvcc",
         "environments/cppflags": [],
         "environments/cflags": [],
         "environments/cxxflags": [],

diff --git a/unittests/test_config.py b/unittests/test_config.py
@@ -270,6 +270,7 @@ def test_select_subconfig(site_config):
     assert site_config.get('systems/0/partitions/0/max_jobs') == 8
     assert len(site_config['environments']) == 7
     assert site_config.get('environments/@PrgEnv-gnu/cc') == 'gcc'
+    assert site_config.get('environments/@PrgEnv-gnu/nvcc') == 'nvcc'
     assert site_config.get('environments/1/cxx') == 'g++'
     assert site_config.get('environments/@PrgEnv-cray/cc') == 'cc'
     assert site_config.get('environments/2/cxx') == 'CC'