From 8ad4fd45bcadc43c559cec34f4e45ca7df3c4c6c Mon Sep 17 00:00:00 2001 From: Aaron Greig Date: Wed, 29 Jan 2025 17:38:43 +0000 Subject: [PATCH] Remove unnecessary unique pointer from cl program helper. --- .../source/adapters/opencl/program.cpp | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/unified-runtime/source/adapters/opencl/program.cpp b/unified-runtime/source/adapters/opencl/program.cpp index 1682b8c0d02f1..3def9fc75293a 100644 --- a/unified-runtime/source/adapters/opencl/program.cpp +++ b/unified-runtime/source/adapters/opencl/program.cpp @@ -14,9 +14,9 @@ #include "device.hpp" #include "platform.hpp" -static ur_result_t getDevicesFromProgram( - ur_program_handle_t hProgram, - std::unique_ptr> &DevicesInProgram) { +static ur_result_t +getDevicesFromProgram(ur_program_handle_t hProgram, + std::vector &DevicesInProgram) { cl_uint DeviceCount; CL_RETURN_ON_FAILURE(clGetProgramInfo(cl_adapter::cast(hProgram), @@ -27,11 +27,11 @@ static ur_result_t getDevicesFromProgram( return UR_RESULT_ERROR_INVALID_CONTEXT; } - DevicesInProgram = std::make_unique>(DeviceCount); + DevicesInProgram.resize(DeviceCount); CL_RETURN_ON_FAILURE(clGetProgramInfo( cl_adapter::cast(hProgram), CL_PROGRAM_DEVICES, - DeviceCount * sizeof(cl_device_id), (*DevicesInProgram).data(), nullptr)); + DeviceCount * sizeof(cl_device_id), DevicesInProgram.data(), nullptr)); return UR_RESULT_SUCCESS; } @@ -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> DevicesInProgram; + std::vector DevicesInProgram; UR_RETURN_ON_FAILURE(getDevicesFromProgram(hProgram, DevicesInProgram)); CL_RETURN_ON_FAILURE(clCompileProgram(cl_adapter::cast(hProgram), - DevicesInProgram->size(), - DevicesInProgram->data(), pOptions, 0, + DevicesInProgram.size(), + DevicesInProgram.data(), pOptions, 0, nullptr, nullptr, nullptr, nullptr)); return UR_RESULT_SUCCESS; @@ -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> DevicesInProgram; + std::vector DevicesInProgram; UR_RETURN_ON_FAILURE(getDevicesFromProgram(hProgram, DevicesInProgram)); CL_RETURN_ON_FAILURE(clBuildProgram( - cl_adapter::cast(hProgram), DevicesInProgram->size(), - DevicesInProgram->data(), pOptions, nullptr, nullptr)); + cl_adapter::cast(hProgram), DevicesInProgram.size(), + DevicesInProgram.data(), pOptions, nullptr, nullptr)); return UR_RESULT_SUCCESS; }