Skip to content

Commit 55813dc

Browse files
committed
Fix new enums
1 parent cee8ac3 commit 55813dc

3 files changed

Lines changed: 16 additions & 27 deletions

File tree

cuda_core/cuda/core/system/_clock.pxi

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,6 @@ _CLOCK_ID_MAPPING = {
99
}
1010

1111

12-
_CLOCK_EVENT_REASON_BOARD_LIMIT = getattr(
13-
nvml.ClocksEventReasons,
14-
"EVENT_REASON_BOARD_LIMIT",
15-
0x0000000000000200,
16-
)
17-
_CLOCK_EVENT_REASON_RELIABILITY = getattr(
18-
nvml.ClocksEventReasons,
19-
"EVENT_REASON_RELIABILITY",
20-
0x0000000000000400,
21-
)
22-
23-
2412
_CLOCKS_EVENT_REASONS_MAPPING = {
2513
nvml.ClocksEventReasons.EVENT_REASON_NONE: ClocksEventReasons.NONE,
2614
nvml.ClocksEventReasons.EVENT_REASON_GPU_IDLE: ClocksEventReasons.GPU_IDLE,
@@ -32,11 +20,16 @@ _CLOCKS_EVENT_REASONS_MAPPING = {
3220
nvml.ClocksEventReasons.THROTTLE_REASON_HW_THERMAL_SLOWDOWN: ClocksEventReasons.HW_THERMAL_SLOWDOWN,
3321
nvml.ClocksEventReasons.THROTTLE_REASON_HW_POWER_BRAKE_SLOWDOWN: ClocksEventReasons.HW_POWER_BRAKE_SLOWDOWN,
3422
nvml.ClocksEventReasons.EVENT_REASON_DISPLAY_CLOCK_SETTING: ClocksEventReasons.DISPLAY_CLOCK_SETTING,
35-
_CLOCK_EVENT_REASON_BOARD_LIMIT: ClocksEventReasons.BOARD_LIMIT,
36-
_CLOCK_EVENT_REASON_RELIABILITY: ClocksEventReasons.RELIABILITY,
3723
}
3824

3925

26+
if hasattr(nvml.ClocksEventReasons, "EVENT_REASON_BOARD_LIMIT"):
27+
_CLOCKS_EVENT_REASONS_MAPPING.update({
28+
nvml.ClocksEventReasons.EVENT_REASON_BOARD_LIMIT: ClocksEventReasons.BOARD_LIMIT,
29+
nvml.ClocksEventReasons.EVENT_REASON_RELIABILITY: ClocksEventReasons.RELIABILITY,
30+
})
31+
32+
4033
_CLOCK_TYPE_MAPPING = {
4134
ClockType.GRAPHICS: nvml.ClockType.CLOCK_GRAPHICS,
4235
ClockType.SM: nvml.ClockType.CLOCK_SM,

cuda_core/cuda/core/system/_device.pyx

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,15 @@ _BRAND_TYPE_MAPPING = {
103103
nvml.BrandType.BRAND_NVIDIA: "NVIDIA",
104104
nvml.BrandType.BRAND_GEFORCE_RTX: "GeForce RTX",
105105
nvml.BrandType.BRAND_TITAN_RTX: "Titan RTX",
106-
nvml.BrandType.BRAND_NVIDIA_DLA: "NVIDIA DLA",
107-
nvml.BrandType.BRAND_NVIDIA_VGAMEDEV: "NVIDIA vGameDev",
108-
nvml.BrandType.BRAND_NVIDIA_NPU: "NVIDIA NPU",
109106
}
107+
108+
109+
if hasattr(nvml.BrandType, "BRAND_NVIDIA_DLA"):
110+
_BRAND_TYPE_MAPPING.update({
111+
nvml.BrandType.BRAND_NVIDIA_DLA: "NVIDIA DLA",
112+
nvml.BrandType.BRAND_NVIDIA_VGAMEDEV: "NVIDIA vGameDev",
113+
nvml.BrandType.BRAND_NVIDIA_NPU: "NVIDIA NPU",
114+
})
110115

111116

112117
_GPU_P2P_CAPS_INDEX_MAPPING = {

cuda_core/tests/test_enum_coverage.py

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -132,15 +132,6 @@
132132

133133
_MODULES.append(system_typing)
134134

135-
_CLOCKS_EVENT_REASONS_STR_UNMAPPED = {
136-
core_member
137-
for binding_member, core_member in (
138-
("EVENT_REASON_BOARD_LIMIT", "BOARD_LIMIT"),
139-
("EVENT_REASON_RELIABILITY", "RELIABILITY"),
140-
)
141-
if binding_member not in nvml.ClocksEventReasons.__members__
142-
}
143-
144135
_CASES.extend(
145136
[
146137
(
@@ -173,7 +164,7 @@
173164
system_typing.ClocksEventReasons,
174165
_device._CLOCKS_EVENT_REASONS_MAPPING,
175166
set(),
176-
_CLOCKS_EVENT_REASONS_STR_UNMAPPED,
167+
set(),
177168
),
178169
(
179170
nvml.EventType,

0 commit comments

Comments
 (0)