Merge branch 'block_jacobi' of github.com:UK-MAC/TeaLeaf_OpenCL into block_jacobi

Michael Boulton · Michael Boulton · commit 3271b8e57059 · 2015-04-14T10:13:59.000+01:00
diff --git a/ocl_kernels.cpp b/ocl_kernels.cpp
@@ -26,7 +26,7 @@ void CloverChunk::initProgram
     // if it doesn't subdivide exactly, need to make sure it doesn't go off the edge - rather expensive check
     if (y_max % JACOBI_BLOCK_SIZE)
     {
-        options << "-DBLOCK_TOP=MIN((int)(y_max-row),(int)" << JACOBI_BLOCK_SIZE << ") ";
+        options << "-DBLOCK_TOP=\"MIN((int)(y_max-row),(int)" << JACOBI_BLOCK_SIZE << ")\" ";
     }
     else
     {

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ void CloverChunk::initProgram`
`26`	`26`	`// if it doesn't subdivide exactly, need to make sure it doesn't go off the edge - rather expensive check`
`27`	`27`	`if (y_max % JACOBI_BLOCK_SIZE)`
`28`	`28`	`{`
`29`		`- options << "-DBLOCK_TOP=MIN((int)(y_max-row),(int)" << JACOBI_BLOCK_SIZE << ") ";`
	`29`	`+ options << "-DBLOCK_TOP=\"MIN((int)(y_max-row),(int)" << JACOBI_BLOCK_SIZE << ")\" ";`
`30`	`30`	`}`
`31`	`31`	`else`
`32`	`32`	`{`