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


[ROCm/hip commit: 31dc13d2ec]
This commit is contained in:
Ben Sander committed 2016-04-11 09:17:27 -05:00
melakukan 5060403b2a
2 files changed
-2

No files matched your search

@@ -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