Reset and warn when any options are not satisfied

.gitignore

@@ -30,6 +30,8 @@
 .ipynb_checkpoints
 
 # Editor temporaries
+*.swn
+*.swo
 *.swp
 *~
 

CMakeLists.txt

@@ -39,6 +39,7 @@ option(USE_GFLAGS "Use GFLAGS" ON)
 option(USE_LMDB "Use LMDB" ON)
 option(USE_LEVELDB "Use LMDB" ON)
 option(USE_OPENCV "Use openCV" ON)
+option(USE_CUDA "Use Cuda" ON)
 option(USE_ZMQDB "Use ZMQ" OFF)
 option(USE_ROCKSDB "Use RocksDB" OFF)
 option(USE_MPI "Use MPI" OFF)

caffe2/CMakeLists.txt

@@ -61,7 +61,7 @@ install(TARGETS Caffe2_CPU DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 list(APPEND Caffe2_MAIN_LIBS Caffe2_CPU)
 
 # ---[ CUDA library.
-if(HAVE_CUDA)
+if(USE_CUDA)
   CUDA_ADD_LIBRARY(Caffe2_GPU ${Caffe2_GPU_SRCS})
   target_link_libraries(Caffe2_GPU ${Caffe2_MAIN_LIBS} ${Caffe2_DEPENDENCY_LIBS})
   install(TARGETS Caffe2_GPU DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
@@ -86,7 +86,7 @@ set_target_properties(caffe2_pybind11_state PROPERTIES PREFIX "")
 target_link_libraries(caffe2_pybind11_state ${Caffe2_MAIN_LIBS} ${Caffe2_DEPENDENCY_LIBS})
 install(TARGETS caffe2_pybind11_state DESTINATION ${CMAKE_INSTALL_PREFIX}/caffe2/python)
 
-if(HAVE_CUDA)
+if(USE_CUDA)
   add_library(caffe2_pybind11_state_gpu SHARED ${Caffe2_GPU_PYTHON_SRCS})
   set_target_properties(caffe2_pybind11_state_gpu PROPERTIES PREFIX "")
   target_link_libraries(caffe2_pybind11_state_gpu ${Caffe2_MAIN_LIBS} ${Caffe2_DEPENDENCY_LIBS})
@@ -101,7 +101,7 @@ foreach(binary_src ${Caffe2_CPU_BINARY_SRCS})
   install(TARGETS ${bin_name} DESTINATION ${CMAKE_INSTALL_PREFIX}/binaries)
 endforeach()
 
-if(HAVE_CUDA)
+if(USE_CUDA)
   foreach(binary_src ${Caffe2_GPU_BINARY_SRCS})
     get_filename_component(bin_name ${binary_src} NAME_WE)
     add_executable(${bin_name} ${binary_src})

caffe2/contrib/nccl/CMakeLists.txt

@@ -1,4 +1,4 @@
-if(HAVE_CUDA)
+if(USE_CUDA)
     message(STATUS "Include NCCL operators")
     set(Caffe2_CONTRIB_NCCL_GPU_SRC
         "${CMAKE_CURRENT_SOURCE_DIR}/cuda_nccl_gpu.cc"

caffe2/cuda_rtc/CMakeLists.txt

@@ -1,4 +1,4 @@
-if(HAVE_CUDA)
+if(USE_CUDA)
     set(Caffe2_CUDA_RTC_GPU_SRC
         "${CMAKE_CURRENT_SOURCE_DIR}/elemenntwise_rtc_gpu.cc"
         "${CMAKE_CURRENT_SOURCE_DIR}/pool_op_rtc_gpu.cc"

cmake/Dependencies.cmake

@@ -47,6 +47,9 @@ if (USE_GLOG)
     add_definitions(-DCAFFE2_USE_GOOGLE_GLOG)
     include_directories(SYSTEM ${GLOG_INCLUDE_DIRS})
     list(APPEND Caffe2_DEPENDENCY_LIBS ${GLOG_LIBRARIES})
+  else()
+    message(WARNING "Not compiling with glog. Suppress future warnings with -DUSE_GLOG=OFF")
+    set(USE_GLOG OFF)
   endif()
 endif()
 
@@ -57,6 +60,9 @@ if (USE_GFLAGS)
     add_definitions(-DCAFFE2_USE_GFLAGS)
     include_directories(SYSTEM ${GFLAGS_INCLUDE_DIRS})
     list(APPEND Caffe2_DEPENDENCY_LIBS ${GFLAGS_LIBRARIES})
+  else()
+    message(WARNING "Not compiling with gflags.  Suppress future warnings with -DUSE_GFLAGS=OFF")
+    set(USE_GFLAGS OFF)
   endif()
 endif()
 
@@ -70,23 +76,39 @@ include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/third_party/benchmark/include)
 
 # ---[ LMDB
 if(USE_LMDB)
-  find_package(LMDB REQUIRED)
-  include_directories(SYSTEM ${LMDB_INCLUDE_DIR})
-  list(APPEND Caffe2_DEPENDENCY_LIBS ${LMDB_LIBRARIES})
+  find_package(LMDB)
+  if (HAVE_LMDB)
+    include_directories(SYSTEM ${LMDB_INCLUDE_DIR})
+    list(APPEND Caffe2_DEPENDENCY_LIBS ${LMDB_LIBRARIES})
+  else()
+    message(WARNING "Not compiling with LMDB. Suppress future warnings with -DUSE_LMDB=OFF")
+    set(USE_LMDB OFF)
+  endif()
 endif()
 
 # ---[ LevelDB
-if(USE_LEVELDB)
-  find_package(LevelDB REQUIRED)
-  include_directories(SYSTEM ${LevelDB_INCLUDE})
-  list(APPEND Caffe2_DEPENDENCY_LIBS ${LevelDB_LIBRARIES})
-endif()
-
 # ---[ Snappy
 if(USE_LEVELDB)
-  find_package(Snappy REQUIRED)
-  include_directories(SYSTEM ${Snappy_INCLUDE_DIR})
-  list(APPEND Caffe2_DEPENDENCY_LIBS ${Snappy_LIBRARIES})
+
+  find_package(LevelDB)
+  if (HAVE_LevelDB)
+    include_directories(SYSTEM ${LevelDB_INCLUDE})
+    list(APPEND Caffe2_DEPENDENCY_LIBS ${LevelDB_LIBRARIES})
+
+    find_package(Snappy)
+    if (HAVE_Snappy)
+      include_directories(SYSTEM ${Snappy_INCLUDE_DIR})
+      list(APPEND Caffe2_DEPENDENCY_LIBS ${Snappy_LIBRARIES})
+    else()
+      message(WARNING "Not compiling with LevelDB. Suppress future warnings with -DUSE_LEVELDB=OFF")
+      set(USE_LEVELDB OFF)
+    endif()
+
+  else()
+    message(WARNING "Not compiling with LevelDB. Suppress future warnings with -DUSE_LEVELDB=OFF")
+    set(USE_LEVELDB OFF)
+  endif()
+
 endif()
 
 # ---[ OpenCV
@@ -101,6 +123,9 @@ if(USE_OPENCV)
     include_directories(SYSTEM ${OpenCV_INCLUDE_DIRS})
     list(APPEND Caffe2_DEPENDENCY_LIBS ${OpenCV_LIBS})
     message(STATUS "OpenCV found (${OpenCV_CONFIG_PATH})")
+  else()
+    message(WARNING "Not compiling with OpenCV. Suppress future warnings with -DUSE_OPENCV=OFF")
+    set(USE_OPENCV OFF)
   endif()
 endif()
 
@@ -130,6 +155,9 @@ if(USE_MPI)
     include_directories(SYSTEM ${MPI_CXX_INCLUDE_PATH})
     list(APPEND Caffe2_DEPENDENCY_LIBS ${MPI_CXX_LIBRARIES})
     set(CMAKE_EXE_LINKER_FLAGS ${MPI_CXX_LINK_FLAGS})
+  else()
+    message(WARNING "Not compiling with MPI. Suppress future warnings with -DUSE_MPI=OFF")
+    set(USE_MPI OFF)
   endif()
 endif()
 
@@ -141,36 +169,43 @@ if(USE_OPENMP)
     set(CMAKE_C_FLAGS "{$CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
+  else()
+    message(WARNING "Not compiling with OpenMP. Suppress future warnings with -DUSE_OPENMP=OFF")
+    set(USE_OPENMP OFF)
   endif()
 endif()
 
-# ---[ CUDA
-include(cmake/Cuda.cmake)
-
 # ---[ CUDNN
-if(HAVE_CUDA)
-  find_package(CuDNN REQUIRED)
-  if(CUDNN_FOUND)
-    include_directories(SYSTEM ${CUDNN_INCLUDE_DIRS})
-    list(APPEND Caffe2_DEPENDENCY_LIBS ${CUDNN_LIBRARIES})
+if (USE_CUDA)
+  # ---[ CUDA
+  include(cmake/Cuda.cmake)
+  if(HAVE_CUDA)
+    find_package(CuDNN REQUIRED)
+    if(CUDNN_FOUND)
+      include_directories(SYSTEM ${CUDNN_INCLUDE_DIRS})
+      list(APPEND Caffe2_DEPENDENCY_LIBS ${CUDNN_LIBRARIES})
+    endif()
+  else()
+    message(WARNING "Not compiling with CUDA. Suppress future warnings with -DUSE_CUDA=OFF")
+    set(USE_CUDA OFF)
   endif()
 endif()
 
 # ---[ NCCL
-if(HAVE_CUDA)
+if(USE_CUDA)
   include("cmake/External/nccl.cmake")
   include_directories(SYSTEM ${NCCL_INCLUDE_DIRS})
   message(STATUS "NCCL: ${NCCL_LIBRARIES}")
   list(APPEND Caffe2_DEPENDENCY_LIBS ${NCCL_LIBRARIES})
 endif()
 
 # ---[ CUB
-if(HAVE_CUDA)
+if(USE_CUDA)
   include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/third_party/cub)
 endif()
 
 # ---[ CNMEM
-if(HAVE_CUDA)
+if(USE_CUDA)
   add_subdirectory(${CMAKE_SOURCE_DIR}/third_party/cnmem)
   include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/third_party/cnmem/include)
   # message(STATUS "cnmem: ${CMAKE_SOURCE_DIR}/third_party/cnmem/libcnmem.so")