Merge branch 'upstream-fix-nvlink-bug' into 'master'

Add check for INVALID_ARGUMENT in NvLink checks See merge request nvidia/container-toolkit/gpu-monitoring-tools!27
tkestack · Jul 17, 2020 · f7f1d83 · f7f1d83
2 parents 0e03b6a + cb5a78f
commit f7f1d83
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/bindings/go/nvml/bindings.go b/bindings/go/nvml/bindings.go
@@ -319,7 +319,7 @@ func (h handle) deviceGetNvLinkState(link uint) (*uint, error) {
 	var isActive C.nvmlEnableState_t
 
 	r := C.nvmlDeviceGetNvLinkState(h.dev, C.uint(link), &isActive)
-	if r == C.NVML_ERROR_NOT_SUPPORTED {
+	if r == C.NVML_ERROR_NOT_SUPPORTED || r == C.NVML_ERROR_INVALID_ARGUMENT {
 		return nil, nil
 	}
 
@@ -330,7 +330,7 @@ func (h handle) deviceGetNvLinkRemotePciInfo(link uint) (*string, error) {
 	var pci C.nvmlPciInfo_t
 
 	r := C.nvmlDeviceGetNvLinkRemotePciInfo(h.dev, C.uint(link), &pci)
-	if r == C.NVML_ERROR_NOT_SUPPORTED {
+	if r == C.NVML_ERROR_NOT_SUPPORTED || r == C.NVML_ERROR_INVALID_ARGUMENT {
 		return nil, nil
 	}