mirror of
https://github.com/NVIDIA/nvidia-container-toolkit
synced 2024-11-22 16:29:18 +00:00
35df24d63a
This change adds an --nvidia-ctk-path to the nvidia-ctk cdi generate command. This ensures that the executable path for the generated hooks can be specified consistently. Since the NVIDIA Container Runtime already allows for the executable path to be specified in the config the utility code to update the LDCache and create other nvidia-ctk hooks are also updated. Signed-off-by: Evan Lezar <elezar@nvidia.com>
61 lines
1.8 KiB
Go
61 lines
1.8 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 generate
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/NVIDIA/nvidia-container-toolkit/internal/discover"
|
|
"github.com/NVIDIA/nvidia-container-toolkit/internal/lookup"
|
|
"github.com/sirupsen/logrus"
|
|
"gitlab.com/nvidia/cloud-native/go-nvlib/pkg/nvml"
|
|
)
|
|
|
|
// NewCommonDiscoverer returns a discoverer for entities that are not associated with a specific CDI device.
|
|
// This includes driver libraries and meta devices, for example.
|
|
func NewCommonDiscoverer(logger *logrus.Logger, root string, nvidiaCTKPath string, nvmllib nvml.Interface) (discover.Discover, error) {
|
|
metaDevices := discover.NewDeviceDiscoverer(
|
|
logger,
|
|
lookup.NewCharDeviceLocator(logger, root),
|
|
root,
|
|
[]string{
|
|
"/dev/nvidia-modeset",
|
|
"/dev/nvidia-uvm-tools",
|
|
"/dev/nvidia-uvm",
|
|
"/dev/nvidiactl",
|
|
},
|
|
)
|
|
|
|
graphicsMounts, err := discover.NewGraphicsMountsDiscoverer(logger, root)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error constructing discoverer for graphics mounts: %v", err)
|
|
}
|
|
|
|
driverFiles, err := NewDriverDiscoverer(logger, root, nvidiaCTKPath, 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
|
|
}
|