pytorch · sf-wind · Jun 13, 2018 · Jun 12, 2018 · Jun 12, 2018 · Jun 12, 2018
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -300,6 +300,9 @@ if(BUILD_CAFFE2)
   add_subdirectory(caffe/proto)
 endif()
 
+# ---[ Shared build
+add_subdirectory(c10)
+
 # ---[ Main build
 add_subdirectory(caffe2)
 

diff --git a/c10/CMakeLists.txt b/c10/CMakeLists.txt
@@ -0,0 +1,50 @@
+project(c10 CXX C)
+
+set(LIB_SOURCES
+        dummy.cpp
+)
+
+set(TEST_SOURCES
+        dummy_test.cpp
+)
+
+if(MSVC)
+  # TODO Also add some warning options that MSVC can understand
+  set(WARNING_OPTIONS "")
+else()
+  set(WARNING_OPTIONS
+        -Wall
+        -Wextra
+        -Wold-style-cast
+        -Wno-missing-braces
+        -Wcast-align
+        -Wcast-qual
+        -Wctor-dtor-privacy
+        -Wdisabled-optimization
+        -Wformat=2
+        -Winit-self
+        -Wmissing-include-dirs
+        -Woverloaded-virtual
+        -Wredundant-decls
+        -Wshadow
+        -Wsign-promo
+        -Wstrict-overflow=5
+        -fdiagnostics-show-option
+        -Wconversion
+        -Wpedantic
+        -Wno-gnu-zero-variadic-macro-arguments
+        -Wundef
+        -Werror
+        )
+endif()
+
+add_library(${PROJECT_NAME} OBJECT ${LIB_SOURCES})
+target_compile_options(${PROJECT_NAME} PRIVATE ${WARNING_OPTIONS})
+
+if(BUILD_TEST)
+    add_executable(${PROJECT_NAME}_test ${TEST_SOURCES} $<TARGET_OBJECTS:${PROJECT_NAME}>)
+    add_test(NAME ${PROJECT_NAME}_test COMMAND $<TARGET_FILE:${PROJECT_NAME}_test>)
+    target_compile_options(${PROJECT_NAME}_test PRIVATE ${WARNING_OPTIONS})
+    target_link_libraries(${PROJECT_NAME}_test gtest_main)
+    install(TARGETS ${PROJECT_NAME}_test DESTINATION test)
+endif()
diff --git a/c10/dummy.cpp b/c10/dummy.cpp
@@ -0,0 +1,3 @@
+// This is going to be replaced with actual c10 files
+
+#include <c10/dummy.h>
diff --git a/c10/dummy.h b/c10/dummy.h
@@ -0,0 +1,3 @@
+#pragma once
+
+// This is going to be replaced with actual c10 files
diff --git a/c10/dummy_test.cpp b/c10/dummy_test.cpp
@@ -0,0 +1,6 @@
+#include <gtest/gtest.h>
+#include <c10/dummy.h>
+
+TEST(DummyTest, dummy) {
+    EXPECT_TRUE(true);
+}
diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt
@@ -190,6 +190,7 @@ target_include_directories(caffe2_protos INTERFACE $<INSTALL_INTERFACE:include>)
 target_link_libraries(caffe2_protos PUBLIC protobuf::libprotobuf)
 
 # Compile exposed libraries.
+list(APPEND Caffe2_CPU_SRCs $<TARGET_OBJECTS:c10>)
 add_library(caffe2 ${Caffe2_CPU_SRCS})
 caffe2_interface_library(caffe2_protos caffe2_protos_whole)
 target_link_libraries(caffe2 PRIVATE caffe2_protos_whole)

diff --git a/caffe2/contrib/torch/th_ops.cc b/caffe2/contrib/torch/th_ops.cc
diff --git a/caffe2/contrib/torch/th_ops_gpu.cu b/caffe2/contrib/torch/th_ops_gpu.cu
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		// This is going to be replaced with actual c10 files

		#include <c10/dummy.h>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#pragma once

		// This is going to be replaced with actual c10 files