Merge pull request #550 from notoraptor/fix-opencl-device-detection

abergeron · web-flow · commit 6710220894ee · 2017-10-13T19:10:01.000-04:00
Fix device number formatting for OpenCL.
diff --git a/src/gpuarray_buffer.c b/src/gpuarray_buffer.c
@@ -56,7 +56,7 @@ int gpucontext_props_cuda_dev(gpucontext_props *p, int devno) {
 }
 
 int gpucontext_props_opencl_dev(gpucontext_props *p, int platno, int devno) {
-  p->dev = platno << 16 || devno;
+  p->dev = (platno << 16) | devno;
   return GA_NO_ERROR;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ int gpucontext_props_cuda_dev(gpucontext_props *p, int devno) {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`int gpucontext_props_opencl_dev(gpucontext_props *p, int platno, int devno) {`
`59`		`- p->dev = platno << 16 \|\| devno;`
	`59`	`+ p->dev = (platno << 16) \| devno;`
`60`	`60`	`return GA_NO_ERROR;`
`61`	`61`	`}`
`62`	`62`