Re-organize file with cmake

hpcaitech · Jul 12, 2022 · 102e656 · 102e656
2 parents 2b2076a + 3c2de63
commit 102e656
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 18 deletions.
diff --git a/3rd/CMakeLists.txt b/3rd/CMakeLists.txt
@@ -1,6 +1,7 @@
 include(ExternalProject)
 ExternalProject_Add(extern_uring
     GIT_REPOSITORY https://github.com/axboe/liburing.git
+    GIT_TAG liburing-2.2
     BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/liburing
     SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/liburing
     INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/liburing
@@ -16,6 +17,7 @@ add_dependencies(uring extern_uring)
 
 ExternalProject_Add(extern_aio
     GIT_REPOSITORY https://pagure.io/libaio.git
+    GIT_TAG libaio-0.3.113
     BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/libaio
     SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/libaio
     INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libaio

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,24 +1,17 @@
 cmake_minimum_required(VERSION 3.16)
-project(nvme)
+project(
+        ColossalAI-NVME
+        VERSION 0.1
+        DESCRIPTION "ColossalAI NVME"
+        LANGUAGES CXX
+)
 
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 
 add_subdirectory(3rd)
-include_directories(csrc/include)
-include_directories(tests)
+add_subdirectory(csrc)
 
-add_library(colo_asyncio
-        OBJECT
-        csrc/uring.cpp
-        csrc/aio.cpp)
-target_link_libraries(colo_asyncio PUBLIC uring aio)
-
-
-
-add_executable(test_asyncio 
-        tests/test_asyncio.cpp)
-target_link_libraries(test_asyncio colo_asyncio)
-
-add_executable(test_space_mgr tests/test_space_mgr.cpp
-        csrc/space_mgr.cpp)
+#if((CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME OR MODERN_CMAKE_BUILD_TESTING) AND BUILD_TESTING)
+add_subdirectory(tests)
+#endif()
diff --git a/csrc/CMakeLists.txt b/csrc/CMakeLists.txt
@@ -0,0 +1,14 @@
+add_library(colo_asyncio
+        OBJECT
+        aio.cpp
+        uring.cpp)
+target_link_libraries(colo_asyncio
+        PUBLIC uring
+        PUBLIC aio)
+target_include_directories(colo_asyncio PUBLIC ../include)
+
+
+add_library(space_mgr
+        OBJECT
+        space_mgr.cpp)
+target_include_directories(space_mgr PUBLIC ../include)
diff --git a/csrc/include/aio.h → include/aio.h b/csrc/include/aio.h → include/aio.h
diff --git a/csrc/include/asyncio.h → include/asyncio.h b/csrc/include/asyncio.h → include/asyncio.h
diff --git a/csrc/include/space_mgr.h → include/space_mgr.h b/csrc/include/space_mgr.h → include/space_mgr.h
diff --git a/csrc/include/uring.h → include/uring.h b/csrc/include/uring.h → include/uring.h
diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@ def cpp_ext_helper(name, sources, **kwargs):
     return CppExtension(
         name,
         [os.path.join(this_dir, path) for path in sources],
-        include_dirs=[os.path.join(this_dir, 'csrc'), os.path.join(this_dir, 'csrc/include')],
+        include_dirs=[os.path.join(this_dir, 'csrc'), os.path.join(this_dir, 'include')],
         **kwargs
     )
 

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -0,0 +1,12 @@
+add_executable(test_asyncio
+        test_asyncio.cpp)
+target_link_libraries(test_asyncio colo_asyncio)
+target_include_directories(test_asyncio INTERFACE .)
+add_test(NAME test_asyncio COMMAND test_asyncio)
+
+
+add_executable(test_space_mgr
+        test_space_mgr.cpp)
+target_link_libraries(test_space_mgr space_mgr)
+target_include_directories(test_space_mgr INTERFACE .)
+add_test(NAME test_space_mgr COMMAND test_space_mgr)