|
2 | 2 | * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved.
|
3 | 3 | */
|
4 | 4 |
|
| 5 | +#include <sys/sysmacros.h> |
| 6 | + |
5 | 7 | #include <alloca.h>
|
6 | 8 | #include <err.h>
|
7 | 9 | #include <stdio.h>
|
@@ -102,15 +104,15 @@ info_command(const struct context *ctx)
|
102 | 104 |
|
103 | 105 | if (ctx->csv_output) {
|
104 | 106 | printf("NVRM version,CUDA version\n%s,%s\n", drv->nvrm_version, drv->cuda_version);
|
105 |
| - printf("\nDevice Index,Model,GPU UUID,Bus Location,Architecture\n"); |
| 107 | + printf("\nDevice Index,Device Minor,Model,GPU UUID,Bus Location,Architecture\n"); |
106 | 108 | for (size_t i = 0; i < dev->ngpus; ++i)
|
107 |
| - printf("%zu,%s,%s,%s,%s\n", i, dev->gpus[i].model, dev->gpus[i].uuid, dev->gpus[i].busid, dev->gpus[i].arch); |
| 109 | + printf("%zu,%u,%s,%s,%s,%s\n", i, minor(dev->gpus[i].node.id), dev->gpus[i].model, dev->gpus[i].uuid, dev->gpus[i].busid, dev->gpus[i].arch); |
108 | 110 |
|
109 | 111 | } else {
|
110 | 112 | printf("%-15s %s\n%-15s %s\n", "NVRM version:", drv->nvrm_version, "CUDA version:", drv->cuda_version);
|
111 | 113 | for (size_t i = 0; i < dev->ngpus; ++i)
|
112 |
| - printf("\n%-15s %zu\n%-15s %s\n%-15s %s\n%-15s %s\n%-15s %s\n", |
113 |
| - "Device Index:", i, "Model:", dev->gpus[i].model, "GPU UUID:", dev->gpus[i].uuid, |
| 114 | + printf("\n%-15s %zu\n%-15s %u\n%-15s %s\n%-15s %s\n%-15s %s\n%-15s %s\n", |
| 115 | + "Device Index:", i, "Device Minor:", minor(dev->gpus[i].node.id), "Model:", dev->gpus[i].model, "GPU UUID:", dev->gpus[i].uuid, |
114 | 116 | "Bus Location:", dev->gpus[i].busid, "Architecture:", dev->gpus[i].arch);
|
115 | 117 | }
|
116 | 118 |
|
|
0 commit comments