Update nvml interface

.pre-commit-config.yaml

@@ -15,6 +15,7 @@ repos:
           - '--suppress=unreadVariable:tests/*'
           - '--suppress=missingIncludeSystem'
           - '--suppress=unmatchedSuppression'
+        pass_filenames: false
   - repo: https://github.com/cheshirekow/cmake-format-precommit
     rev: v0.6.13
     hooks:

CHANGELOG.md

@@ -30,6 +30,7 @@ project adheres to [Semantic Versioning](http://semver.org/).
 - `target_embed_source` is now more robust: it properly tracks dependencies and
   runs again whenever any of them changes
 - Expanded tests to cover the new 2D memory operations and FFT support
+- Removed the `context` from `nvml::Device` constructors
 
 ## \[0.8.0\] - 2024-07-05
 

include/cudawrappers/nvml.hpp

@@ -35,26 +35,27 @@ class Context {
 
 class Device {
  public:
-  Device(Context& context, int index) {
+  Device(int index) {
     checkNvmlCall(nvmlDeviceGetHandleByIndex(index, &device_));
   }
 
-  Device(Context& context, cu::Device& device) {
+  Device(cu::Device& device) {
     const std::string uuid = device.getUuid();
-    nvmlDeviceGetHandleByUUID(uuid.c_str(), &device_);
+    checkNvmlCall(nvmlDeviceGetHandleByUUID(uuid.c_str(), &device_));
   }
 
-  void getFieldValues(int valuesCount, nvmlFieldValue_t* values) {
+  void getFieldValues(int valuesCount, nvmlFieldValue_t* values) const {
     checkNvmlCall(nvmlDeviceGetFieldValues(device_, valuesCount, values));
   }
 
-  unsigned int getClock(nvmlClockType_t clockType, nvmlClockId_t clockId) {
+  unsigned int getClock(nvmlClockType_t clockType,
+                        nvmlClockId_t clockId) const {
     unsigned int clockMhz;
     checkNvmlCall(nvmlDeviceGetClock(device_, clockType, clockId, &clockMhz));
     return clockMhz;
   }
 
-  unsigned int getPower() {
+  unsigned int getPower() const {
     unsigned int power;
     checkNvmlCall(nvmlDeviceGetPowerUsage(device_, &power));
     return power;

tests/test_nvml.cpp

@@ -9,20 +9,20 @@ TEST_CASE("Test nvml::Context", "[context]") { nvml::Context context; }
 
 TEST_CASE("Test nvml::Device with device number", "[device]") {
   nvml::Context context;
-  nvml::Device device(context, 0);
+  nvml::Device device(0);
 }
 
 TEST_CASE("Test nvml::Device::getClock", "[device]") {
   nvml::Context context;
-  nvml::Device device(context, 0);
+  nvml::Device device(0);
   const unsigned int clockMHz =
       device.getClock(NVML_CLOCK_GRAPHICS, NVML_CLOCK_ID_CURRENT);
   REQUIRE(clockMHz > 0);
 }
 
 TEST_CASE("Test nvml::Device::getPower", "[device]") {
   nvml::Context context;
-  nvml::Device device(context, 0);
+  nvml::Device device(0);
   const unsigned int power = device.getPower();
   REQUIRE(power > 0);
 }
@@ -31,5 +31,5 @@ TEST_CASE("Test nvml::Device with device", "[device]") {
   cu::init();
   cu::Device cu_device(0);
   nvml::Context nvml_context;
-  nvml::Device nvml_device(nvml_context, cu_device);
+  nvml::Device nvml_device(cu_device);
 }