Use target_compile_definitions instead of CMAKE_CXX_FLAGS

Summary: Better restrict preprocessor flag definitions for destroying cuDNN and NCCL handles to interface definitions on respective targets so we don't pollute global preprocessor definitions Reviewed By: vineelpratap Differential Revision: D13560905 fbshipit-source-id: 6a15dca7806e22be9ce413e8a5a6d639965791db
jercylew · Dec 30, 2018 · 8a86e95 · 8a86e95
1 parent d82079f
commit 8a86e95
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,7 +6,6 @@ include(CTest)
 
 # ----------------------------- Setup -----------------------------
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/")
-set(CMAKE_CXX_FLAGS "-DNO_CUDNN_DESTROY_HANDLE -DNO_NCCL_COMM_DESTROY_HANDLE")
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(FLASHLIGHT_PROJECT_COMPONENT_SRC_DIR "${CMAKE_SOURCE_DIR}/flashlight") # module root

diff --git a/flashlight/autograd/CMakeLists.txt b/flashlight/autograd/CMakeLists.txt
@@ -106,7 +106,13 @@ if (FLASHLIGHT_USE_CUDA)
     ${CUDA_INCLUDE_DIRS}
     ${CUDNN_INCLUDE_DIRS}
     ${ArrayFire_INCLUDE_DIRS}
-   )
+    )
+
+  target_compile_definitions(
+    Autograd
+    INTERFACE
+    "-DNO_CUDNN_DESTROY_HANDLE"
+    )
 endif ()
 
 

diff --git a/flashlight/distributed/CMakeLists.txt b/flashlight/distributed/CMakeLists.txt
@@ -96,6 +96,12 @@ if (USE_NCCL)
     ${MPI_CXX_INCLUDE_PATH}
     ${NCCL_INCLUDE_DIRS}
     )
+
+  target_compile_definitions(
+    Distributed
+    INTERFACE
+    "-DNO_NCCL_COMM_DESTROY_HANDLE"
+    )
 endif ()
 
 # Distributed