Skip to content

[UR] Remove unnecessary unique pointer from cl program helper. #17101

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
kbenzie merged 3 commits into from
Mar 17, 2025
Merged

[UR] Remove unnecessary unique pointer from cl program helper. #17101

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ad4fd4
Remove unnecessary unique pointer from cl program helper.
aarongreig Jan 29, 2025
ce035c9
Merge branch 'sycl' into aaron/removeUnnecessaryUniquePtr
aarongreig Mar 7, 2025
733d3d2
Merge branch 'sycl' into aaron/removeUnnecessaryUniquePtr
aarongreig Mar 13, 2025
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
22 changes: 11 additions & 11 deletions unified-runtime/source/adapters/opencl/program.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
#include "device.hpp"
#include "platform.hpp"

static ur_result_t getDevicesFromProgram(
ur_program_handle_t hProgram,
std::unique_ptr<std::vector<cl_device_id>> &DevicesInProgram) {
static ur_result_t
getDevicesFromProgram(ur_program_handle_t hProgram,
std::vector<cl_device_id> &DevicesInProgram) {

cl_uint DeviceCount;
CL_RETURN_ON_FAILURE(clGetProgramInfo(cl_adapter::cast<cl_program>(hProgram),
Expand All @@ -27,11 +27,11 @@ static ur_result_t getDevicesFromProgram(
return UR_RESULT_ERROR_INVALID_CONTEXT;
}

DevicesInProgram = std::make_unique<std::vector<cl_device_id>>(DeviceCount);
DevicesInProgram.resize(DeviceCount);

CL_RETURN_ON_FAILURE(clGetProgramInfo(
cl_adapter::cast<cl_program>(hProgram), CL_PROGRAM_DEVICES,
DeviceCount * sizeof(cl_device_id), (*DevicesInProgram).data(), nullptr));
DeviceCount * sizeof(cl_device_id), DevicesInProgram.data(), nullptr));

return UR_RESULT_SUCCESS;
}
Expand Down Expand Up @@ -157,12 +157,12 @@ UR_APIEXPORT ur_result_t UR_APICALL
urProgramCompile([[maybe_unused]] ur_context_handle_t hContext,
ur_program_handle_t hProgram, const char *pOptions) {

std::unique_ptr<std::vector<cl_device_id>> DevicesInProgram;
std::vector<cl_device_id> DevicesInProgram;
UR_RETURN_ON_FAILURE(getDevicesFromProgram(hProgram, DevicesInProgram));

CL_RETURN_ON_FAILURE(clCompileProgram(cl_adapter::cast<cl_program>(hProgram),
DevicesInProgram->size(),
DevicesInProgram->data(), pOptions, 0,
DevicesInProgram.size(),
DevicesInProgram.data(), pOptions, 0,
nullptr, nullptr, nullptr, nullptr));

return UR_RESULT_SUCCESS;
Expand Down Expand Up @@ -215,12 +215,12 @@ UR_APIEXPORT ur_result_t UR_APICALL
urProgramBuild([[maybe_unused]] ur_context_handle_t hContext,
ur_program_handle_t hProgram, const char *pOptions) {

std::unique_ptr<std::vector<cl_device_id>> DevicesInProgram;
std::vector<cl_device_id> DevicesInProgram;
UR_RETURN_ON_FAILURE(getDevicesFromProgram(hProgram, DevicesInProgram));

CL_RETURN_ON_FAILURE(clBuildProgram(
cl_adapter::cast<cl_program>(hProgram), DevicesInProgram->size(),
DevicesInProgram->data(), pOptions, nullptr, nullptr));
cl_adapter::cast<cl_program>(hProgram), DevicesInProgram.size(),
DevicesInProgram.data(), pOptions, nullptr, nullptr));
return UR_RESULT_SUCCESS;
}

Expand Down
Loading