Refactor utils and external dependencies cmake setup (#58)

Author: mfl28

.gitattributes

@@ -62,4 +62,8 @@ _deps
 .idea/
 
 # Notebooks
-.ipynb_checkpoints
+.ipynb_checkpoints
+
+# extern
+extern/*
+!extern/CMakeLists.txt

.gitignore

@@ -30,7 +30,13 @@ set_target_properties(${EXECUTABLE_NAME} PROPERTIES
   CXX_STANDARD_REQUIRED YES
 )
 
-target_link_libraries(${EXECUTABLE_NAME} "${TORCH_LIBRARIES}")
+target_link_libraries(${EXECUTABLE_NAME} ${TORCH_LIBRARIES})
+
+# External dependencies
+add_subdirectory("extern")
+
+# Utils
+add_subdirectory("utils/image_io")
 
 # Add tutorial sub-projects:
 
@@ -48,12 +54,11 @@ add_subdirectory("tutorials/intermediate/bidirectional_recurrent_neural_network"
 add_subdirectory("tutorials/intermediate/language_model")
 
 # Advanced
-add_subdirectory("tutorials/advanced/utils")
 add_subdirectory("tutorials/advanced/generative_adversarial_network")
 add_subdirectory("tutorials/advanced/variational_autoencoder")
 add_subdirectory("tutorials/advanced/neural_style_transfer")
 
 if(MSVC)
     include(copy_torch_dlls)
     copy_torch_dlls(${EXECUTABLE_NAME})
-endif(MSVC)
+endif()

CMakeLists.txt

@@ -22,7 +22,7 @@ execute_process(COMMAND ${CPPLINT_COMMAND}
                 "--linelength=120" 
                 "--recursive" 
                 "--filter=-build/include_subdir,-build/include_what_you_use"
-                "--exclude=tutorials/advanced/utils/include/external/*"
                 "main.cpp"
                 "tutorials"
+                "utils"
                 WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/..")

cmake/cpplint.cmake

@@ -0,0 +1,35 @@
+cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
+
+project(extern VERSION 1.0.0 LANGUAGES CXX)
+
+include(FetchContent)
+
+FetchContent_Declare(
+    extern_cxxopts
+    GIT_REPOSITORY https://github.com/jarro2783/cxxopts.git
+    GIT_TAG v2.2.0
+    SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/cxxopts
+)
+
+set(CXXOPTS_CXX_STANDARD 14)
+set(CXXOPTS_BUILD_EXAMPLES OFF CACHE BOOL "Set to ON to build examples" FORCE)
+set(CXXOPTS_BUILD_TESTS OFF CACHE BOOL "Set to ON to build tests" FORCE)
+set(CXXOPTS_ENABLE_INSTALL OFF CACHE BOOL "Generate the install target" FORCE)
+
+FetchContent_MakeAvailable(extern_cxxopts)
+
+foreach(STB_IMAGE_LIB "stb_image" "stb_image_write" "stb_image_resize")
+    FetchContent_Declare(
+        extern_${STB_IMAGE_LIB}
+        URL https://raw.githubusercontent.com/nothings/stb/master/${STB_IMAGE_LIB}.h
+        DOWNLOAD_NO_EXTRACT ON  
+        DOWNLOAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/${STB_IMAGE_LIB}
+    )
+    FetchContent_MakeAvailable(extern_${STB_IMAGE_LIB})
+    
+    string(REPLACE "_" "-" LIB_NAME ${STB_IMAGE_LIB})
+
+    add_library(${LIB_NAME} INTERFACE)
+    target_sources(${LIB_NAME} INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/${STB_IMAGE_LIB}/${STB_IMAGE_LIB}.h)
+    target_include_directories(${LIB_NAME} INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/${STB_IMAGE_LIB})
+endforeach()

extern/CMakeLists.txt

@@ -12,7 +12,7 @@ set(EXECUTABLE_NAME generative-adversarial-network)
 add_executable(${EXECUTABLE_NAME})
 target_sources(${EXECUTABLE_NAME} PRIVATE main.cpp)
 
-target_link_libraries(${EXECUTABLE_NAME} "${TORCH_LIBRARIES}" save-image)
+target_link_libraries(${EXECUTABLE_NAME} ${TORCH_LIBRARIES} image-io)
 
 set_target_properties(${EXECUTABLE_NAME} PROPERTIES
   CXX_STANDARD 14

tutorials/advanced/generative_adversarial_network/CMakeLists.txt

@@ -2,9 +2,9 @@
 #include <torch/torch.h>
 #include <iostream>
 #include <iomanip>
-#include "save_image.h"
+#include "image_io.h"
 
-using image_utils::save_image;
+using image_io::save_image;
 
 int main() {
     std::cout << "Generative Adversarial Network\n\n";

tutorials/advanced/generative_adversarial_network/main.cpp

@@ -16,7 +16,7 @@ target_sources(${EXECUTABLE_NAME} PRIVATE src/main.cpp
 )
 target_include_directories(${EXECUTABLE_NAME} PRIVATE include)
 
-target_link_libraries(${EXECUTABLE_NAME} "${TORCH_LIBRARIES}" save-image load-image)
+target_link_libraries(${EXECUTABLE_NAME} ${TORCH_LIBRARIES} image-io)
 
 set_target_properties(${EXECUTABLE_NAME} PROPERTIES
   CXX_STANDARD 14

tutorials/advanced/neural_style_transfer/CMakeLists.txt

@@ -4,11 +4,10 @@
 #include <iomanip>
 #include <fstream>
 #include "vggnet.h"
-#include "load_image.h"
-#include "save_image.h"
+#include "image_io.h"
 
-using image_utils::load_image;
-using image_utils::save_image;
+using image_io::load_image;
+using image_io::save_image;
 
 void print_sizes(torch::Tensor);