From ac7764c36d2faed8cd01cdbd79c2e2540146ff5f Mon Sep 17 00:00:00 2001 From: foreman Date: Thu, 3 Jan 2019 17:08:34 -0500 Subject: [PATCH] P4 to Git Change 1725828 by gandryey@gera-w8 on 2019/01/03 16:12:42 SWDEV-79445 - OCL generic changes and code clean-up - Add IS_LIGHTNING check for the rocr initialization, because currently for LC builds GPU_ENABLE_PAL is forced to 1. Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#241 edit [ROCm/clr commit: c65248d5a8ccde8c06991ebe8f4a200879d85514] --- projects/clr/rocclr/runtime/device/device.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/clr/rocclr/runtime/device/device.cpp b/projects/clr/rocclr/runtime/device/device.cpp index 8c0cbecf8a..ec568ba3d4 100644 --- a/projects/clr/rocclr/runtime/device/device.cpp +++ b/projects/clr/rocclr/runtime/device/device.cpp @@ -148,7 +148,8 @@ bool Device::init() { // GPU stack. The order of initialization is signiicant and if changed // amd::Device::registerDevice() must be accordingly modified. #if defined(WITH_HSA_DEVICE) - if (GPU_ENABLE_PAL != 1) { + // @todo remove IS_LIGHTNING check when PAL-LC builds will be deprecated + if ((GPU_ENABLE_PAL != 1) || IS_LIGHTNING) { // Return value of roc::Device::init() // If returned false, error initializing HSA stack. // If returned true, either HSA not installed or HSA stack