Merge pull request #5636 from crosbymichael/multi-gpus

fuweid · web-flow · commit 1daea57ab5c6 · 2021-06-23T00:08:48.000+08:00
allow multi gpu to be specified via ctr
diff --git a/cmd/ctr/commands/commands.go b/cmd/ctr/commands/commands.go
@@ -147,7 +147,7 @@ var (
 			Name:  "pid-file",
 			Usage: "file path to write the task's pid",
 		},
-		cli.IntFlag{
+		cli.IntSliceFlag{
 			Name:  "gpus",
 			Usage: "add gpus to the container",
 		},
diff --git a/cmd/ctr/commands/run/run_unix.go b/cmd/ctr/commands/run/run_unix.go
@@ -251,7 +251,7 @@ func NewContainer(ctx gocontext.Context, client *containerd.Client, context *cli
 			}))
 		}
 		if context.IsSet("gpus") {
-			opts = append(opts, nvidia.WithGPUs(nvidia.WithDevices(context.Int("gpus")), nvidia.WithAllCapabilities))
+			opts = append(opts, nvidia.WithGPUs(nvidia.WithDevices(context.IntSlice("gpus")...), nvidia.WithAllCapabilities))
 		}
 		if context.IsSet("allow-new-privs") {
 			opts = append(opts, oci.WithNewPrivileges)

Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ func NewContainer(ctx gocontext.Context, client containerd.Client, context cli`
`251`	`251`	`}))`
`252`	`252`	`}`
`253`	`253`	`if context.IsSet("gpus") {`
`254`		`- opts = append(opts, nvidia.WithGPUs(nvidia.WithDevices(context.Int("gpus")), nvidia.WithAllCapabilities))`
	`254`	`+ opts = append(opts, nvidia.WithGPUs(nvidia.WithDevices(context.IntSlice("gpus")...), nvidia.WithAllCapabilities))`
`255`	`255`	`}`
`256`	`256`	`if context.IsSet("allow-new-privs") {`
`257`	`257`	`opts = append(opts, oci.WithNewPrivileges)`