From 07f30241b89e6a3186a52d78df4463a2c21c227e Mon Sep 17 00:00:00 2001
From: hedaoyuan <hedaoyuan@github.com>
Date: Wed, 12 Oct 2016 10:28:22 +0800
Subject: [PATCH] fixed some nvcc compilation related

---
 CMakeLists.txt                               | 5 +++++
 cmake/util.cmake                             | 7 -------
 paddle/gserver/CMakeLists.txt                | 2 +-
 paddle/math/CMakeLists.txt                   | 2 +-
 paddle/math/tests/CMakeLists.txt             | 2 +-
 paddle/math/tests/test_TrainingAlgorithm.cpp | 2 +-
 6 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4613155f770..8ce51bb0f41 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,6 +98,8 @@ else()
         add_definitions(-DPADDLE_USE_DSO)
     endif(WITH_DSO)
 
+    set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} "-g -O3 --use_fast_math")
+
     # Include cuda and cudnn
     include_directories(${CUDNN_INCLUDE_DIR})
     include_directories(${CUDA_TOOLKIT_INCLUDE})
@@ -117,6 +119,9 @@ endif(NOT WITH_TIMER)
 if(WITH_AVX)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${AVX_FLAGS}")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${AVX_FLAGS}")
+    if(AVX_FOUND)
+        set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} "-Xcompiler -mavx")
+    endif(AVX_FOUND)
 else(WITH_AVX)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse3")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse3")
diff --git a/cmake/util.cmake b/cmake/util.cmake
index 0fa36f070cc..74227bf14e3 100644
--- a/cmake/util.cmake
+++ b/cmake/util.cmake
@@ -178,13 +178,6 @@ macro(add_simple_unittest TARGET_NAME)
     add_unittest(${TARGET_NAME} ${TARGET_NAME}.cpp)
 endmacro()
 
-macro(add_paddle_culib TARGET_NAME)
-    set(NVCC_FLAG ${CUDA_NVCC_FLAGS})
-    set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS};--use_fast_math)
-    cuda_add_library(${TARGET_NAME} STATIC ${ARGN})
-    set(CUDA_NVCC_FLAGS ${NVCC_FLAG})
-endmacro()
-
 
 # Creates C resources file from files in given resource file
 function(create_resources res_file output)
diff --git a/paddle/gserver/CMakeLists.txt b/paddle/gserver/CMakeLists.txt
index 9ac4d210f6d..a066f80c221 100644
--- a/paddle/gserver/CMakeLists.txt
+++ b/paddle/gserver/CMakeLists.txt
@@ -50,7 +50,7 @@ if(NOT WITH_PYTHON)
 endif()
 
 if(WITH_GPU)
-    add_paddle_culib(paddle_gserver ${GSERVER_SOURCES})
+    cuda_add_library(paddle_gserver ${GSERVER_SOURCES})
 else()
     add_library(paddle_gserver STATIC
         ${GSERVER_SOURCES})
diff --git a/paddle/math/CMakeLists.txt b/paddle/math/CMakeLists.txt
index 1bb271ba80e..f5657c4690c 100644
--- a/paddle/math/CMakeLists.txt
+++ b/paddle/math/CMakeLists.txt
@@ -25,7 +25,7 @@ if(NOT WITH_GPU)
     add_library(paddle_math STATIC
         ${MATH_SOURCES})
 else()
-    add_paddle_culib(paddle_math ${MATH_SOURCES})
+    cuda_add_library(paddle_math ${MATH_SOURCES})
 endif()
 
 
diff --git a/paddle/math/tests/CMakeLists.txt b/paddle/math/tests/CMakeLists.txt
index 07fd1adc1be..ccc3deac7be 100644
--- a/paddle/math/tests/CMakeLists.txt
+++ b/paddle/math/tests/CMakeLists.txt
@@ -15,7 +15,7 @@ add_simple_unittest(test_perturbation)
 add_simple_unittest(test_CpuGpuVector)
 add_simple_unittest(test_Allocator)
 if(COMPILER_SUPPORT_CXX11)
-  LIST(APPEND CUDA_NVCC_FLAGS -std=c++11 -Xcompiler -fPIC --use_fast_math)
+  LIST(APPEND CUDA_NVCC_FLAGS -std=c++11)
   CUDA_ADD_EXECUTABLE(test_Tensor test_Tensor.cu)
   link_paddle_test(test_Tensor)
 endif()
diff --git a/paddle/math/tests/test_TrainingAlgorithm.cpp b/paddle/math/tests/test_TrainingAlgorithm.cpp
index b465ae6c262..1759d221e51 100644
--- a/paddle/math/tests/test_TrainingAlgorithm.cpp
+++ b/paddle/math/tests/test_TrainingAlgorithm.cpp
@@ -81,7 +81,7 @@ int VectorCheckErr(const VectorPtr& vector1, const VectorPtr& vector2) {
 
 #else
 
-#include "paddle/common/Stat.h"
+#include "paddle/utils/Stat.h"
 
 #define CHECK_VECTORPTR(vector1, vector2)
 
-- 
GitLab