mirror of
https://github.com/NVIDIA/nvidia-container-toolkit
synced 2024-11-25 05:21:33 +00:00
Fix misspellings
Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
parent
2fad708556
commit
12dc12ce09
@ -1015,14 +1015,14 @@ func TestGetDriverCapabilities(t *testing.T) {
|
|||||||
|
|
||||||
for _, tc := range testCases {
|
for _, tc := range testCases {
|
||||||
t.Run(tc.description, func(t *testing.T) {
|
t.Run(tc.description, func(t *testing.T) {
|
||||||
var capabilites string
|
var capabilities string
|
||||||
|
|
||||||
c := HookConfig{
|
c := HookConfig{
|
||||||
SupportedDriverCapabilities: tc.supportedCapabilities,
|
SupportedDriverCapabilities: tc.supportedCapabilities,
|
||||||
}
|
}
|
||||||
|
|
||||||
getDriverCapabilities := func() {
|
getDriverCapabilities := func() {
|
||||||
capabilites = c.getDriverCapabilities(tc.env, tc.legacyImage).String()
|
capabilities = c.getDriverCapabilities(tc.env, tc.legacyImage).String()
|
||||||
}
|
}
|
||||||
|
|
||||||
if tc.expectedPanic {
|
if tc.expectedPanic {
|
||||||
@ -1031,7 +1031,7 @@ func TestGetDriverCapabilities(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
getDriverCapabilities()
|
getDriverCapabilities()
|
||||||
require.EqualValues(t, tc.expectedCapabilities, capabilites)
|
require.EqualValues(t, tc.expectedCapabilities, capabilities)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -66,7 +66,7 @@ func (m command) build() *cli.Command {
|
|||||||
c.Flags = []cli.Flag{
|
c.Flags = []cli.Flag{
|
||||||
&cli.StringSliceFlag{
|
&cli.StringSliceFlag{
|
||||||
Name: "path",
|
Name: "path",
|
||||||
Usage: "Specifiy a path to apply the specified mode to",
|
Usage: "Specify a path to apply the specified mode to",
|
||||||
Destination: &cfg.paths,
|
Destination: &cfg.paths,
|
||||||
},
|
},
|
||||||
&cli.StringFlag{
|
&cli.StringFlag{
|
||||||
|
@ -56,7 +56,7 @@ func (m command) build() *cli.Command {
|
|||||||
// Create the '' command
|
// Create the '' command
|
||||||
c := cli.Command{
|
c := cli.Command{
|
||||||
Name: "create-symlinks",
|
Name: "create-symlinks",
|
||||||
Usage: "A hook to create symlinks in the container. This can be used to proces CSV mount specs",
|
Usage: "A hook to create symlinks in the container. This can be used to process CSV mount specs",
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
return m.run(c, &cfg)
|
return m.run(c, &cfg)
|
||||||
},
|
},
|
||||||
|
@ -60,7 +60,7 @@ func (m command) build() *cli.Command {
|
|||||||
c.Flags = []cli.Flag{
|
c.Flags = []cli.Flag{
|
||||||
&cli.StringSliceFlag{
|
&cli.StringSliceFlag{
|
||||||
Name: "folder",
|
Name: "folder",
|
||||||
Usage: "Specifiy a folder to add to /etc/ld.so.conf before updating the ld cache",
|
Usage: "Specify a folder to add to /etc/ld.so.conf before updating the ld cache",
|
||||||
Destination: &cfg.folders,
|
Destination: &cfg.folders,
|
||||||
},
|
},
|
||||||
&cli.StringFlag{
|
&cli.StringFlag{
|
||||||
|
@ -73,7 +73,7 @@ func (c DriverCapabilities) Has(capability DriverCapability) bool {
|
|||||||
return c[capability]
|
return c[capability]
|
||||||
}
|
}
|
||||||
|
|
||||||
// Any checks whether any of the specified capabilites are set
|
// Any checks whether any of the specified capabilities are set
|
||||||
func (c DriverCapabilities) Any(capabilities ...DriverCapability) bool {
|
func (c DriverCapabilities) Any(capabilities ...DriverCapability) bool {
|
||||||
if c.IsAll() {
|
if c.IsAll() {
|
||||||
return true
|
return true
|
||||||
|
@ -139,12 +139,12 @@ func (i CUDA) DevicesFromEnvvars(envVars ...string) VisibleDevices {
|
|||||||
func (i CUDA) GetDriverCapabilities() DriverCapabilities {
|
func (i CUDA) GetDriverCapabilities() DriverCapabilities {
|
||||||
env := i[envNVDriverCapabilities]
|
env := i[envNVDriverCapabilities]
|
||||||
|
|
||||||
capabilites := make(DriverCapabilities)
|
capabilities := make(DriverCapabilities)
|
||||||
for _, c := range strings.Split(env, ",") {
|
for _, c := range strings.Split(env, ",") {
|
||||||
capabilites[DriverCapability(c)] = true
|
capabilities[DriverCapability(c)] = true
|
||||||
}
|
}
|
||||||
|
|
||||||
return capabilites
|
return capabilities
|
||||||
}
|
}
|
||||||
|
|
||||||
func (i CUDA) legacyVersion() (string, error) {
|
func (i CUDA) legacyVersion() (string, error) {
|
||||||
|
@ -27,7 +27,7 @@ type list struct {
|
|||||||
|
|
||||||
var _ Discover = (*list)(nil)
|
var _ Discover = (*list)(nil)
|
||||||
|
|
||||||
// Merge creates a discoverer that is the composite of a list of discoveres.
|
// Merge creates a discoverer that is the composite of a list of discoverers.
|
||||||
func Merge(d ...Discover) Discover {
|
func Merge(d ...Discover) Discover {
|
||||||
l := list{
|
l := list{
|
||||||
discoverers: d,
|
discoverers: d,
|
||||||
|
@ -56,7 +56,7 @@ func ParseGPUInformationFile(path string) (GPUInfo, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// gpuInfoFrom parses a GPUInfo struct from the specified reader
|
// gpuInfoFrom parses a GPUInfo struct from the specified reader
|
||||||
// An information file has the following strucutre:
|
// An information file has the following structure:
|
||||||
// $ cat /proc/driver/nvidia/gpus/0000\:06\:00.0/information
|
// $ cat /proc/driver/nvidia/gpus/0000\:06\:00.0/information
|
||||||
// Model: Tesla V100-SXM2-16GB
|
// Model: Tesla V100-SXM2-16GB
|
||||||
// IRQ: 408
|
// IRQ: 408
|
||||||
|
@ -234,7 +234,7 @@ func (c *ldcache) getEntries(selected func(string) bool) []entry {
|
|||||||
return entries
|
return entries
|
||||||
}
|
}
|
||||||
|
|
||||||
// List creates a list of libraires in the ldcache.
|
// List creates a list of libraries in the ldcache.
|
||||||
// The 32-bit and 64-bit libraries are returned separately.
|
// The 32-bit and 64-bit libraries are returned separately.
|
||||||
func (c *ldcache) List() ([]string, []string) {
|
func (c *ldcache) List() ([]string, []string) {
|
||||||
all := func(s string) bool { return true }
|
all := func(s string) bool { return true }
|
||||||
|
@ -29,7 +29,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// NewCDIModifier creates an OCI spec modifier that determines the modifications to make based on the
|
// NewCDIModifier creates an OCI spec modifier that determines the modifications to make based on the
|
||||||
// CDI specifications available on the system. The NVIDIA_VISIBLE_DEVICES enviroment variable is
|
// CDI specifications available on the system. The NVIDIA_VISIBLE_DEVICES environment variable is
|
||||||
// used to select the devices to include.
|
// used to select the devices to include.
|
||||||
func NewCDIModifier(logger logger.Interface, cfg *config.Config, ociSpec oci.Spec) (oci.SpecModifier, error) {
|
func NewCDIModifier(logger logger.Interface, cfg *config.Config, ociSpec oci.Spec) (oci.SpecModifier, error) {
|
||||||
devices, err := getDevicesFromSpec(logger, ociSpec, cfg)
|
devices, err := getDevicesFromSpec(logger, ociSpec, cfg)
|
||||||
|
@ -23,7 +23,7 @@ import (
|
|||||||
"github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
|
"github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
|
||||||
)
|
)
|
||||||
|
|
||||||
// pathRuntime wraps the path that a binary and defines the semanitcs for how to exec into it.
|
// pathRuntime wraps the path that a binary and defines the semantics for how to exec into it.
|
||||||
// This can be used to wrap an OCI-compliant low-level runtime binary, allowing it to be used through the
|
// This can be used to wrap an OCI-compliant low-level runtime binary, allowing it to be used through the
|
||||||
// Runtime internface.
|
// Runtime internface.
|
||||||
type pathRuntime struct {
|
type pathRuntime struct {
|
||||||
|
@ -23,7 +23,7 @@ import (
|
|||||||
"github.com/opencontainers/runtime-spec/specs-go"
|
"github.com/opencontainers/runtime-spec/specs-go"
|
||||||
)
|
)
|
||||||
|
|
||||||
// SpecModifier defines an interace for modifying a (raw) OCI spec
|
// SpecModifier defines an interface for modifying a (raw) OCI spec
|
||||||
type SpecModifier interface {
|
type SpecModifier interface {
|
||||||
// Modify is a method that accepts a pointer to an OCI Srec and returns an
|
// Modify is a method that accepts a pointer to an OCI Srec and returns an
|
||||||
// error. The intention is that the function would modify the spec in-place.
|
// error. The intention is that the function would modify the spec in-place.
|
||||||
|
@ -79,7 +79,7 @@ func (s *fileSpec) Modify(m SpecModifier) error {
|
|||||||
return s.memorySpec.Modify(m)
|
return s.memorySpec.Modify(m)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Flush writes the stored OCI specification to the filepath specifed by the path member.
|
// Flush writes the stored OCI specification to the filepath specified by the path member.
|
||||||
// The file is truncated upon opening, overwriting any existing contents.
|
// The file is truncated upon opening, overwriting any existing contents.
|
||||||
func (s fileSpec) Flush() error {
|
func (s fileSpec) Flush() error {
|
||||||
if s.Spec == nil {
|
if s.Spec == nil {
|
||||||
|
@ -34,7 +34,7 @@ import (
|
|||||||
// The supplied NVML Library is used to query the expected driver version.
|
// The supplied NVML Library is used to query the expected driver version.
|
||||||
func NewDriverDiscoverer(logger logger.Interface, driverRoot string, nvidiaCTKPath string, nvmllib nvml.Interface) (discover.Discover, error) {
|
func NewDriverDiscoverer(logger logger.Interface, driverRoot string, nvidiaCTKPath string, nvmllib nvml.Interface) (discover.Discover, error) {
|
||||||
if r := nvmllib.Init(); r != nvml.SUCCESS {
|
if r := nvmllib.Init(); r != nvml.SUCCESS {
|
||||||
return nil, fmt.Errorf("failed to initalize NVML: %v", r)
|
return nil, fmt.Errorf("failed to initialize NVML: %v", r)
|
||||||
}
|
}
|
||||||
defer nvmllib.Shutdown()
|
defer nvmllib.Shutdown()
|
||||||
|
|
||||||
|
@ -41,7 +41,7 @@ func (l *nvmllib) GetAllDeviceSpecs() ([]specs.Device, error) {
|
|||||||
var deviceSpecs []specs.Device
|
var deviceSpecs []specs.Device
|
||||||
|
|
||||||
if r := l.nvmllib.Init(); r != nvml.SUCCESS {
|
if r := l.nvmllib.Init(); r != nvml.SUCCESS {
|
||||||
return nil, fmt.Errorf("failed to initalize NVML: %v", r)
|
return nil, fmt.Errorf("failed to initialize NVML: %v", r)
|
||||||
}
|
}
|
||||||
defer l.nvmllib.Shutdown()
|
defer l.nvmllib.Shutdown()
|
||||||
|
|
||||||
|
@ -85,7 +85,7 @@ func (o *builder) Build() (*spec, error) {
|
|||||||
if raw.Version == DetectMinimumVersion {
|
if raw.Version == DetectMinimumVersion {
|
||||||
minVersion, err := cdi.MinimumRequiredVersion(raw)
|
minVersion, err := cdi.MinimumRequiredVersion(raw)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("failed to get minumum required CDI spec version: %v", err)
|
return nil, fmt.Errorf("failed to get minimum required CDI spec version: %v", err)
|
||||||
}
|
}
|
||||||
raw.Version = minVersion
|
raw.Version = minVersion
|
||||||
}
|
}
|
||||||
|
@ -65,7 +65,7 @@ func main() {
|
|||||||
&cli.BoolFlag{
|
&cli.BoolFlag{
|
||||||
Name: "no-daemon",
|
Name: "no-daemon",
|
||||||
Aliases: []string{"n"},
|
Aliases: []string{"n"},
|
||||||
Usage: "terminate immediatly after setting up the runtime. Note that no cleanup will be performed",
|
Usage: "terminate immediately after setting up the runtime. Note that no cleanup will be performed",
|
||||||
Destination: &options.noDaemon,
|
Destination: &options.noDaemon,
|
||||||
EnvVars: []string{"NO_DAEMON"},
|
EnvVars: []string{"NO_DAEMON"},
|
||||||
},
|
},
|
||||||
|
@ -43,7 +43,7 @@ func installContainerRuntimes(toolkitDir string, driverRoot string) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// newNVidiaContainerRuntimeInstaller returns a new executable installer for the NVIDIA container runtime.
|
// newNVidiaContainerRuntimeInstaller returns a new executable installer for the NVIDIA container runtime.
|
||||||
// This installer will copy the specified source exectuable to the toolkit directory.
|
// This installer will copy the specified source executable to the toolkit directory.
|
||||||
// The executable is copied to a file with the same name as the source, but with a ".real" suffix and a wrapper is
|
// The executable is copied to a file with the same name as the source, but with a ".real" suffix and a wrapper is
|
||||||
// created to allow for the configuration of the runtime environment.
|
// created to allow for the configuration of the runtime environment.
|
||||||
func newNvidiaContainerRuntimeInstaller(source string) *executable {
|
func newNvidiaContainerRuntimeInstaller(source string) *executable {
|
||||||
|
Loading…
Reference in New Issue
Block a user