From f3fe3f39ae75062d93582f57724c35bff5649a0c Mon Sep 17 00:00:00 2001
From: SrihariKarnam <srihari.karnam@tcs.com>
Date: Thu, 4 Jan 2018 17:42:12 -0500
Subject: [PATCH 1/2] Regression observed on HIP/CUDA

---
 cub/util_ptx.cuh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cub/util_ptx.cuh b/cub/util_ptx.cuh
index 4d135fe3..cc169025 100644
--- a/cub/util_ptx.cuh
+++ b/cub/util_ptx.cuh
@@ -504,7 +504,7 @@ int RowMajorTid(int block_dim_x, int block_dim_y, int block_dim_z)
  */
 __device__
 __forceinline__
-inline
+//inline
 unsigned int LaneId()
 {
     unsigned int ret;
@@ -523,7 +523,7 @@ unsigned int LaneId()
  */
 __device__
 __forceinline__
-inline
+//inline
 unsigned int WarpId()
 {
     unsigned int ret;

From a14afb86133808c94affd03a3921591b71f8435c Mon Sep 17 00:00:00 2001
From: sriharikarnam <srihari.karnam@tcs.com>
Date: Tue, 23 Jan 2018 11:37:47 +0530
Subject: [PATCH 2/2] added preprocessor directive

---
 hip_helpers/forwarder.hpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hip_helpers/forwarder.hpp b/hip_helpers/forwarder.hpp
index 0ce9e5b7..040ceee4 100644
--- a/hip_helpers/forwarder.hpp
+++ b/hip_helpers/forwarder.hpp
@@ -1,5 +1,6 @@
 #pragma once
-
+#ifndef HELPER_FORWARDER
+#define HELPER_FORWARDER
 #include <type_traits>
 #include <utility>
 
@@ -44,3 +45,4 @@ namespace
         return Forwarder<F>{std::move(f)};
     }
 }
+#endif