MFM: work around CUFFT bug

mumax · Dec 5, 2015 · 716ed52 · 716ed52
1 parent a9cae13
commit 716ed52
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/cuda/conv_mfm.go b/cuda/conv_mfm.go
@@ -3,8 +3,6 @@ package cuda
 // Generation of Magnetic Force Microscopy images.
 
 import (
-	"unsafe"
-
 	"github.com/mumax/3/data"
 	"github.com/mumax/3/mag"
 )
@@ -51,7 +49,7 @@ func (c *MFMConvolution) init() {
 	// init device buffers
 	nc := fftR2COutputSizeFloats(c.kernSize)
 	c.fftCBuf = NewSlice(1, nc)
-	c.fftRBuf = data.SliceFromPtrs(c.kernSize, data.GPUMemory, []unsafe.Pointer{c.fftCBuf.DevPtr(0)})
+	c.fftRBuf = NewSlice(1, c.kernSize)
 
 	c.gpuFFTKern[X] = NewSlice(1, nc)
 	c.gpuFFTKern[Y] = NewSlice(1, nc)

diff --git a/test/mfm.mx3 b/test/mfm.mx3
@@ -13,10 +13,9 @@ setcellsize(c, c, c)
 Msat = 1/mu0
 
 setgeom(rect(400e-9, 400e-9).transl(-400e-9, 0, 0))
-m = uniform(1,0,0)
+m = uniform(1,0,0.1)
 
 MFMLift = 50e-9
 
 save(MFM)
-// TODO: add expect() with value form cuda w/o cufft bug.
-print(MFM.Average())
+expect("mfm", MFM.Average(), -3.28009e7, 1e5) // golden value with mumax3.9.1 2015-12-05