Ensure that exported structs reference interface types not private types

Signed-off-by: Kevin Klues <kklues@nvidia.com>

gen/nvml/nvml.yml

@@ -67,14 +67,17 @@ TRANSLATOR:
       - {action: replace, from: "^Device$", to: "nvmlDevice"}
       - {action: replace, from: "^Unit$", to: "nvmlUnit"}
       - {action: replace, from: "^EventSet$", to: "nvmlEventSet"}
+      - {action: replace, from: "^EventData$", to: "nvmlEventData"}
       - {action: replace, from: "^GpmSample$", to: "nvmlGpmSample"}
       - {action: replace, from: "^ComputeInstance$", to: "nvmlComputeInstance"}
+      - {action: replace, from: "^ComputeInstanceInfo$", to: "nvmlComputeInstanceInfo"}
       - {action: replace, from: "^GpuInstance$", to: "nvmlGpuInstance"}
+      - {action: replace, from: "^GpuInstanceInfo$", to: "nvmlGpuInstanceInfo"}
       - {action: replace, from: "^VgpuInstance$", to: "nvmlVgpuInstance"}
       - {action: replace, from: "^VgpuTypeId$", to: "nvmlVgpuTypeId"}
       - {action: replace, from: "^VgpuMetadata", to: "nvmlVgpuMetadata"}
       - {action: replace, from: "^VgpuPgpuMetadata", to: "nvmlVgpuPgpuMetadata"}
-      - {action: replace, from: "^GpmMetricsGet", to: "GpmMetricsGetType"}
+      - {action: replace, from: "^GpmMetricsGet", to: "nvmlGpmMetricsGetType"}
     function:
       - {action: accept, from: "^nvml"}
       - {action: replace, from: "^nvmlInit$", to: "nvmlInit_v1"}

pkg/nvml/device.go

@@ -21,6 +21,65 @@ import (
 // EccBitType
 type EccBitType = MemoryErrorType
 
+// GpuInstanceInfo includes an interface type for Device instead of nvmlDevice
+type GpuInstanceInfo struct {
+	Device    Device
+	Id        uint32
+	ProfileId uint32
+	Placement GpuInstancePlacement
+}
+
+func (g GpuInstanceInfo) convert() nvmlGpuInstanceInfo {
+	out := nvmlGpuInstanceInfo{
+		Device:    g.Device.(nvmlDevice),
+		Id:        g.Id,
+		ProfileId: g.ProfileId,
+		Placement: g.Placement,
+	}
+	return out
+}
+
+func (g nvmlGpuInstanceInfo) convert() GpuInstanceInfo {
+	out := GpuInstanceInfo{
+		Device:    g.Device,
+		Id:        g.Id,
+		ProfileId: g.ProfileId,
+		Placement: g.Placement,
+	}
+	return out
+}
+
+// ComputeInstanceInfo includes an interface type for Device instead of nvmlDevice
+type ComputeInstanceInfo struct {
+	Device      Device
+	GpuInstance GpuInstance
+	Id          uint32
+	ProfileId   uint32
+	Placement   ComputeInstancePlacement
+}
+
+func (c ComputeInstanceInfo) convert() nvmlComputeInstanceInfo {
+	out := nvmlComputeInstanceInfo{
+		Device:      c.Device.(nvmlDevice),
+		GpuInstance: c.GpuInstance.(nvmlGpuInstance),
+		Id:          c.Id,
+		ProfileId:   c.ProfileId,
+		Placement:   c.Placement,
+	}
+	return out
+}
+
+func (c nvmlComputeInstanceInfo) convert() ComputeInstanceInfo {
+	out := ComputeInstanceInfo{
+		Device:      c.Device,
+		GpuInstance: c.GpuInstance,
+		Id:          c.Id,
+		ProfileId:   c.ProfileId,
+		Placement:   c.Placement,
+	}
+	return out
+}
+
 // nvml.DeviceGetCount()
 func (l *library) DeviceGetCount() (int, Return) {
 	var deviceCount uint32
@@ -2113,9 +2172,9 @@ func (l *library) GpuInstanceGetInfo(gpuInstance GpuInstance) (GpuInstanceInfo,
 }
 
 func (gpuInstance nvmlGpuInstance) GetInfo() (GpuInstanceInfo, Return) {
-	var info GpuInstanceInfo
+	var info nvmlGpuInstanceInfo
 	ret := nvmlGpuInstanceGetInfo(gpuInstance, &info)
-	return info, ret
+	return info.convert(), ret
 }
 
 // nvml.GpuInstanceGetComputeInstanceProfileInfo()
@@ -2224,9 +2283,9 @@ func (l *library) ComputeInstanceGetInfo(computeInstance ComputeInstance) (Compu
 }
 
 func (computeInstance nvmlComputeInstance) GetInfo() (ComputeInstanceInfo, Return) {
-	var info ComputeInstanceInfo
+	var info nvmlComputeInstanceInfo
 	ret := nvmlComputeInstanceGetInfo(computeInstance, &info)
-	return info, ret
+	return info.convert(), ret
 }
 
 // nvml.DeviceIsMigDeviceHandle()

pkg/nvml/event_set.go

@@ -14,6 +14,37 @@
 
 package nvml
 
+// EventData includes an interface type for Device instead of nvmlDevice
+type EventData struct {
+	Device            Device
+	EventType         uint64
+	EventData         uint64
+	GpuInstanceId     uint32
+	ComputeInstanceId uint32
+}
+
+func (e EventData) convert() nvmlEventData {
+	out := nvmlEventData{
+		Device:            e.Device.(nvmlDevice),
+		EventType:         e.EventType,
+		EventData:         e.EventData,
+		GpuInstanceId:     e.GpuInstanceId,
+		ComputeInstanceId: e.ComputeInstanceId,
+	}
+	return out
+}
+
+func (e nvmlEventData) convert() EventData {
+	out := EventData{
+		Device:            e.Device,
+		EventType:         e.EventType,
+		EventData:         e.EventData,
+		GpuInstanceId:     e.GpuInstanceId,
+		ComputeInstanceId: e.ComputeInstanceId,
+	}
+	return out
+}
+
 // nvml.EventSetCreate()
 func (l *library) EventSetCreate() (EventSet, Return) {
 	var Set nvmlEventSet
@@ -27,9 +58,9 @@ func (l *library) EventSetWait(set EventSet, timeoutms uint32) (EventData, Retur
 }
 
 func (set nvmlEventSet) Wait(timeoutms uint32) (EventData, Return) {
-	var data EventData
+	var data nvmlEventData
 	ret := nvmlEventSetWait(set, &data, timeoutms)
-	return data, ret
+	return data.convert(), ret
 }
 
 // nvml.EventSetFree()

pkg/nvml/gpm.go

@@ -14,13 +14,48 @@
 
 package nvml
 
+// GpmMetricsGetType includes interface types for GpmSample instead of nvmlGpmSample
+type GpmMetricsGetType struct {
+	Version    uint32
+	NumMetrics uint32
+	Sample1    GpmSample
+	Sample2    GpmSample
+	Metrics    [98]GpmMetric
+}
+
+func (g *GpmMetricsGetType) convert() *nvmlGpmMetricsGetType {
+	out := &nvmlGpmMetricsGetType{
+		Version:    g.Version,
+		NumMetrics: g.NumMetrics,
+		Sample1:    g.Sample1.(nvmlGpmSample),
+		Sample2:    g.Sample2.(nvmlGpmSample),
+	}
+	for i := range g.Metrics {
+		out.Metrics[i] = g.Metrics[i]
+	}
+	return out
+}
+
+func (g *nvmlGpmMetricsGetType) convert() *GpmMetricsGetType {
+	out := &GpmMetricsGetType{
+		Version:    g.Version,
+		NumMetrics: g.NumMetrics,
+		Sample1:    g.Sample1,
+		Sample2:    g.Sample2,
+	}
+	for i := range g.Metrics {
+		out.Metrics[i] = g.Metrics[i]
+	}
+	return out
+}
+
 // nvml.GpmMetricsGet()
 type GpmMetricsGetVType struct {
-	metricsGet *GpmMetricsGetType
+	metricsGet *nvmlGpmMetricsGetType
 }
 
 func (l *library) GpmMetricsGetV(metricsGet *GpmMetricsGetType) GpmMetricsGetVType {
-	return GpmMetricsGetVType{metricsGet}
+	return GpmMetricsGetVType{metricsGet.convert()}
 }
 func (metricsGetV GpmMetricsGetVType) V1() Return {
 	metricsGetV.metricsGet.Version = 1
@@ -29,7 +64,7 @@ func (metricsGetV GpmMetricsGetVType) V1() Return {
 
 func (l *library) GpmMetricsGet(metricsGet *GpmMetricsGetType) Return {
 	metricsGet.Version = GPM_METRICS_GET_VERSION
-	return nvmlGpmMetricsGet(metricsGet)
+	return nvmlGpmMetricsGet(metricsGet.convert())
 }
 
 // nvml.GpmSampleFree()