UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2025-02-23 12:49:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'CNT-3084/include-cufile.json' into 'main'

Browse Source 
Include cufile.json in GDS discovery

See merge request nvidia/container-toolkit/container-toolkit!175
This commit is contained in:
Kevin Klues 2022-07-01 13:49:02 +00:00
commit 25fd1aaf7e
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/discover/gds.go
View File

@ -36,22 +36,28 @@ func NewGDSDiscoverer(logger *logrus.Logger, root string) (Discover, error) {
required: []string{"/dev/nvidia-fs*"}, required: []string{"/dev/nvidia-fs*"},
} }
mounts := &mounts{ udev := &mounts{
logger: logger, logger: logger,
lookup: lookup.NewDirectoryLocator(logger, root), lookup: lookup.NewDirectoryLocator(logger, root),
required: []string{"/run/udev"}, required: []string{"/run/udev"},
} }
cufile := &mounts{
logger: logger,
lookup: lookup.NewFileLocator(logger, root),
required: []string{"/etc/cufile.json"},
}
d := gdsDeviceDiscoverer{ d := gdsDeviceDiscoverer{
logger: logger, logger: logger,
devices: devices, devices: devices,
mounts: mounts, mounts: NewList(udev, cufile),
} }
return &d, nil return &d, nil
} }
// Devices discoveres the nvidia-fs device nodes for use with GPUDirect Storage // Devices discovers the nvidia-fs device nodes for use with GPUDirect Storage
func (d *gdsDeviceDiscoverer) Devices() ([]Device, error) { func (d *gdsDeviceDiscoverer) Devices() ([]Device, error) {
devicesAsMounts, err := d.devices.Mounts() devicesAsMounts, err := d.devices.Mounts()
if err != nil { if err != nil {
@ -66,7 +72,7 @@ func (d *gdsDeviceDiscoverer) Devices() ([]Device, error) {
return devices, nil return devices, nil
} }
// Mounts discovers the required mounts for GDS. // Mounts discovers the required mounts for GPUDirect Storage.
// If no devices are discovered the discovered mounts are empty // If no devices are discovered the discovered mounts are empty
func (d *gdsDeviceDiscoverer) Mounts() ([]Mount, error) { func (d *gdsDeviceDiscoverer) Mounts() ([]Mount, error) {
devices, err := d.Devices() devices, err := d.Devices()