From 6b8913d4e59bdf30ce82e7a582091fa5eb267df0 Mon Sep 17 00:00:00 2001
From: Maneesh Gupta <maneesh.gupta@amd.com>
Date: Mon, 17 Sep 2018 15:15:49 +0530
Subject: [PATCH] [dtests] Fix deviceLib/hipTestIncludeMath on nvcc path

Change-Id: Ifb121886bec6c1134e98bd194ff1713f28454d33


[ROCm/hip commit: 0b211bb4292954230d9576ac50b9491e1ef7def7]
---
 projects/hip/tests/src/deviceLib/hipTestIncludeMath.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/projects/hip/tests/src/deviceLib/hipTestIncludeMath.cpp b/projects/hip/tests/src/deviceLib/hipTestIncludeMath.cpp
index 6063eee76c..92b93eda36 100644
--- a/projects/hip/tests/src/deviceLib/hipTestIncludeMath.cpp
+++ b/projects/hip/tests/src/deviceLib/hipTestIncludeMath.cpp
@@ -30,6 +30,7 @@ THE SOFTWARE.
 // Incorrect implementation causes compilation failure due to conflict
 // declartions.
 
+#include <new>
 #include <hip/math_functions.h>
 
 // Test __HIP_DEVICE_COMPILE__ is defined after math_functions.h
@@ -45,14 +46,6 @@ __device__ __host__ inline void throw_std_bad_alloc()
   #endif
 }
 
-// Test __HIP_ARCH_HAS_WARP_FUNNEL_SHIFT__ and __HIP_ARCH_HAS_DYNAMIC_PARALLEL__
-// is defined. Eigen HIP/hcc/Half.h __ldg depends on this.
-#if !defined(__HIP_ARCH_HAS_WARP_FUNNEL_SHIFT__) ||                            \
-    !defined(__HIP_ARCH_HAS_DYNAMIC_PARALLEL__)
-#error                                                                         \
-    "__HIP_ARCH_HAS_WARP_FUNNEL_SHIFT__ or __HIP_ARCH_HAS_DYNAMIC_PARALLEL__ not defined"
-#endif
-
 #include <hip/hip_runtime.h>
 #include "test_common.h"