AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release_0.84.00' into privatestaging

Browse Source 
Conflicts:
	include/hcc_detail/hip_runtime.h
	src/hip_hcc.cpp
This commit is contained in:
Maneesh Gupta
2016-04-22 10:55:58 +05:30
parent 88a883c1a1 2ddade96d7
commit ffdf6ab23b
220 changed files with 5545 additions and 11003 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/hip_runtime_api.h
+3 -3
View File
@@ -30,7 +30,7 @@ THE SOFTWARE.
#include <string.h> // for getDeviceProp
#include <hip_common.h>
#include <hip/hip_common.h>
typedef struct {
// 32-bit Atomics
@@ -202,9 +202,9 @@ typedef enum hipDeviceAttribute_t {
*/
#if defined(__HIP_PLATFORM_HCC__) && !defined (__HIP_PLATFORM_NVCC__)
#include "hcc_detail/hip_runtime_api.h"
#include "hip/hcc_detail/hip_runtime_api.h"
#elif defined(__HIP_PLATFORM_NVCC__) && !defined (__HIP_PLATFORM_HCC__)
#include "nvcc_detail/hip_runtime_api.h"
#include "hip/nvcc_detail/hip_runtime_api.h"
#else
#error("Must define exactly one of __HIP_PLATFORM_HCC__ or __HIP_PLATFORM_NVCC__");
#endif