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

Merge branch 'release_0.84.00' of https://github.com/AMDComputeLibraries/HIP-privatestaging into release_0.84.00

Browse Source 
[ROCm/hip commit: 2ddade96d7]
This commit is contained in:
pensun
2016-04-20 09:48:52 -05:00
parent e2327b1b18 8f3bb9f4f7
commit b197cb30cb
102 changed files with 399 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/hip/include/hcc_detail/hip_runtime.h
+4 -4
View File
@@ -40,8 +40,8 @@ THE SOFTWARE.
#define CUDA_SUCCESS hipSuccess
#include <hip_runtime_api.h>
//#include "hcc_detail/hip_hcc.h"
#include <hip/hip_runtime_api.h>
//#include "hip/hcc_detail/hip_hcc.h"
//---
// Remainder of this file only compiles with HCC
#ifdef __HCC__
@@ -55,9 +55,9 @@ extern int HIP_TRACE_API;
//typedef grid_launch_parm hipLaunchParm ;
#define hipLaunchParm grid_launch_parm
#ifdef __cplusplus
#include <hcc_detail/hip_texture.h>
#include <hip/hcc_detail/hip_texture.h>
#endif
#include <hcc_detail/host_defines.h>
#include <hip/hcc_detail/host_defines.h>
// TODO-HCC remove old definitions ; ~1602 hcc supports __HCC_ACCELERATOR__ define.
#if defined (__KALMAR_ACCELERATOR__) && !defined (__HCC_ACCELERATOR__)
#define __HCC_ACCELERATOR__ __KALMAR_ACCELERATOR__