optimize for constant parameter

kidandcat · Sep 14, 2016 · 6cdb64a · 6cdb64a
1 parent 6e13b08
commit 6cdb64a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/cuda/buffer.go b/cuda/buffer.go
@@ -61,6 +61,9 @@ func Recycle(s *data.Slice) {
 	// put each component buffer back on the stack
 	for i := 0; i < s.NComp(); i++ {
 		ptr := s.DevPtr(i)
+		if ptr == unsafe.Pointer(uintptr(0)) {
+			continue
+		}
 		if _, ok := buf_check[ptr]; !ok {
 			log.Panic("recyle: was not obtained with getbuffer")
 		}

diff --git a/cuda/mslice.go b/cuda/mslice.go
@@ -18,6 +18,10 @@ func ToMSlice(s *data.Slice) MSlice {
 	}
 }
 
+func MakeMSlice(arr *data.Slice, mul []float64) MSlice {
+	return MSlice{arr, mul}
+}
+
 func (m MSlice) Size() [3]int {
 	return m.arr.Size()
 }

diff --git a/engine/parameter.go b/engine/parameter.go
@@ -34,9 +34,13 @@ func (p *param) init(nComp int, name, unit string, children []derived) {
 }
 
 func (p *param) MSlice() cuda.MSlice {
-	buf, r := p.Slice()
-	util.Assert(r == true)
-	return cuda.ToMSlice(buf)
+	if p.IsUniform() {
+		return cuda.MakeMSlice(data.NilSlice(p.NComp(), Mesh().Size()), p.getRegion(0))
+	} else {
+		buf, r := p.Slice()
+		util.Assert(r == true)
+		return cuda.ToMSlice(buf)
+	}
 }
 
 func (p *param) Name() string     { return p.name }