Skip to content

Add empty checks #339

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

Merged
bashbaug merged 3 commits into from
Feb 25, 2026
Merged

Add empty checks #339

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6854f63
add checks for empty vectors
bashbaug Jan 16, 2026
e08431a
add more tests
bashbaug Jan 16, 2026
d91dea8
refactor buffer and image creation with properties
bashbaug Jan 16, 2026
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
130 changes: 79 additions & 51 deletions include/CL/opencl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3393,8 +3393,9 @@ class Context
}

object_ = CL_(clCreateContext)(
properties, (cl_uint) numDevices,
deviceIDs.data(),
properties,
(cl_uint)deviceIDs.size(),
deviceIDs.empty() ? nullptr : deviceIDs.data(),
notifyFptr, data, &error);

detail::errHandler(error, __CREATE_CONTEXT_ERR);
Expand Down Expand Up @@ -6463,10 +6464,11 @@ class Kernel : public detail::Wrapper<cl_kernel>
/*! \brief setArg overload taking a vector type.
*/
template<typename T, class Alloc>
cl_int setArg(cl_uint index, const cl::vector<T, Alloc> &argPtr)
cl_int setArg(cl_uint index, const cl::vector<T, Alloc> &arg)
{
return detail::errHandler(
CL_(clSetKernelArgSVMPointer)(object_, index, argPtr.data()),
CL_(clSetKernelArgSVMPointer)(object_, index,
arg.empty() ? nullptr : arg.data()),
__SET_KERNEL_ARGS_ERR);
}

Expand Down Expand Up @@ -6515,8 +6517,8 @@ class Kernel : public detail::Wrapper<cl_kernel>
CL_(clSetKernelExecInfo)(
object_,
CL_KERNEL_EXEC_INFO_SVM_PTRS,
sizeof(void*)*pointerList.size(),
pointerList.data()));
sizeof(void*) * pointerList.size(),
pointerList.empty() ? nullptr : pointerList.data()));
}

/*!
Expand All @@ -6530,8 +6532,8 @@ class Kernel : public detail::Wrapper<cl_kernel>
CL_(clSetKernelExecInfo)(
object_,
CL_KERNEL_EXEC_INFO_SVM_PTRS,
sizeof(void*)*pointerList.size(),
pointerList.data()));
sizeof(void*) * pointerList.size(),
pointerList.empty() ? nullptr : pointerList.data()));
}

/*! \brief Enable fine-grained system SVM.
Expand Down Expand Up @@ -6597,7 +6599,7 @@ class Kernel : public detail::Wrapper<cl_kernel>
CL_(clSetKernelExecInfo)(
object_,
CL_KERNEL_EXEC_INFO_SVM_PTRS,
sizeof(void*)*(1 + sizeof...(Ts)),
sizeof(void*) * (1 + sizeof...(Ts)),
pointerList.data()));
}

Expand Down Expand Up @@ -6753,7 +6755,10 @@ class Program : public detail::Wrapper<cl_program>
}

object_ = CL_(clCreateProgramWithSource)(
context(), (cl_uint)n, strings.data(), lengths.data(), &error);
context(), (cl_uint)n,
strings.empty() ? nullptr : strings.data(),
lengths.empty() ? nullptr : lengths.data(),
&error);

detail::errHandler(error, __CREATE_PROGRAM_WITH_SOURCE_ERR);
if (err != nullptr) {
Expand Down Expand Up @@ -6788,7 +6793,10 @@ class Program : public detail::Wrapper<cl_program>
}

object_ = CL_(clCreateProgramWithSource)(
context(), (cl_uint)n, strings.data(), lengths.data(), &error);
context(), (cl_uint)n,
strings.empty() ? nullptr : strings.data(),
lengths.empty() ? nullptr : lengths.data(),
&error);

detail::errHandler(error, __CREATE_PROGRAM_WITH_SOURCE_ERR);
if (err != nullptr) {
Expand Down Expand Up @@ -6969,11 +6977,15 @@ class Program : public detail::Wrapper<cl_program>
}

object_ = CL_(clCreateProgramWithBinary)(
context(), (cl_uint) devices.size(),
deviceIDs.data(),
lengths.data(), images.data(), (binaryStatus != nullptr && numDevices > 0)
context(),
(cl_uint)deviceIDs.size(),
deviceIDs.empty() ? nullptr : deviceIDs.data(),
lengths.empty() ? nullptr : lengths.data(),
images.empty() ? nullptr : images.data(),
(binaryStatus != nullptr && numDevices > 0)
? &binaryStatus->front()
: nullptr, &error);
: nullptr,
&error);

detail::errHandler(error, __CREATE_PROGRAM_WITH_BINARY_ERR);
if (err != nullptr) {
Expand All @@ -6995,7 +7007,6 @@ class Program : public detail::Wrapper<cl_program>
{
cl_int error;


size_type numDevices = devices.size();
vector<cl_device_id> deviceIDs(numDevices);
for( size_type deviceIndex = 0; deviceIndex < numDevices; ++deviceIndex ) {
Expand All @@ -7004,8 +7015,8 @@ class Program : public detail::Wrapper<cl_program>

object_ = CL_(clCreateProgramWithBuiltInKernels)(
context(),
(cl_uint) devices.size(),
deviceIDs.data(),
(cl_uint)deviceIDs.size(),
deviceIDs.empty() ? nullptr : deviceIDs.data(),
kernelNames.c_str(),
&error);

Expand Down Expand Up @@ -7058,9 +7069,8 @@ class Program : public detail::Wrapper<cl_program>

cl_int buildError = CL_(clBuildProgram)(
object_,
(cl_uint)
devices.size(),
deviceIDs.data(),
(cl_uint)deviceIDs.size(),
deviceIDs.empty() ? nullptr : deviceIDs.data(),
options,
notifyFptr,
data);
Expand Down Expand Up @@ -7168,18 +7178,20 @@ class Program : public detail::Wrapper<cl_program>
{
static_assert(sizeof(cl::Program) == sizeof(cl_program),
"Size of cl::Program must be equal to size of cl_program");

vector<const char*> headerIncludeNamesCStr;
for(const string& name: headerIncludeNames) {
headerIncludeNamesCStr.push_back(name.c_str());
}

cl_int error = CL_(clCompileProgram)(
object_,
0,
nullptr,
options,
static_cast<cl_uint>(inputHeaders.size()),
reinterpret_cast<const cl_program*>(inputHeaders.data()),
reinterpret_cast<const char**>(headerIncludeNamesCStr.data()),
reinterpret_cast<const cl_program*>(inputHeaders.empty() ? nullptr : inputHeaders.data()),
reinterpret_cast<const char**>(headerIncludeNamesCStr.empty() ? nullptr : headerIncludeNamesCStr.data()),
notifyFptr,
data);
return detail::buildErrHandler(error, __COMPILE_PROGRAM_ERR, getBuildInfo<CL_PROGRAM_BUILD_LOG>());
Expand All @@ -7198,30 +7210,33 @@ class Program : public detail::Wrapper<cl_program>

cl_int compile(
const char* options,
const vector<Device>& deviceList,
const vector<Device>& devices,
const vector<Program>& inputHeaders = vector<Program>(),
const vector<string>& headerIncludeNames = vector<string>(),
void (CL_CALLBACK * notifyFptr)(cl_program, void *) = nullptr,
void* data = nullptr) const
{
static_assert(sizeof(cl::Program) == sizeof(cl_program),
"Size of cl::Program must be equal to size of cl_program");

vector<cl_device_id> deviceIDs;
for(const Device& device: devices) {
deviceIDs.push_back(device());
}
Comment on lines +7197 to +7200
Copy link
Copy Markdown
Contributor

@jansol jansol Jan 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't the idea that the in-memory representation of the wrapper class objects is == the underlying handles? From a quick look my understanding is that this should be the case for Device too.

Copy link
Copy Markdown
Contributor Author

@bashbaug bashbaug Jan 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's the general idea, yes, but device objects are an exception since they have an extra variable:

template <>
class Wrapper<cl_device_id>
{
public:
    typedef cl_device_id cl_type;

protected:
    cl_type object_;
    bool referenceCountable_;
...

There might be a better way to do this, but I think it's outside of the scope of this PR...

Copy link
Copy Markdown
Contributor

@jansol jansol Jan 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I missed that 2nd field. Yea that's a whole separate topic then.


vector<const char*> headerIncludeNamesCStr;
for(const string& name: headerIncludeNames) {
headerIncludeNamesCStr.push_back(name.c_str());
}
vector<cl_device_id> deviceIDList;
for(const Device& device: deviceList) {
deviceIDList.push_back(device());
}

cl_int error = CL_(clCompileProgram)(
object_,
static_cast<cl_uint>(deviceList.size()),
reinterpret_cast<const cl_device_id*>(deviceIDList.data()),
static_cast<cl_uint>(deviceIDs.size()),
reinterpret_cast<const cl_device_id*>(deviceIDs.empty() ? nullptr : deviceIDs.data()),
options,
static_cast<cl_uint>(inputHeaders.size()),
reinterpret_cast<const cl_program*>(inputHeaders.data()),
reinterpret_cast<const char**>(headerIncludeNamesCStr.data()),
reinterpret_cast<const cl_program*>(inputHeaders.empty() ? nullptr : inputHeaders.data()),
reinterpret_cast<const char**>(headerIncludeNamesCStr.empty() ? nullptr : headerIncludeNamesCStr.data()),
notifyFptr,
data);
return detail::buildErrHandler(error, __COMPILE_PROGRAM_ERR, getBuildInfo<CL_PROGRAM_BUILD_LOG>());
Expand Down Expand Up @@ -7325,9 +7340,11 @@ class Program : public detail::Wrapper<cl_program>
}

vector<cl_kernel> value(numKernels);

err = CL_(clCreateKernelsInProgram)(
object_, numKernels, value.data(), nullptr);
object_,
numKernels,
value.empty() ? nullptr : value.data(),
nullptr);
if (err != CL_SUCCESS) {
return detail::errHandler(err, __CREATE_KERNELS_IN_PROGRAM_ERR);
}
Expand Down Expand Up @@ -7478,7 +7495,7 @@ inline Program linkProgram(
nullptr,
options,
static_cast<cl_uint>(inputPrograms.size()),
reinterpret_cast<const cl_program *>(inputPrograms.data()),
reinterpret_cast<const cl_program *>(inputPrograms.empty() ? nullptr : inputPrograms.data()),
notifyFptr,
data,
&error_local);
Expand Down Expand Up @@ -8921,12 +8938,13 @@ class CommandQueue : public detail::Wrapper<cl_command_queue>
return detail::errHandler(CL_INVALID_VALUE,__ENQUEUE_COPY_SVM_ERR);
}
cl_int err = detail::errHandler(CL_(clEnqueueSVMMemcpy)(
object_, blocking, static_cast<void *>(dst_container.data()),
static_cast<const void *>(src_container.data()),
object_, blocking,
dst_container.empty() ? nullptr : dst_container.data(),
src_container.empty() ? nullptr : src_container.data(),
dst_container.size() * sizeof(T),
(events != nullptr) ? (cl_uint) events->size() : 0,
(events != nullptr && events->size() > 0) ? (const cl_event *) &events->front() : nullptr,
(event != NULL) ? &tmp : nullptr), __ENQUEUE_COPY_SVM_ERR);
(event != nullptr) ? &tmp : nullptr), __ENQUEUE_COPY_SVM_ERR);

if (event != nullptr && err == CL_SUCCESS)
*event = tmp;
Expand Down Expand Up @@ -8997,8 +9015,11 @@ class CommandQueue : public detail::Wrapper<cl_command_queue>
{
cl_event tmp;
cl_int err = detail::errHandler(CL_(clEnqueueSVMMemFill)(
object_, static_cast<void *>(container.data()), static_cast<void *>(&pattern),
sizeof(PatternType), container.size() * sizeof(T),
object_,
container.empty() ? nullptr : container.data(),
&pattern,
sizeof(PatternType),
container.size() * sizeof(T),
(events != nullptr) ? (cl_uint) events->size() : 0,
(events != nullptr && events->size() > 0) ? (const cl_event *) &events->front() : nullptr,
(event != nullptr) ? &tmp : NULL), __ENQUEUE_FILL_SVM_ERR);
Expand Down Expand Up @@ -9078,7 +9099,9 @@ class CommandQueue : public detail::Wrapper<cl_command_queue>
{
cl_event tmp;
cl_int err = detail::errHandler(CL_(clEnqueueSVMMap)(
object_, blocking, flags, static_cast<void*>(container.data()), container.size()*sizeof(T),
object_, blocking, flags,
container.empty() ? nullptr : container.data(),
container.size() * sizeof(T),
(events != nullptr) ? (cl_uint)events->size() : 0,
(events != nullptr && events->size() > 0) ? (const cl_event*)&events->front() : nullptr,
(event != nullptr) ? &tmp : nullptr),
Expand Down Expand Up @@ -9177,7 +9200,8 @@ class CommandQueue : public detail::Wrapper<cl_command_queue>
cl_event tmp;
cl_int err = detail::errHandler(
CL_(clEnqueueSVMUnmap)(
object_, static_cast<void*>(container.data()),
object_,
container.empty() ? nullptr : container.data(),
(events != nullptr) ? (cl_uint)events->size() : 0,
(events != nullptr && events->size() > 0) ? (const cl_event*)&events->front() : nullptr,
(event != nullptr) ? &tmp : nullptr),
Expand Down Expand Up @@ -9274,7 +9298,7 @@ class CommandQueue : public detail::Wrapper<cl_command_queue>
CL_(clEnqueueMigrateMemObjects)(
object_,
(cl_uint)memObjects.size(),
localMemObjects.data(),
localMemObjects.empty() ? nullptr : localMemObjects.data(),
flags,
(events != nullptr) ? (cl_uint) events->size() : 0,
(events != nullptr && events->size() > 0) ? (const cl_event*) &events->front() : nullptr,
Expand Down Expand Up @@ -9306,8 +9330,9 @@ class CommandQueue : public detail::Wrapper<cl_command_queue>
cl_event tmp;
cl_int err = detail::errHandler(CL_(clEnqueueSVMMigrateMem)(
object_,
svmRawPointers.size(), static_cast<void**>(svmRawPointers.data()),
sizes.data(), // array of sizes not passed
svmRawPointers.size(),
svmRawPointers.empty() ? nullptr : svmRawPointers.data(),
sizes.empty() ? nullptr : sizes.data(),
flags,
(events != nullptr) ? (cl_uint)events->size() : 0,
(events != nullptr && events->size() > 0) ? (const cl_event*)&events->front() : nullptr,
Expand Down Expand Up @@ -9676,7 +9701,7 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *PFN_clEnqueueReleaseD3D10ObjectsKHR)(
err = pfn_clEnqueueAcquireExternalMemObjectsKHR(
object_,
static_cast<cl_uint>(mem_objects.size()),
(mem_objects.size() > 0) ? reinterpret_cast<const cl_mem *>(mem_objects.data()) : nullptr,
reinterpret_cast<const cl_mem *>(mem_objects.empty() ? nullptr : mem_objects.data()),
(events_wait != nullptr) ? static_cast<cl_uint>(events_wait->size()) : 0,
(events_wait != nullptr && events_wait->size() > 0) ? reinterpret_cast<const cl_event*>(events_wait->data()) : nullptr,
&tmp);
Expand Down Expand Up @@ -9705,7 +9730,7 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *PFN_clEnqueueReleaseD3D10ObjectsKHR)(
err = pfn_clEnqueueReleaseExternalMemObjectsKHR(
object_,
static_cast<cl_uint>(mem_objects.size()),
(mem_objects.size() > 0) ? reinterpret_cast<const cl_mem *>(mem_objects.data()) : nullptr,
reinterpret_cast<const cl_mem *>(mem_objects.empty() ? nullptr : mem_objects.data()),
(events_wait != nullptr) ? static_cast<cl_uint>(events_wait->size()) : 0,
(events_wait != nullptr && events_wait->size() > 0) ? reinterpret_cast<const cl_event*>(events_wait->data()) : nullptr,
&tmp);
Expand Down Expand Up @@ -11337,7 +11362,7 @@ class Semaphore : public detail::Wrapper<cl_semaphore_khr>
{
object_ = pfn_clCreateSemaphoreWithPropertiesKHR(
context(),
sema_props.data(),
sema_props.empty() ? nullptr : sema_props.data(),
&error);
}

Expand Down Expand Up @@ -11931,7 +11956,7 @@ class CommandBufferKhr : public detail::Wrapper<cl_command_buffer_khr>
nullptr, // Properties
#endif
image(),
static_cast<void*>(&fillColor),
&fillColor,
origin.data(),
region.data(),
(sync_points_vec != nullptr) ? (cl_uint) sync_points_vec->size() : 0,
Expand Down Expand Up @@ -12010,8 +12035,11 @@ class CommandBufferKhr : public detail::Wrapper<cl_command_buffer_khr>
__UPDATE_MUTABLE_COMMANDS_KHR_ERR);
}
return detail::errHandler(
pfn_clUpdateMutableCommandsKHR(object_, static_cast<cl_uint>(configs.size()),
config_types.data(), configs.data()),
pfn_clUpdateMutableCommandsKHR(
object_,
static_cast<cl_uint>(configs.size()),
config_types.empty() ? nullptr : config_types.data(),
configs.empty() ? nullptr : configs.data()),
__UPDATE_MUTABLE_COMMANDS_KHR_ERR);
}
#endif /* CL_KHR_COMMAND_BUFFER_MUTABLE_DISPATCH_EXTENSION_VERSION */
Expand Down
Loading