From 60e81906f59536e807eb52891ecc40ddb56f5935 Mon Sep 17 00:00:00 2001
From: foreman
Date: Mon, 4 Nov 2019 11:53:27 -0500
Subject: [PATCH] P4 to Git Change 2024314 by kjayapra@0_HIPWS_LNX1_ROCM on
2019/11/04 11:44:45
SWDEV-206759 - Fixing Compilation error.
Affected files ...
... //depot/stg/opencl/drivers/opencl/api/hip/hip_module.cpp#47 edit
---
api/hip/hip_module.cpp | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/api/hip/hip_module.cpp b/api/hip/hip_module.cpp
index 280e804570..5fa4c1f457 100644
--- a/api/hip/hip_module.cpp
+++ b/api/hip/hip_module.cpp
@@ -183,25 +183,13 @@ hipError_t ihipModuleLoadData(hipModule_t *module, const void *image)
program->setVarInfoCallBack(&getSvarInfo);
if (CL_SUCCESS != program->addDeviceProgram(*hip::getCurrentContext()->devices()[0], image, ElfSize(image))) {
->>>> ORIGINAL //depot/stg/opencl/drivers/opencl/api/hip/hip_module.cpp#44
- return hipErrorUnknown;
-==== THEIRS //depot/stg/opencl/drivers/opencl/api/hip/hip_module.cpp#45
return hipErrorInvalidKernelFile;
-==== YOURS //0_HIPWS_LNX1_ROCM/main/drivers/opencl/api/hip/hip_module.cpp
- return hipErrorUnknown;
-<<<<
}
*module = reinterpret_cast(as_cl(program));
if (!ihipModuleRegisterGlobal(program, module)) {
->>>> ORIGINAL //depot/stg/opencl/drivers/opencl/api/hip/hip_module.cpp#44
- return hipErrorUnknown;
-==== THEIRS //depot/stg/opencl/drivers/opencl/api/hip/hip_module.cpp#45
return hipErrorSharedObjectSymbolNotFound;
-==== YOURS //0_HIPWS_LNX1_ROCM/main/drivers/opencl/api/hip/hip_module.cpp
- return hipErrorUnknown;
-<<<<
}
if (!ihipModuleRegisterUndefined(program, module)) {