From f604eeee8e109285a63755c746ecb383e5210fc0 Mon Sep 17 00:00:00 2001 From: foreman Date: Thu, 21 Jul 2016 17:49:57 -0400 Subject: [PATCH] P4 to Git Change 1294133 by gandryey@gera-w8 on 2016/07/21 17:22:33 SWDEV-95007 - OpenCL on PAL (Windows) - Disable GPU backend with PAL compilation. It was unintentionally enabled with CL#1293210 Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#197 edit [ROCm/clr commit: 1095516dcae53c1b938abff76fa5c0888512e407] --- projects/clr/rocclr/runtime/device/device.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/clr/rocclr/runtime/device/device.cpp b/projects/clr/rocclr/runtime/device/device.cpp index fca61e1ea7..2d00917be8 100644 --- a/projects/clr/rocclr/runtime/device/device.cpp +++ b/projects/clr/rocclr/runtime/device/device.cpp @@ -184,7 +184,7 @@ Device::init() ret |= roc::NullDevice::init(); } #endif // WITH_HSA_DEVICE -#if defined(WITH_GPU_DEVICE) +#if defined(WITH_GPU_DEVICE) && !defined(WITH_PAL_DEVICE) ret |= DeviceLoad(); #endif // WITH_GPU_DEVICE #if defined(WITH_PAL_DEVICE) @@ -213,7 +213,7 @@ Device::tearDown() rocAppProfile_ = NULL; } #endif // WITH_HSA_DEVICE -#if defined(WITH_GPU_DEVICE) +#if defined(WITH_GPU_DEVICE) && !defined(WITH_PAL_DEVICE) DeviceUnload(); #endif // WITH_GPU_DEVICE #if defined(WITH_PAL_DEVICE)