Skip to content

Commit 43886f2

Browse files
author
Marco Morais
committed
Add Blackwell to DeviceArchitecture enum
1 parent 9403545 commit 43886f2

File tree

3 files changed

+8
-0
lines changed

3 files changed

+8
-0
lines changed

nvml-wrapper-sys/nvml.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,6 +1439,8 @@ typedef struct nvmlGridLicensableFeatures_st
14391439

14401440
#define NVML_DEVICE_ARCH_HOPPER 9 // Devices based on the NVIDIA Hopper architecture
14411441

1442+
#define NVML_DEVICE_ARCH_BLACKWELL 10 // Devices based on the NVIDIA Blackwell architecture
1443+
14421444
#define NVML_DEVICE_ARCH_UNKNOWN 0xffffffff // Anything else, presumably something newer
14431445

14441446
typedef unsigned int nvmlDeviceArchitecture_t;

nvml-wrapper-sys/src/bindings.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ pub const NVML_DEVICE_ARCH_TURING: u32 = 6;
5858
pub const NVML_DEVICE_ARCH_AMPERE: u32 = 7;
5959
pub const NVML_DEVICE_ARCH_ADA: u32 = 8;
6060
pub const NVML_DEVICE_ARCH_HOPPER: u32 = 9;
61+
pub const NVML_DEVICE_ARCH_BLACKWELL: u32 = 10;
6162
pub const NVML_DEVICE_ARCH_UNKNOWN: u32 = 4294967295;
6263
pub const NVML_BUS_TYPE_UNKNOWN: u32 = 0;
6364
pub const NVML_BUS_TYPE_PCI: u32 = 1;

nvml-wrapper/src/enums/device.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,8 @@ pub enum DeviceArchitecture {
225225
Ada,
226226
/// <https://en.wikipedia.org/wiki/Hopper_(microarchitecture)>
227227
Hopper,
228+
/// https://en.wikipedia.org/wiki/Blackwell_(microarchitecture)
229+
Blackwell,
228230
/// Unknown device architecture (most likely something newer).
229231
Unknown,
230232
}
@@ -241,6 +243,7 @@ impl DeviceArchitecture {
241243
Self::Ampere => NVML_DEVICE_ARCH_AMPERE,
242244
Self::Ada => NVML_DEVICE_ARCH_ADA,
243245
Self::Hopper => NVML_DEVICE_ARCH_HOPPER,
246+
Self::Blackwell => NVML_DEVICE_ARCH_BLACKWELL,
244247
Self::Unknown => NVML_DEVICE_ARCH_UNKNOWN,
245248
}
246249
}
@@ -259,6 +262,7 @@ impl TryFrom<nvmlDeviceArchitecture_t> for DeviceArchitecture {
259262
NVML_DEVICE_ARCH_AMPERE => Ok(Self::Ampere),
260263
NVML_DEVICE_ARCH_ADA => Ok(Self::Ada),
261264
NVML_DEVICE_ARCH_HOPPER => Ok(Self::Hopper),
265+
NVML_DEVICE_ARCH_BLACKWELL => Ok(Self::Blackwell),
262266
NVML_DEVICE_ARCH_UNKNOWN => Ok(Self::Unknown),
263267
_ => Err(NvmlError::UnexpectedVariant(data)),
264268
}
@@ -276,6 +280,7 @@ impl Display for DeviceArchitecture {
276280
Self::Ampere => f.write_str("Ampere"),
277281
Self::Ada => f.write_str("Ada"),
278282
Self::Hopper => f.write_str("Hopper"),
283+
Self::Blackwell => f.write_str("Blackwell"),
279284
Self::Unknown => f.write_str("Unknown"),
280285
}
281286
}

0 commit comments

Comments
 (0)