Skip to content

Correctly set the num_devices argument of the clBuildProgram call. #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Correctly set the num_devices argument of the clBuildProgram call. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccf8b9c
Correctly set the num_devices argument of the clBuildProgram call.
robvanmieghem Jun 30, 2015
136dc23
Fix the includes for darwin and linux and the linux linking
robvanmieghem Jul 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion cl/cl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,12 @@ in the Go standard packages.
*/
package cl

// #include "cl.h"
// #ifdef __APPLE__
// #include "OpenCL/opencl.h"
// #else
// #include "CL/opencl.h"
// #endif
// #cgo linux LDFLAGS: -lOpenCL
// #cgo darwin LDFLAGS: -framework OpenCL
import "C"
import "errors"
Expand Down
6 changes: 5 additions & 1 deletion cl/context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
package cl

// #include <stdlib.h>
// #include "cl.h"
// #ifdef __APPLE__
// #include "OpenCL/opencl.h"
// #else
// #include "CL/opencl.h"
// #endif
import "C"

import (
Expand Down
6 changes: 5 additions & 1 deletion cl/device.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
package cl

// #include "cl.h"
// #ifdef __APPLE__
// #include "OpenCL/opencl.h"
// #else
// #include "CL/opencl.h"
// #endif
import "C"

import (
Expand Down
6 changes: 5 additions & 1 deletion cl/device12.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@

package cl

// #include "cl.h"
// #ifdef __APPLE__
// #include "OpenCL/opencl.h"
// #else
// #include "CL/opencl.h"
// #endif
import "C"
import "unsafe"

Expand Down
6 changes: 5 additions & 1 deletion cl/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@

package cl

// #include "cl.h"
// #ifdef __APPLE__
// #include "OpenCL/opencl.h"
// #else
// #include "CL/opencl.h"
// #endif
import "C"
import (
"image"
Expand Down
6 changes: 5 additions & 1 deletion cl/kernel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
package cl

// #include "cl.h"
// #ifdef __APPLE__
// #include "OpenCL/opencl.h"
// #else
// #include "CL/opencl.h"
// #endif
import "C"

import (
Expand Down
6 changes: 5 additions & 1 deletion cl/kernel12.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@

package cl

// #import "cl.h"
// #ifdef __APPLE__
// #include "OpenCL/opencl.h"
// #else
// #include "CL/opencl.h"
// #endif
import "C"
import "unsafe"

Expand Down
6 changes: 5 additions & 1 deletion cl/platform.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
package cl

// #include "cl.h"
// #ifdef __APPLE__
// #include "OpenCL/opencl.h"
// #else
// #include "CL/opencl.h"
// #endif
import "C"

import (
Expand Down
8 changes: 6 additions & 2 deletions cl/program.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
package cl

// #include <stdlib.h>
// #include "cl.h"
// #ifdef __APPLE__
// #include "OpenCL/opencl.h"
// #else
// #include "CL/opencl.h"
// #endif
import "C"

import (
Expand Down Expand Up @@ -40,7 +44,7 @@ func (p *Program) BuildProgram(devices []*Device, options string) error {
}
var deviceList []C.cl_device_id
var deviceListPtr *C.cl_device_id
numDevices := C.cl_uint(0)
numDevices := C.cl_uint(len(devices))
if devices != nil && len(devices) > 0 {
deviceList = buildDeviceIdList(devices)
deviceListPtr = &deviceList[0]
Expand Down
6 changes: 5 additions & 1 deletion cl/queue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
package cl

// #include "cl.h"
// #ifdef __APPLE__
// #include "OpenCL/opencl.h"
// #else
// #include "CL/opencl.h"
// #endif
import "C"

import (
Expand Down
6 changes: 5 additions & 1 deletion cl/queue12.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@

package cl

// #include "cl.h"
// #ifdef __APPLE__
// #include "OpenCL/opencl.h"
// #else
// #include "CL/opencl.h"
// #endif
import "C"
import

Expand Down
6 changes: 5 additions & 1 deletion cl/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
package cl

// #include "cl.h"
// #ifdef __APPLE__
// #include "OpenCL/opencl.h"
// #else
// #include "CL/opencl.h"
// #endif
import "C"

import (
Expand Down
6 changes: 5 additions & 1 deletion cl/types12.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@

package cl

// #include "cl.h"
// #ifdef __APPLE__
// #include "OpenCL/opencl.h"
// #else
// #include "CL/opencl.h"
// #endif
import "C"

const (
Expand Down
6 changes: 5 additions & 1 deletion cl/types_darwin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
package cl

// #include "cl.h"
// #ifdef __APPLE__
// #include "OpenCL/opencl.h"
// #else
// #include "CL/opencl.h"
// #endif
import "C"

// Extension: cl_APPLE_fixed_alpha_channel_orders
Expand Down