From 01bc11ead1d1f41960301f844e338d00a4848913 Mon Sep 17 00:00:00 2001 From: foreman Date: Thu, 21 Jan 2016 11:56:58 -0500 Subject: [PATCH] P4 to Git Change 1229824 by bwicakso@opencl-hsa-stg-bwicakso on 2016/01/21 11:45:50 SWDEV-82353 - Remove assert and only assign the customHostAllocDevice_ with the first device that has customHostAllocator. Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/platform/context.cpp#38 edit [ROCm/clr commit: 7bf5bb51b5775526b867bb6829427a38be532666] --- projects/clr/rocclr/runtime/platform/context.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/projects/clr/rocclr/runtime/platform/context.cpp b/projects/clr/rocclr/runtime/platform/context.cpp index d015c29b93..5a3c24bf94 100644 --- a/projects/clr/rocclr/runtime/platform/context.cpp +++ b/projects/clr/rocclr/runtime/platform/context.cpp @@ -31,9 +31,7 @@ Context::Context( { for (const auto& device : devices) { device->retain(); - if (device->customHostAllocator()) { - assert(!customHostAllocDevice_ && "Only one custom host allocator " - "is allowed per context"); + if (customHostAllocDevice_ == NULL && device->customHostAllocator()) { customHostAllocDevice_ = device; } if (device->svmSupport()) {