Set up boilerplate

Author: szaman19

include/lbann/layers/misc/CMakeLists.txt

@@ -39,5 +39,8 @@ set_full_path(THIS_DIR_HEADERS
   variance.hpp
   )
 
+if (LBANN_HAS_DISTCONV)
+    add_subdirectory(distconv)
+endif()
 # Propagate the files up the tree
 set(HEADERS "${HEADERS}" "${THIS_DIR_HEADERS}" PARENT_SCOPE)

include/lbann/layers/misc/distconv/CMakeLists.txt

@@ -54,8 +54,12 @@
 #endif // DISTCONV_HAS_P2P
 
 #include "lbann/layers/learning/distconv/distconv_layers.hpp"
+<<<<<<< HEAD
 #include "lbann/layers/math/distconv/distconv_matmul.hpp"
 
+=======
+#include "lbann/layers/misc/distconv/distconv_channelwise_softmax.hpp"
+>>>>>>> f6433dba5 (Set up boilerplate)
 namespace lbann {
 
 inline auto default_hydrogen_stream()

include/lbann/layers/misc/distconv/distonv_channelwise_softmax.hpp

@@ -65,6 +65,10 @@ endif ()
 # Add the subdirectories
 add_subdirectory(cereal_registration)
 
+if (LBANN_HAS_DISTCONV)
+    add_subdirectory(distconv)
+endif()
+
 # Propagate the files up the tree
 set(SOURCES "${SOURCES}" "${THIS_DIR_SOURCES}" PARENT_SCOPE)
 set(GPU_SOURCES "${GPU_SOURCES}" "${THIS_DIR_CU_SOURCES}" PARENT_SCOPE)