From d12b00952754f4463aef52cc75ad05eb45d26411 Mon Sep 17 00:00:00 2001
From: Chris Maffeo <cmaffeo2@illinois.edu>
Date: Fri, 2 Dec 2022 11:11:17 -0600
Subject: [PATCH] Protect CMake '-O2 -> -O3' conversion; fix NVTX
---
src/CMakeLists.txt | 8 ++++++--
src/GrandBrownTown.cu | 3 ++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f8f9af0..a1e5937 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -34,8 +34,12 @@ endif()
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
## Some CMake versions use -O2 for release; replace with -O3
- string(REPLACE "-O2" "-O3" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
- string(REPLACE "-O2" "-O3" CMAKE_CUDA_FLAGS_RELEASE ${CMAKE_CUDA_FLAGS_RELEASE})
+ if(CMAKE_CXX_FLAGS_RELEASE)
+ string(REPLACE "-O2" "-O3" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
+ endif()
+ if(CMAKE_CUDA_FLAGS_RELEASE)
+ string(REPLACE "-O2" "-O3" CMAKE_CUDA_FLAGS_RELEASE ${CMAKE_CUDA_FLAGS_RELEASE})
+ endif()
endif()
diff --git a/src/GrandBrownTown.cu b/src/GrandBrownTown.cu
index d610c5d..aa5295f 100644
--- a/src/GrandBrownTown.cu
+++ b/src/GrandBrownTown.cu
@@ -746,7 +746,7 @@ void GrandBrownTown::run()
}//if step == 1
- PUSH_NVTX("Clear particle force data",1)
+ PUSH_NVTX("Clear particle energy data",1)
internal->clear_energy();
gpuman.sync();
POP_NVTX
@@ -1171,6 +1171,7 @@ void GrandBrownTown::run()
wkf_timer_start(timerS);
POP_NVTX
} // s % outputEnergyPeriod
+ POP_NVTX
} // done with all Brownian dynamics steps
if (imd_on and clientsock)
--
GitLab