Skip to content
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

add string overloads for options and kernel names #290

Merged
merged 1 commit into from
Apr 25, 2024
Merged

add string overloads for options and kernel names #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
102 changes: 93 additions & 9 deletions include/CL/opencl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1143,7 +1143,6 @@ inline cl_int getInfoHelper(Func f, cl_uint name, vector<vector<unsigned char>>*
}
}


return CL_SUCCESS;
}

Expand Down Expand Up @@ -5918,6 +5917,7 @@ Local(size_type size)
class Kernel : public detail::Wrapper<cl_kernel>
{
public:
inline Kernel(const Program& program, const string& name, cl_int* err = nullptr);
inline Kernel(const Program& program, const char* name, cl_int* err = nullptr);

//! \brief Default constructor - initializes to nullptr.
Expand Down Expand Up @@ -6396,7 +6396,6 @@ class Program : public detail::Wrapper<cl_program>
}
}


#if defined(CL_HPP_USE_IL_KHR) || CL_HPP_TARGET_OPENCL_VERSION >= 210
/**
* Program constructor to allow construction of program from SPIR-V or another IL.
Expand Down Expand Up @@ -6546,7 +6545,6 @@ class Program : public detail::Wrapper<cl_program>
return;
}


vector<size_type> lengths(numDevices);
vector<const unsigned char*> images(numDevices);
#if !defined(CL_HPP_ENABLE_PROGRAM_CONSTRUCTION_FROM_ARRAY_COMPATIBILITY)
Expand All @@ -6560,7 +6558,7 @@ class Program : public detail::Wrapper<cl_program>
lengths[i] = binaries[(int)i].second;
}
#endif // #if !defined(CL_HPP_ENABLE_PROGRAM_CONSTRUCTION_FROM_ARRAY_COMPATIBILITY)

vector<cl_device_id> deviceIDs(numDevices);
for( size_type deviceIndex = 0; deviceIndex < numDevices; ++deviceIndex ) {
deviceIDs[deviceIndex] = (devices[deviceIndex])();
Expand All @@ -6569,7 +6567,7 @@ class Program : public detail::Wrapper<cl_program>
if(binaryStatus) {
binaryStatus->resize(numDevices);
}

object_ = ::clCreateProgramWithBinary(
context(), (cl_uint) devices.size(),
deviceIDs.data(),
Expand Down Expand Up @@ -6636,6 +6634,14 @@ class Program : public detail::Wrapper<cl_program>
return *this;
}

cl_int build(
const vector<Device>& devices,
const string& options,
void (CL_CALLBACK * notifyFptr)(cl_program, void *) = nullptr,
void* data = nullptr) const
{
return build(devices, options.c_str(), notifyFptr, data);
}

cl_int build(
const vector<Device>& devices,
Expand All @@ -6645,7 +6651,7 @@ class Program : public detail::Wrapper<cl_program>
{
size_type numDevices = devices.size();
vector<cl_device_id> deviceIDs(numDevices);

for( size_type deviceIndex = 0; deviceIndex < numDevices; ++deviceIndex ) {
deviceIDs[deviceIndex] = (devices[deviceIndex])();
}
Expand All @@ -6662,6 +6668,15 @@ class Program : public detail::Wrapper<cl_program>
return detail::buildErrHandler(buildError, __BUILD_PROGRAM_ERR, getBuildInfo<CL_PROGRAM_BUILD_LOG>());
}

cl_int build(
const Device& device,
const string& options,
void (CL_CALLBACK * notifyFptr)(cl_program, void *) = nullptr,
void* data = nullptr) const
{
return build(device, options.c_str(), notifyFptr, data);
}

cl_int build(
const Device& device,
const char* options = nullptr,
Expand All @@ -6683,6 +6698,14 @@ class Program : public detail::Wrapper<cl_program>
return detail::buildErrHandler(buildError, __BUILD_PROGRAM_ERR, buildLog);
}

cl_int build(
const string& options,
void (CL_CALLBACK * notifyFptr)(cl_program, void *) = nullptr,
void* data = nullptr) const
{
return build(options.c_str(), notifyFptr, data);
}

cl_int build(
const char* options = nullptr,
void (CL_CALLBACK * notifyFptr)(cl_program, void *) = nullptr,
Expand All @@ -6700,6 +6723,14 @@ class Program : public detail::Wrapper<cl_program>
}

#if CL_HPP_TARGET_OPENCL_VERSION >= 120
cl_int compile(
const string& options,
void (CL_CALLBACK * notifyFptr)(cl_program, void *) = nullptr,
void* data = nullptr) const
{
return compile(options.c_str(), notifyFptr, data);
}

cl_int compile(
const char* options = nullptr,
void (CL_CALLBACK * notifyFptr)(cl_program, void *) = nullptr,
Expand All @@ -6724,6 +6755,16 @@ class Program : public detail::Wrapper<cl_program>
const vector<string>& headerIncludeNames,
void (CL_CALLBACK * notifyFptr)(cl_program, void *) = nullptr,
void* data = nullptr) const
{
return compile(options.c_str(), inputHeaders, headerIncludeNames, notifyFptr, data);
}

cl_int compile(
const char* options,
const vector<Program>& inputHeaders,
const vector<string>& headerIncludeNames,
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");
Expand All @@ -6735,7 +6776,7 @@ class Program : public detail::Wrapper<cl_program>
object_,
0,
nullptr,
options.c_str(),
options,
static_cast<cl_uint>(inputHeaders.size()),
reinterpret_cast<const cl_program*>(inputHeaders.data()),
reinterpret_cast<const char**>(headerIncludeNamesCStr.data()),
Expand All @@ -6751,6 +6792,17 @@ class Program : public detail::Wrapper<cl_program>
const vector<string>& headerIncludeNames = vector<string>(),
void (CL_CALLBACK * notifyFptr)(cl_program, void *) = nullptr,
void* data = nullptr) const
{
return compile(options.c_str(), deviceList, inputHeaders, headerIncludeNames, notifyFptr, data);
}

cl_int compile(
const char* options,
const vector<Device>& deviceList,
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");
Expand All @@ -6766,7 +6818,7 @@ class Program : public detail::Wrapper<cl_program>
object_,
static_cast<cl_uint>(deviceList.size()),
reinterpret_cast<const cl_device_id*>(deviceIDList.data()),
options.c_str(),
options,
static_cast<cl_uint>(inputHeaders.size()),
reinterpret_cast<const cl_program*>(inputHeaders.data()),
reinterpret_cast<const char**>(headerIncludeNamesCStr.data()),
Expand Down Expand Up @@ -6989,6 +7041,17 @@ inline Program linkProgram(
return Program(prog);
}

inline Program linkProgram(
const Program& input1,
const Program& input2,
const string& options,
void (CL_CALLBACK * notifyFptr)(cl_program, void *) = nullptr,
void* data = nullptr,
cl_int* err = nullptr)
{
return linkProgram(input1, input2, options.c_str(), notifyFptr, data, err);
}

inline Program linkProgram(
const vector<Program>& inputPrograms,
const char* options = nullptr,
Expand Down Expand Up @@ -7027,6 +7090,16 @@ inline Program linkProgram(

return Program(prog);
}

inline Program linkProgram(
const vector<Program>& inputPrograms,
const string& options,
void (CL_CALLBACK * notifyFptr)(cl_program, void *) = nullptr,
void* data = nullptr,
cl_int* err = nullptr)
{
return linkProgram(inputPrograms, options.c_str(), notifyFptr, data, err);
}
#endif // CL_HPP_TARGET_OPENCL_VERSION >= 120

// Template specialization for CL_PROGRAM_BINARIES
Expand Down Expand Up @@ -7085,6 +7158,18 @@ inline cl_int cl::Program::setSpecializationConstant(cl_uint index, const bool &
}
#endif // CL_HPP_TARGET_OPENCL_VERSION >= 220

inline Kernel::Kernel(const Program& program, const string& name, cl_int* err)
{
cl_int error;

object_ = ::clCreateKernel(program(), name.c_str(), &error);
detail::errHandler(error, __CREATE_KERNEL_ERR);

if (err != nullptr) {
*err = error;
}
}

inline Kernel::Kernel(const Program& program, const char* name, cl_int* err)
{
cl_int error;
Expand All @@ -7095,7 +7180,6 @@ inline Kernel::Kernel(const Program& program, const char* name, cl_int* err)
if (err != nullptr) {
*err = error;
}

}

#ifdef cl_khr_external_memory
Expand Down
Loading
Loading