Conflicts:
	RELEASE.md
	include/hcc_detail/hip_hcc.h
	samples/1_Utils/hipInfo/hipInfo.cpp
	src/hip_hcc.cpp
	src/hip_peer.cpp


[ROCm/clr commit: 1cc0ea86a1]
Tá an tiomantas seo le fáil i:
Ben Sander
2016-04-11 09:17:27 -05:00
tuismitheoir 76c49bbaf4 0861e7a635
tiomantas d3356ba99f
D'athraigh 2 comhad le 0 breiseanna agus 2 scriosta
@@ -38,7 +38,6 @@ THE SOFTWARE.
// Compile peer-to-peer support.
// >= 2 : use HCC hc:accelerator::get_is_peer
// >= 3 : use hc::am_memtracker_update_peers(...)
#define USE_PEER_TO_PEER 1
// Use new lock API in HCC:
#define USE_HCC_LOCK 0