Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix golang-ci-lint errors #972

Merged
merged 2 commits into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions internal/lm/nvml.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,17 +121,17 @@ func newVersionLabeler(manager resource.Manager) (Labeler, error) {
"nvidia.com/cuda.driver.major": driverMajor,
"nvidia.com/cuda.driver.minor": driverMinor,
"nvidia.com/cuda.driver.rev": driverRev,
"nvidia.com/cuda.runtime.major": fmt.Sprintf("%d", *cudaMajor),
"nvidia.com/cuda.runtime.minor": fmt.Sprintf("%d", *cudaMinor),
"nvidia.com/cuda.runtime.major": fmt.Sprintf("%d", cudaMajor),
"nvidia.com/cuda.runtime.minor": fmt.Sprintf("%d", cudaMinor),

// New labels
"nvidia.com/cuda.driver-version.major": driverMajor,
"nvidia.com/cuda.driver-version.minor": driverMinor,
"nvidia.com/cuda.driver-version.revision": driverRev,
"nvidia.com/cuda.driver-version.full": driverVersion,
"nvidia.com/cuda.runtime-version.major": fmt.Sprintf("%d", *cudaMajor),
"nvidia.com/cuda.runtime-version.minor": fmt.Sprintf("%d", *cudaMinor),
"nvidia.com/cuda.runtime-version.full": fmt.Sprintf("%d.%d", *cudaMajor, *cudaMinor),
"nvidia.com/cuda.runtime-version.major": fmt.Sprintf("%d", cudaMajor),
"nvidia.com/cuda.runtime-version.minor": fmt.Sprintf("%d", cudaMinor),
"nvidia.com/cuda.runtime-version.full": fmt.Sprintf("%d.%d", cudaMajor, cudaMinor),
}
return labels, nil
}
Expand Down
10 changes: 5 additions & 5 deletions internal/resource/cuda-lib.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,16 @@ func (l *cudaLib) GetDevices() ([]Device, error) {
}

// GetCudaDriverVersion returns the CUDA driver version
func (l *cudaLib) GetCudaDriverVersion() (*uint, *uint, error) {
func (l *cudaLib) GetCudaDriverVersion() (int, int, error) {
version, r := cuda.DriverGetVersion()
if r != cuda.SUCCESS {
return nil, nil, fmt.Errorf("failed to get driver version: %v", r)
return 0, 0, fmt.Errorf("failed to get driver version: %v", r)
}

major := uint(version) / 1000
minor := uint(version) % 100 / 10
major := version / 1000
minor := version % 100 / 10

return &major, &minor, nil
return major, minor, nil
}

// GetDriverVersion returns the driver version.
Expand Down
2 changes: 1 addition & 1 deletion internal/resource/fallback.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func (m *withFallBack) GetDevices() ([]Device, error) {
}

// GetCudaDriverVersion delegates to the wrapped manager
func (m *withFallBack) GetCudaDriverVersion() (*uint, *uint, error) {
func (m *withFallBack) GetCudaDriverVersion() (int, int, error) {
return m.wraps.GetCudaDriverVersion()
}

Expand Down
6 changes: 3 additions & 3 deletions internal/resource/manager_mock.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions internal/resource/null.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ func (l *null) GetDevices() ([]Device, error) {
}

// GetCudaDriverVersion is not supported
func (l *null) GetCudaDriverVersion() (*uint, *uint, error) {
return nil, nil, fmt.Errorf("GetCudaDriverVersion is unsupported")
func (l *null) GetCudaDriverVersion() (int, int, error) {
return 0, 0, fmt.Errorf("GetCudaDriverVersion is unsupported")
}

// GetDriverVersion is not supported
Expand Down
10 changes: 5 additions & 5 deletions internal/resource/nvml-lib.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ func NewNVMLManager(nvmllib nvml.Interface, devicelib device.Interface) Manager
}

// GetCudaDriverVersion : Return the cuda v using NVML
func (l nvmlLib) GetCudaDriverVersion() (*uint, *uint, error) {
func (l nvmlLib) GetCudaDriverVersion() (int, int, error) {
v, ret := l.Interface.SystemGetCudaDriverVersion()
if ret != nvml.SUCCESS {
return nil, nil, ret
return 0, 0, ret
}
major := uint(v / 1000)
minor := uint(v % 1000 / 10)
major := v / 1000
minor := v % 1000 / 10

return &major, &minor, nil
return major, minor, nil
}

// GetDevices returns the NVML devices for the manager
Expand Down
12 changes: 8 additions & 4 deletions internal/resource/nvml-mig-device.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,17 @@ func totalMemory(attr map[string]interface{}) (uint64, error) {
return 0, fmt.Errorf("no 'memory' attribute available")
}

switch t := totalMemory.(type) {
switch totalMemory := totalMemory.(type) {
case uint64:
return totalMemory.(uint64), nil
return totalMemory, nil
case int:
return uint64(totalMemory.(int)), nil
if totalMemory < 0 {
return 0, fmt.Errorf("unexpected memory value %v", totalMemory)
}
//nolint:gosec // Here we are sure that the value will fit in memory and be positive.
return uint64(totalMemory), nil
default:
return 0, fmt.Errorf("unsupported attribute type %v", t)
return 0, fmt.Errorf("unsupported attribute type %v", totalMemory)
}
}

Expand Down
5 changes: 2 additions & 3 deletions internal/resource/sysfs-lib.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,8 @@ func (l *vfioLib) GetDevices() ([]Device, error) {
}

// GetCudaDriverVersion is not supported
func (l *vfioLib) GetCudaDriverVersion() (*uint, *uint, error) {
unknown := uint(0)
return &unknown, &unknown, nil
func (l *vfioLib) GetCudaDriverVersion() (int, int, error) {
return 0, 0, nil
}

// GetDriverVersion is not supported
Expand Down
6 changes: 2 additions & 4 deletions internal/resource/testing/resource-testing.go
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,8 @@ func NewManagerMockWithDevices(devices ...resource.Device) *ManagerMock {
GetDevicesFunc: func() ([]resource.Device, error) {
return devices, nil
},
GetCudaDriverVersionFunc: func() (*uint, *uint, error) {
var major uint = 8
var minor uint = 0
return &major, &minor, nil
GetCudaDriverVersionFunc: func() (int, int, error) {
return 8, 0, nil
},
}}
return &manager
Expand Down
4 changes: 2 additions & 2 deletions internal/resource/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ package resource

// Manager defines an interface for managing devices
//
//go:generate moq -out manager_mock.go . Manager
//go:generate moq -rm -out manager_mock.go . Manager
type Manager interface {
Init() error
Shutdown() error
GetDevices() ([]Device, error)
GetDriverVersion() (string, error)
GetCudaDriverVersion() (*uint, *uint, error)
GetCudaDriverVersion() (int, int, error)
}

// Device defines an interface for a device with which labels are associated
Expand Down