mirror of
https://github.com/NVIDIA/nvidia-container-toolkit
synced 2025-06-14 10:28:45 +00:00
b4f0ad9c8e
The gated modifiers used to add support for GDS, Mofed, and CUDA Forward Comatibility only check the NVIDIA_VISIBLE_DEVICES envvar to determine whether GPUs are requested and modifications should be made. This means that use cases where volume mounts are used to request devices (e.g. when using the GPU Device Plugin) are not supported. This patch takes visibleDevicesFromEnvVar private, making VisibleDevices the only exported method to query valid devices. And edits the gated modifiers to use this func, ensuring device requests via mounts are also taken into acount. Signed-off-by: Carlos Eduardo Arango Gutierrez <eduardoa@nvidia.com>
78 lines
2.6 KiB
Go
78 lines
2.6 KiB
Go
/**
|
|
# Copyright (c) 2022, 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 modifier
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/NVIDIA/nvidia-container-toolkit/internal/config"
|
|
"github.com/NVIDIA/nvidia-container-toolkit/internal/config/image"
|
|
"github.com/NVIDIA/nvidia-container-toolkit/internal/discover"
|
|
"github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
|
|
"github.com/NVIDIA/nvidia-container-toolkit/internal/lookup/root"
|
|
"github.com/NVIDIA/nvidia-container-toolkit/internal/oci"
|
|
)
|
|
|
|
// NewGraphicsModifier constructs a modifier that injects graphics-related modifications into an OCI runtime specification.
|
|
// The value of the NVIDIA_DRIVER_CAPABILITIES environment variable is checked to determine if this modification should be made.
|
|
func NewGraphicsModifier(logger logger.Interface, cfg *config.Config, containerImage image.CUDA, driver *root.Driver, hookCreator discover.HookCreator) (oci.SpecModifier, error) {
|
|
if required, reason := requiresGraphicsModifier(containerImage); !required {
|
|
logger.Infof("No graphics modifier required: %v", reason)
|
|
return nil, nil
|
|
}
|
|
|
|
mounts, err := discover.NewGraphicsMountsDiscoverer(
|
|
logger,
|
|
driver,
|
|
hookCreator,
|
|
)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to create mounts discoverer: %v", err)
|
|
}
|
|
|
|
// In standard usage, the devRoot is the same as the driver.Root.
|
|
devRoot := driver.Root
|
|
drmNodes, err := discover.NewDRMNodesDiscoverer(
|
|
logger,
|
|
containerImage.DevicesFromEnvvars(image.EnvVarNvidiaVisibleDevices),
|
|
devRoot,
|
|
hookCreator,
|
|
)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to construct discoverer: %v", err)
|
|
}
|
|
|
|
d := discover.Merge(
|
|
drmNodes,
|
|
mounts,
|
|
)
|
|
return NewModifierFromDiscoverer(logger, d)
|
|
}
|
|
|
|
// requiresGraphicsModifier determines whether a graphics modifier is required.
|
|
func requiresGraphicsModifier(cudaImage image.CUDA) (bool, string) {
|
|
if devices := cudaImage.VisibleDevices(); len(devices) == 0 {
|
|
return false, "no devices requested"
|
|
}
|
|
|
|
if !cudaImage.GetDriverCapabilities().Any(image.DriverCapabilityGraphics, image.DriverCapabilityDisplay) {
|
|
return false, "no required capabilities requested"
|
|
}
|
|
|
|
return true, ""
|
|
}
|