From 3e213d94e181f0f1241b892e99dbf975a2866865 Mon Sep 17 00:00:00 2001 From: Jatin Chaudhary <51944368+cjatin@users.noreply.github.com> Date: Thu, 11 Jul 2019 14:46:03 +0530 Subject: [PATCH] Adding fix to initialize a dim3 variable from blockIdx. (#1212) Adding gitignore for ctags --- .gitignore | 2 +- include/hip/hcc_detail/hip_runtime.h | 3 +++ include/hip/hcc_detail/hip_runtime_api.h | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3c94b6aaa0..c4ed31eb6d 100644 --- a/.gitignore +++ b/.gitignore @@ -14,5 +14,5 @@ bin/hipBusBandwidth bin/hipDispatchLatency bin/hipify-clang include/hip/hcc_detail/hip_prof_str.h - +tags samples/1_Utils/hipInfo/hipInfo diff --git a/include/hip/hcc_detail/hip_runtime.h b/include/hip/hcc_detail/hip_runtime.h index 6ac402a6f7..c4ef1d829f 100644 --- a/include/hip/hcc_detail/hip_runtime.h +++ b/include/hip/hcc_detail/hip_runtime.h @@ -206,12 +206,15 @@ class Coordinates { struct X { __device__ operator R() const { return f(0); } + __device__ uint32_t operator=(R _) { return f(0); } }; struct Y { __device__ operator R() const { return f(1); } + __device__ uint32_t operator=(R _) { return f(1); } }; struct Z { __device__ operator R() const { return f(2); } + __device__ uint32_t operator=(R _) { return f(2); } }; public: diff --git a/include/hip/hcc_detail/hip_runtime_api.h b/include/hip/hcc_detail/hip_runtime_api.h index e70f4954db..97df1f4219 100644 --- a/include/hip/hcc_detail/hip_runtime_api.h +++ b/include/hip/hcc_detail/hip_runtime_api.h @@ -271,7 +271,7 @@ typedef struct dim3 { uint32_t y; ///< y uint32_t z; ///< z #ifdef __cplusplus - dim3(uint32_t _x = 1, uint32_t _y = 1, uint32_t _z = 1) : x(_x), y(_y), z(_z){}; + __host__ __device__ dim3(uint32_t _x = 1, uint32_t _y = 1, uint32_t _z = 1) : x(_x), y(_y), z(_z){}; #endif } dim3;