Attach Destroy as method to types

Author: egonelbre

api.go

@@ -175,7 +175,7 @@ func StreamPriorityRange() (leastPriority int, greatestPriority int, err error)
 	return
 }
 
-func Unload(hmod Module) (err error) {
+func (hmod Module) Unload() (err error) {
 	Chmod := hmod.c()
 	return result(C.cuModuleUnload(Chmod))
 }
@@ -520,7 +520,7 @@ func (hArray Array) Descriptor() (pArrayDescriptor ArrayDesc, err error) {
 	return
 }
 
-func DestroyArray(hArray Array) (err error) {
+func (hArray Array) Destroy() (err error) {
 	ChArray := hArray.c()
 	return result(C.cuArrayDestroy(ChArray))
 }

batch_test.go

@@ -94,8 +94,8 @@ loop:
 		}
 	}
 
-	Unload(mod)
-	DestroyContext(&cuctx)
+	mod.Unload()
+	cuctx.Destroy()
 }
 
 func TestLargeBatch(t *testing.T) {
@@ -211,8 +211,8 @@ loop:
 	if afterFree != beforeFree {
 		t.Errorf("Before: Freemem: %v. After %v | Diff %v", beforeFree, afterFree, (beforeFree-afterFree)/1024)
 	}
-	Unload(mod)
-	DestroyContext(&cuctx)
+	mod.Unload()
+	cuctx.Destroy()
 }
 
 func BenchmarkNoBatching(bench *testing.B) {
@@ -288,9 +288,8 @@ func BenchmarkNoBatching(bench *testing.B) {
 	}
 	MemFree(memA)
 	MemFree(memB)
-	Unload(mod)
-	DestroyContext(&ctx)
-
+	mod.Unload()
+	ctx.Destroy()
 }
 
 func BenchmarkBatching(bench *testing.B) {
@@ -364,7 +363,6 @@ func BenchmarkBatching(bench *testing.B) {
 
 	MemFree(memA)
 	MemFree(memB)
-	Unload(mod)
-	DestroyContext(&cuctx)
-
+	mod.Unload()
+	cuctx.Destroy()
 }

batchedPatterns_test.go

@@ -46,7 +46,7 @@ func TestAttributes(t *testing.T) {
 		t.Errorf("Expected ComputeCapabilityMinor to be %v. Got %v instead", min, attrs[2])
 	}
 
-	DestroyContext(&ctx)
+	ctx.Destroy()
 }
 
 func TestLaunchAndSync(t *testing.T) {
@@ -122,8 +122,8 @@ func TestLaunchAndSync(t *testing.T) {
 
 	MemFree(memA)
 	MemFree(memB)
-	Unload(mod)
-	DestroyContext(&ctx)
+	mod.Unload()
+	ctx.Destroy()
 }
 
 func TestAllocAndCopy(t *testing.T) {
@@ -168,5 +168,5 @@ func TestAllocAndCopy(t *testing.T) {
 	}
 
 	MemFree(mem)
-	DestroyContext(&ctx)
+	ctx.Destroy()
 }

cucontext.go

@@ -19,11 +19,9 @@ func makeContext(ctx C.CUcontext) CUContext { return CUContext{ctx} }
 func (ctx CUContext) c() C.CUcontext { return ctx.ctx }
 
 func (d Device) MakeContext(flags ContextFlags) (CUContext, error) {
-	var ctx C.CUcontext
-	if err := result(C.cuCtxCreate(&ctx, C.uint(flags), C.CUdevice(d))); err != nil {
-		return CUContext{}, err
-	}
-	return CUContext{ctx}, nil
+	var ctx CUContext
+	err := result(C.cuCtxCreate(&ctx.ctx, C.uint(flags), C.CUdevice(d)))
+	return ctx, err
 }
 
 // Lock ties the calling goroutine to an OS thread, then ties the CUDA context to the thread.
@@ -64,15 +62,11 @@ func (ctx CUContext) Unlock() error {
 	return nil
 }
 
-// DestroyContext destroys the context. It returns an error if it wasn't properly destroyed
+// Destroy destroys the context. It returns an error if it wasn't properly destroyed
 //
 // Wrapper over cuCtxDestroy: http://docs.nvidia.com/cuda/cuda-driver-api/group__CUDA__CTX.html#group__CUDA__CTX_1g27a365aebb0eb548166309f58a1e8b8e
-func DestroyContext(ctx *CUContext) error {
-	if err := result(C.cuCtxDestroy(ctx.ctx)); err != nil {
-		return err
-	}
-	*ctx = CUContext{}
-	return nil
+func (ctx *CUContext) Destroy() error {
+	return result(C.cuCtxDestroy(ctx.ctx))
 }
 
 // RetainPrimaryCtx retains the primary context on the GPU, creating it if necessary, increasing its usage count.
@@ -85,9 +79,8 @@ func DestroyContext(ctx *CUContext) error {
 // The nvidia-smi tool can be used to set the compute mode for devices. Documentation for nvidia-smi can be obtained by passing a -h option to it.
 // Please note that the primary context always supports pinned allocations. Other flags can be specified by cuDevicePrimaryCtxSetFlags().
 func (d Device) RetainPrimaryCtx() (primaryContext CUContext, err error) {
-	var ctx C.CUcontext
-	if err = result(C.cuDevicePrimaryCtxRetain(&ctx, C.CUdevice(d))); err != nil {
+	if err = result(C.cuDevicePrimaryCtxRetain(&primaryContext.ctx, C.CUdevice(d))); err != nil {
 		return
 	}
-	return CUContext{ctx}, nil
+	return primaryContext, nil
 }

cucontext_test.go

@@ -110,11 +110,11 @@ func TestCUContext(t *testing.T) {
 	}
 
 	// finally we destroy the context
-	if err = DestroyContext(&ctx); err != nil {
+	if err = ctx.Destroy(); err != nil {
 		t.Error(err)
 	}
 
-	if ctx != 0 {
+	if (ctx != CUContext{}) {
 		t.Error("expected ctx to be set to 0")
 	}
 }

memory_test.go

@@ -23,7 +23,7 @@ func TestArray(t *testing.T) {
 		Format:      Float32,
 	}
 	ctx, _ := Device(0).MakeContext(SchedAuto)
-	defer DestroyContext(&ctx)
+	defer ctx.Destroy()
 
 	arr, err := Make3DArray(desc)
 	assert.Nil(err)
@@ -39,7 +39,7 @@ func TestArray(t *testing.T) {
 	assert.Equal(desc3.Height, desc.Height)
 	assert.Equal(desc3.NumChannels, desc.NumChannels)
 
-	err = DestroyArray(arr)
+	err = arr.Destroy()
 	assert.Nil(err)
 }
 
@@ -50,7 +50,7 @@ func TestMalloc(t *testing.T) {
 		return
 	}
 	ctx, _ := Device(0).MakeContext(SchedAuto)
-	defer DestroyContext(&ctx)
+	defer ctx.Destroy()
 
 	for i := 0; i < 1024; i++ {
 		pointer, err := MemAlloc(16 * 1024 * 1024)
@@ -70,7 +70,7 @@ func TestDevicePtr_AddressRange(t *testing.T) {
 		return
 	}
 	ctx, _ := Device(0).MakeContext(SchedAuto)
-	defer DestroyContext(&ctx)
+	defer ctx.Destroy()
 
 	// actual test
 
@@ -95,7 +95,7 @@ func TestMemInfo(t *testing.T) {
 		return
 	}
 	ctx, _ := Device(0).MakeContext(SchedAuto)
-	defer DestroyContext(&ctx)
+	defer ctx.Destroy()
 
 	// actual test starts
 
@@ -120,7 +120,7 @@ func TestMemcpy(t *testing.T) {
 		return
 	}
 	ctx, _ := Device(0).MakeContext(SchedAuto)
-	defer DestroyContext(&ctx)
+	defer ctx.Destroy()
 
 	// actual test starts
 
@@ -165,7 +165,7 @@ func TestMemcpyAsync(t *testing.T) {
 		return
 	}
 	ctx, _ := Device(0).MakeContext(SchedAuto)
-	defer DestroyContext(&ctx)
+	defer ctx.Destroy()
 
 	// actual test starts
 
@@ -208,7 +208,7 @@ func TestMemset(t *testing.T) {
 		return
 	}
 	ctx, _ := Device(0).MakeContext(SchedAuto)
-	defer DestroyContext(&ctx)
+	defer ctx.Destroy()
 
 	var err error
 	var dev1 DevicePtr
@@ -258,7 +258,7 @@ func BenchmarkMallocFree1B(b *testing.B) {
 		return
 	}
 	ctx, _ := Device(0).MakeContext(SchedAuto)
-	defer DestroyContext(&ctx)
+	defer ctx.Destroy()
 
 	var m DevicePtr
 	var err error
@@ -282,7 +282,7 @@ func BenchmarkMallocFree1kB(b *testing.B) {
 		return
 	}
 	ctx, _ := Device(0).MakeContext(SchedAuto)
-	defer DestroyContext(&ctx)
+	defer ctx.Destroy()
 
 	var m DevicePtr
 	var err error
@@ -307,7 +307,7 @@ func BenchmarkMallocFree1MB(b *testing.B) {
 		return
 	}
 	ctx, _ := Device(0).MakeContext(SchedAuto)
-	defer DestroyContext(&ctx)
+	defer ctx.Destroy()
 
 	var m DevicePtr
 	var err error
@@ -338,7 +338,7 @@ func BenchmarkMemcpy(b *testing.B) {
 	if ctx, err = Device(0).MakeContext(SchedAuto); err != nil {
 		b.Fatal(err)
 	}
-	defer DestroyContext(&ctx)
+	defer ctx.Destroy()
 
 	b.StopTimer()
 	N := int64(32 * 1024 * 1024)

module.go

@@ -59,11 +59,6 @@ func (m Module) Global(name string) (DevicePtr, int64, error) {
 	return DevicePtr(d), int64(size), nil
 }
 
-// Unload unloads the module
-func (m Module) Unload() error {
-	return result(C.cuModuleUnload(m.mod))
-}
-
 func (ctx *Ctx) Load(name string) (m Module, err error) {
 	var mod C.CUmodule
 	f := func() error { return result(C.cuModuleLoad(&mod, C.CString(name))) }

module_test.go

@@ -12,7 +12,7 @@ func TestModule(t *testing.T) {
 		return
 	}
 	ctx, _ := Device(0).MakeContext(SchedAuto)
-	defer DestroyContext(&ctx)
+	defer ctx.Destroy()
 
 	var mod Module
 	var f Function

test_test.go

@@ -84,9 +84,8 @@ func testSetup() (dev Device, ctx CUContext, err error) {
 }
 
 func testTeardown(ctx CUContext, mod Module) {
-	if mod != 0 {
-		Unload(mod)
+	if (mod != Module{}) {
+		mod.Unload()
 	}
-
-	DestroyContext(&ctx)
+	ctx.Destroy()
 }