From 96fe74cd2b93cdccbca981072cade19a3695c094 Mon Sep 17 00:00:00 2001 From: Aaron Enye Shi Date: Wed, 12 Sep 2018 14:54:31 +0000 Subject: [PATCH] Avoid AMP-retrict call to CPU-restrict [ROCm/clr commit: ebf565819e7f9fa3443bc681b8c7e75a28760a33] --- projects/clr/hipamd/include/hip/hcc_detail/math_functions.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/clr/hipamd/include/hip/hcc_detail/math_functions.h b/projects/clr/hipamd/include/hip/hcc_detail/math_functions.h index b44d3f00bd..059aabcc53 100644 --- a/projects/clr/hipamd/include/hip/hcc_detail/math_functions.h +++ b/projects/clr/hipamd/include/hip/hcc_detail/math_functions.h @@ -1307,12 +1307,12 @@ __DEF_FLOAT_FUN2I(scalbn) #if __HCC__ template __DEVICE__ inline static T min(T arg1, T arg2) { - return std::min(arg1, arg2); + return (arg1 < arg2) ? arg1 : arg2; } template __DEVICE__ inline static T max(T arg1, T arg2) { - return std::max(arg1, arg2); + return (arg1 > arg2) ? arg1 : arg2; } #else __DEVICE__ inline static int min(int arg1, int arg2) {