mirror of
https://github.com/NVIDIA/nvidia-container-toolkit
synced 2024-11-22 16:29:18 +00:00
5145b0a4b6
This reverts commitb061446694, reversing changes made toc490baab63. Signed-off-by: Evan Lezar <elezar@nvidia.com>
57 lines
1.6 KiB
Go
57 lines
1.6 KiB
Go
/**
|
|
# Copyright (c) NVIDIA CORPORATION. All rights reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
**/
|
|
|
|
package nvcdi
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/NVIDIA/nvidia-container-toolkit/internal/discover"
|
|
)
|
|
|
|
// newCommonNVMLDiscoverer returns a discoverer for entities that are not associated with a specific CDI device.
|
|
// This includes driver libraries and meta devices, for example.
|
|
func (l *nvmllib) newCommonNVMLDiscoverer() (discover.Discover, error) {
|
|
metaDevices := discover.NewCharDeviceDiscoverer(
|
|
l.logger,
|
|
l.devRoot,
|
|
[]string{
|
|
"/dev/nvidia-modeset",
|
|
"/dev/nvidia-uvm-tools",
|
|
"/dev/nvidia-uvm",
|
|
"/dev/nvidiactl",
|
|
},
|
|
)
|
|
|
|
graphicsMounts, err := discover.NewGraphicsMountsDiscoverer(l.logger, l.driver, l.nvidiaCDIHookPath)
|
|
if err != nil {
|
|
l.logger.Warningf("failed to create discoverer for graphics mounts: %v", err)
|
|
}
|
|
|
|
driverFiles, err := NewDriverDiscoverer(l.logger, l.driver, l.nvidiaCDIHookPath, l.ldconfigPath, l.nvmllib)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to create discoverer for driver files: %v", err)
|
|
}
|
|
|
|
d := discover.Merge(
|
|
metaDevices,
|
|
graphicsMounts,
|
|
driverFiles,
|
|
)
|
|
|
|
return d, nil
|
|
}
|