From 7883f1e6f7bfdc2e6eb86860560b65544c16d9ab Mon Sep 17 00:00:00 2001 From: German Date: Wed, 13 Dec 2023 14:32:45 -0500 Subject: [PATCH] SWDEV-430809 - Replace hipErrorSharedObjectInitFailed vs hipErrorNoBinaryForGpu hipErrorSharedObjectInitFailed should be used for interop objects. Change-Id: Id3bcffaac3b511021f2fd57e9b156a897b646db0 [ROCm/clr commit: 68d442f29ae6d68b278261a413032699c5e03dd5] --- projects/clr/hipamd/src/hip_fatbin.cpp | 4 ++-- projects/clr/hipamd/src/hip_global.cpp | 2 +- projects/clr/hipamd/src/hip_platform.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/clr/hipamd/src/hip_fatbin.cpp b/projects/clr/hipamd/src/hip_fatbin.cpp index cede736bdc..3367ee82e5 100644 --- a/projects/clr/hipamd/src/hip_fatbin.cpp +++ b/projects/clr/hipamd/src/hip_fatbin.cpp @@ -419,13 +419,13 @@ hipError_t FatBinaryInfo::BuildProgram(const int device_id) { if(CL_SUCCESS != fbd_info->program_->build(g_devices[device_id]->devices(), nullptr, nullptr, nullptr, kOptionChangeable, kNewDevProg)) { - return hipErrorSharedObjectInitFailed; + return hipErrorNoBinaryForGpu; } fbd_info->prog_built_ = true; } if (!fbd_info->program_->load()) { - return hipErrorSharedObjectInitFailed; + return hipErrorNoBinaryForGpu; } return hipSuccess; } diff --git a/projects/clr/hipamd/src/hip_global.cpp b/projects/clr/hipamd/src/hip_global.cpp index b12d566ad9..70a3239fb8 100644 --- a/projects/clr/hipamd/src/hip_global.cpp +++ b/projects/clr/hipamd/src/hip_global.cpp @@ -151,7 +151,7 @@ hipError_t Function::getStatFunc(hipFunction_t* hfunc, int deviceId) { guarantee(modules_ != nullptr, "Module not initialized"); if (dFunc_.size() != g_devices.size()) { - return hipErrorSharedObjectInitFailed; + return hipErrorNoBinaryForGpu; } hipModule_t hmod = nullptr; diff --git a/projects/clr/hipamd/src/hip_platform.cpp b/projects/clr/hipamd/src/hip_platform.cpp index 2ace8e3174..614cf23d39 100644 --- a/projects/clr/hipamd/src/hip_platform.cpp +++ b/projects/clr/hipamd/src/hip_platform.cpp @@ -598,7 +598,7 @@ hipError_t ihipLaunchKernel(const void* hostFunction, dim3 gridDim, dim3 blockDi int deviceId = hip::Stream::DeviceId(stream); hipError_t hip_error = PlatformState::instance().getStatFunc(&func, hostFunction, deviceId); if ((hip_error != hipSuccess) || (func == nullptr)) { - if (hip_error == hipErrorSharedObjectInitFailed) { + if (hip_error == hipErrorNoBinaryForGpu) { return hip_error; } else { return hipErrorInvalidDeviceFunction;