diff options
| author | Hieu Hoang <hieuhoang@gmail.com> | 2017-12-01 20:26:32 +0300 |
|---|---|---|
| committer | Hieu Hoang <hieuhoang@gmail.com> | 2017-12-01 20:26:32 +0300 |
| commit | ceef6dc34631e2ce69562484420a98a5ff1c6256 (patch) | |
| tree | 4564638da598222d93b36b4ff015b0d4078fc9cd | |
| parent | 8adcc2f7db33453b6a44d95296bcaf7d445b58b3 (diff) | |
compile on wilkes
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/amun/gpu/types-gpu.h | 10 | ||||
| -rw-r--r-- | src/amun/half/types-gpu.h | 10 |
3 files changed, 12 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 47858a87..e08391f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,8 +8,8 @@ set(CMAKE_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}) set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}) -set(CMAKE_CXX_FLAGS_RELEASE "-std=c++14 -fPIC -O3 -Ofast -m64 -march=native -funroll-loops -ffinite-math-only -Wno-unused-result -Wno-deprecated -pthread") -set(CMAKE_CXX_FLAGS_DEBUG "-std=c++14 -fPIC -g -O0 -m64 -march=native -funroll-loops -ffinite-math-only -Wno-unused-result -Wno-deprecated -pthread") +set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -O3 -Ofast -m64 -march=native -funroll-loops -ffinite-math-only -Wno-unused-result -Wno-deprecated -pthread") +set(CMAKE_CXX_FLAGS_DEBUG "-std=c++11 -fPIC -g -O0 -m64 -march=native -funroll-loops -ffinite-math-only -Wno-unused-result -Wno-deprecated -pthread") set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE} -g -pg") set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS_RELEASE}) diff --git a/src/amun/gpu/types-gpu.h b/src/amun/gpu/types-gpu.h index 49ac1963..0da04c52 100644 --- a/src/amun/gpu/types-gpu.h +++ b/src/amun/gpu/types-gpu.h @@ -19,11 +19,11 @@ void HandleError(cudaError_t err, const char *file, int line ); ///////////////////////////////////////////////////////////////////////////////////// extern std::unordered_map<std::string, boost::timer::cpu_timer> timers; -#define BEGIN_TIMER(str) {} -#define PAUSE_TIMER(str) {} -//#define BEGIN_TIMER(str) { HANDLE_ERROR( cudaStreamSynchronize(mblas::CudaStreamHandler::GetStream())); timers[str].resume(); } -//#define PAUSE_TIMER(str) { HANDLE_ERROR( cudaStreamSynchronize(mblas::CudaStreamHandler::GetStream())); \ -// timers[str].stop(); } +//#define BEGIN_TIMER(str) {} +//#define PAUSE_TIMER(str) {} +#define BEGIN_TIMER(str) { HANDLE_ERROR( cudaStreamSynchronize(mblas::CudaStreamHandler::GetStream())); timers[str].resume(); } +#define PAUSE_TIMER(str) { HANDLE_ERROR( cudaStreamSynchronize(mblas::CudaStreamHandler::GetStream())); \ + timers[str].stop(); } } diff --git a/src/amun/half/types-gpu.h b/src/amun/half/types-gpu.h index ed8f632a..2d1465ca 100644 --- a/src/amun/half/types-gpu.h +++ b/src/amun/half/types-gpu.h @@ -19,11 +19,11 @@ void HandleError(cudaError_t err, const char *file, int line ); ///////////////////////////////////////////////////////////////////////////////////// extern std::unordered_map<std::string, boost::timer::cpu_timer> timers; -#define BEGIN_TIMER(str) {} -#define PAUSE_TIMER(str) {} -//#define BEGIN_TIMER(str) { HANDLE_ERROR( cudaStreamSynchronize(mblas::CudaStreamHandler::GetStream())); timers[str].resume(); } -//#define PAUSE_TIMER(str) { HANDLE_ERROR( cudaStreamSynchronize(mblas::CudaStreamHandler::GetStream())); \ -// timers[str].stop(); } +//#define BEGIN_TIMER(str) {} +//#define PAUSE_TIMER(str) {} +#define BEGIN_TIMER(str) { HANDLE_ERROR( cudaStreamSynchronize(mblas::CudaStreamHandler::GetStream())); timers[str].resume(); } +#define PAUSE_TIMER(str) { HANDLE_ERROR( cudaStreamSynchronize(mblas::CudaStreamHandler::GetStream())); \ + timers[str].stop(); } } |