P4 to Git Change 1766904 by michliao@hliao-dev-00-hip.rocm-workspace on 2019/04/08 14:42:29

SWDEV-145570 - Check host_context when matching GPU device.

	- In CL#1766264, `host_context` is introduced for mGPU support. Need to
	  match that context specially when trying to match GPU device context.

	The following tests passed:
	$ python test_dataloader.py TestDictDataLoader.test_pin_memory
	.
	----------------------------------------------------------------------
	Ran 1 test in 0.004s

	OK
	$ python test_dataloader.py TestDataLoader.test_sequential_pin_memory
	.
	----------------------------------------------------------------------
	Ran 1 test in 0.063s

	OK
	$ python test_dataloader.py TestDataLoader.test_shuffle_pin_memory
	.
	----------------------------------------------------------------------
	Ran 1 test in 0.174s

	OK
	$ python test_dataloader.py TestStringDataLoader.test_shuffle_pin_memory
	.
	----------------------------------------------------------------------
	Ran 1 test in 0.104s

	OK
	$ python test_torch.py TestTorch.test_pin_memory
	.
	----------------------------------------------------------------------
	Ran 1 test in 0.124s

	OK

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/hip/hip_memory.cpp#52 edit

api/hip/hip_memory.cpp

@@ -1456,6 +1456,8 @@ hipError_t hipPointerGetAttributes(hipPointerAttribute_t* attributes, const void
     attributes->allocationFlags = memObj->getMemFlags() >> 16;
 
     amd::Context &memObjCtx = memObj->getContext();
+    if (*hip::host_context == memObjCtx)
+        HIP_RETURN(hipSuccess);
     for (auto& ctx : g_devices) {
       if (*ctx == memObjCtx) {
         attributes->device = device;