From f6f312418da48cbd486ce49c4a4a778ab94d41b4 Mon Sep 17 00:00:00 2001
From: Yi Wang <yi.wang.2005@gmail.com>
Date: Sun, 6 Aug 2017 09:06:17 -0700
Subject: [PATCH] Move --expt-relaxed-constexpt as a NVCC flag

---
 cmake/configure.cmake | 2 +-
 cmake/flags.cmake     | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/cmake/configure.cmake b/cmake/configure.cmake
index 69220e03fe8..04cc327323c 100644
--- a/cmake/configure.cmake
+++ b/cmake/configure.cmake
@@ -60,7 +60,7 @@ else()
         message(FATAL_ERROR "Paddle need cudnn to compile")
     endif()
 
-    set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} "-Xcompiler ${SIMD_FLAG}")
+    set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} "-Xcompiler ${SIMD_FLAG}" "--expt-relaxed-constexpr")
 
     # Include cuda and cudnn
     include_directories(${CUDNN_INCLUDE_DIR})
diff --git a/cmake/flags.cmake b/cmake/flags.cmake
index 065325d7956..0803a4e8740 100644
--- a/cmake/flags.cmake
+++ b/cmake/flags.cmake
@@ -116,7 +116,6 @@ set(COMMON_FLAGS
     -Wno-error=sign-compare
     -Wno-error=unused-local-typedefs
     -Wno-error=parentheses-equality # Warnings in pybind11
-    --expt-relaxed-constexpr # surppress warnings in Eigen
 )
 
 set(GPU_COMMON_FLAGS
@@ -131,7 +130,6 @@ set(GPU_COMMON_FLAGS
     -Wno-error=unused-local-typedefs
     -Wno-error=unused-function  # Warnings in Numpy Header.
     -Wno-error=array-bounds # Warnings in Eigen::array
-    --expt-relaxed-constexpr # surppress warnings in Eigen
 )
 
 if (APPLE)
-- 
GitLab