Add VgpuTypeIDToUint32 helper function

gen/nvml/generateapi.go

@@ -77,6 +77,7 @@ var GeneratableInterfaces = []GeneratableInterfacePoperties{
 	{
 		Type:      "nvmlVgpuTypeId",
 		Interface: "VgpuTypeId",
+		Exclude:   []string{"ID"},
 	},
 }
 
@@ -239,7 +240,18 @@ func generateInterface(sourceDir string, input GeneratableInterfacePoperties) (s
 		return "", err
 	}
 
+	// We separate the methods into two sets to ensure that extensions are always included last.
+	var generatedMethods []*ast.FuncDecl
+	var extensions []*ast.FuncDecl
 	for _, method := range methods {
+		if method.Name.Name == "Extensions" {
+			extensions = append(extensions, method)
+			continue
+		}
+		generatedMethods = append(generatedMethods, method)
+	}
+
+	for _, method := range append(generatedMethods, extensions...) {
 		formatted := fmt.Sprintf("\t%s\n", formatMethodSignature(method))
 		signature.WriteString(formatted)
 	}

pkg/nvml/api.go

@@ -27,6 +27,11 @@ type ExtendedInterface interface {
 	LookupSymbol(string) error
 }
 
+//go:generate moq -rm -out mock/extendedvgputypeid.go -pkg mock . ExtendedVgpuTypeId:ExtendedVgpuTypeId
+type ExtendedVgpuTypeId interface {
+	ID() uint32
+}
+
 // libraryOptions hold the paramaters than can be set by a LibraryOption
 type libraryOptions struct {
 	path  string

pkg/nvml/vgpu_extensions.go

@@ -0,0 +1,27 @@
+// Copyright (c) 2020, 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 nvml
+
+func (vgpuTypeId *nvmlVgpuTypeId) Extensions() ExtendedVgpuTypeId {
+	return vgpuTypeId
+}
+
+// ID returns the numeric representaion of the vgpuTypeId.
+func (vgpuTypeId *nvmlVgpuTypeId) ID() uint32 {
+	if vgpuTypeId == nil {
+		return 0
+	}
+	return uint32(*vgpuTypeId)
+}

pkg/nvml/zz_generated.api.go

@@ -583,7 +583,6 @@ type Interface interface {
 	EventSetCreate() (EventSet, Return)
 	EventSetFree(EventSet) Return
 	EventSetWait(EventSet, uint32) (EventData, Return)
-	Extensions() ExtendedInterface
 	GetExcludedDeviceCount() (int, Return)
 	GetExcludedDeviceInfoByIndex(int) (ExcludedDeviceInfo, Return)
 	GetVgpuCompatibility(*VgpuMetadata, *VgpuPgpuMetadata) (VgpuPgpuCompatibility, Return)
@@ -668,6 +667,7 @@ type Interface interface {
 	VgpuTypeGetName(VgpuTypeId) (string, Return)
 	VgpuTypeGetNumDisplayHeads(VgpuTypeId) (int, Return)
 	VgpuTypeGetResolution(VgpuTypeId, int) (uint32, uint32, Return)
+	Extensions() ExtendedInterface
 }
 
 // Device represents the interface for the nvmlDevice type.
@@ -1004,4 +1004,5 @@ type VgpuTypeId interface {
 	GetNumDisplayHeads() (int, Return)
 	GetResolution(int) (uint32, uint32, Return)
 	GetSupportedPlacements(Device) (VgpuPlacementList, Return)
+	Extensions() ExtendedVgpuTypeId
 }