From c802c3089c1d968606cbe32fc7445fa29b5876bb Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Thu, 24 Oct 2024 12:13:56 +0200 Subject: [PATCH] Remove unsupported print-ldcache command Signed-off-by: Evan Lezar --- .../system/print-ldcache/print-ldcache.go | 102 ------------------ cmd/nvidia-ctk/system/system.go | 2 - 2 files changed, 104 deletions(-) delete mode 100644 cmd/nvidia-ctk/system/print-ldcache/print-ldcache.go diff --git a/cmd/nvidia-ctk/system/print-ldcache/print-ldcache.go b/cmd/nvidia-ctk/system/print-ldcache/print-ldcache.go deleted file mode 100644 index 87493b7f..00000000 --- a/cmd/nvidia-ctk/system/print-ldcache/print-ldcache.go +++ /dev/null @@ -1,102 +0,0 @@ -/** -# 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 createdevicenodes - -import ( - "fmt" - - "github.com/urfave/cli/v2" - - "github.com/NVIDIA/nvidia-container-toolkit/internal/ldcache" - "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" -) - -type command struct { - logger logger.Interface -} - -type options struct { - driverRoot string -} - -// NewCommand constructs a command sub-command with the specified logger -func NewCommand(logger logger.Interface) *cli.Command { - c := command{ - logger: logger, - } - return c.build() -} - -// build -func (m command) build() *cli.Command { - opts := options{} - - c := cli.Command{ - Name: "print-ldcache", - Usage: "A utility to print the contents of the ldcache", - Before: func(c *cli.Context) error { - return m.validateFlags(c, &opts) - }, - Action: func(c *cli.Context) error { - return m.run(c, &opts) - }, - } - - c.Flags = []cli.Flag{ - &cli.StringFlag{ - Name: "driver-root", - Usage: "the path to the driver root. Device nodes will be created at `DRIVER_ROOT`/dev", - Value: "/", - Destination: &opts.driverRoot, - EnvVars: []string{"NVIDIA_DRIVER_ROOT", "DRIVER_ROOT"}, - }, - } - - return &c -} - -func (m command) validateFlags(r *cli.Context, opts *options) error { - return nil -} - -func (m command) run(c *cli.Context, opts *options) error { - cache, err := ldcache.New(m.logger, opts.driverRoot) - if err != nil { - return fmt.Errorf("failed to create ldcache: %v", err) - } - - lib32, lib64 := cache.List() - - if len(lib32) == 0 { - m.logger.Info("No 32-bit libraries found") - } else { - m.logger.Infof("%d 32-bit libraries found", len(lib32)) - for _, lib := range lib32 { - m.logger.Infof("%v", lib) - } - } - if len(lib64) == 0 { - m.logger.Info("No 64-bit libraries found") - } else { - m.logger.Infof("%d 64-bit libraries found", len(lib64)) - for _, lib := range lib64 { - m.logger.Infof("%v", lib) - } - } - - return nil -} diff --git a/cmd/nvidia-ctk/system/system.go b/cmd/nvidia-ctk/system/system.go index fc6b6922..05c8de5b 100644 --- a/cmd/nvidia-ctk/system/system.go +++ b/cmd/nvidia-ctk/system/system.go @@ -21,7 +21,6 @@ import ( devchar "github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk/system/create-dev-char-symlinks" devicenodes "github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk/system/create-device-nodes" - ldcache "github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk/system/print-ldcache" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" ) @@ -47,7 +46,6 @@ func (m command) build() *cli.Command { system.Subcommands = []*cli.Command{ devchar.NewCommand(m.logger), devicenodes.NewCommand(m.logger), - ldcache.NewCommand(m.logger), } return &system