Merge branch 'DOR-482-pch-target' into 'master'

[DOR-482] Split the PCH out into a separate target Closes DOR-482 See merge request machine-learning/dorado!772
nanoporetech · Dec 18, 2023 · 786fe64 · 786fe64
2 parents 55d09f9 + d526743
commit 786fe64
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 15 deletions.
diff --git a/dorado/basecall/CMakeLists.txt b/dorado/basecall/CMakeLists.txt
@@ -58,8 +58,4 @@ enable_warnings_as_errors(dorado_basecall)
 
 if (DORADO_ENABLE_PCH)
     target_precompile_headers(dorado_basecall REUSE_FROM dorado_utils)
-    # these are defined publicly by minimap2, which we're not using.
-    # we need to define them here so that the environment matches the one
-    # used when building the PCH
-    target_compile_definitions(dorado_basecall PRIVATE PTW32_CLEANUP_C PTW32_STATIC_LIB)
 endif()
diff --git a/dorado/modbase/CMakeLists.txt b/dorado/modbase/CMakeLists.txt
@@ -35,8 +35,4 @@ enable_warnings_as_errors(dorado_modbase)
 
 if (DORADO_ENABLE_PCH)
     target_precompile_headers(dorado_modbase REUSE_FROM dorado_utils)
-    # these are defined publicly by minimap2, which we're not using.
-    # we need to define them here so that the environment matches the one
-    # used when building the PCH
-    target_compile_definitions(dorado_modbase PRIVATE PTW32_CLEANUP_C PTW32_STATIC_LIB)
 endif()
diff --git a/dorado/utils/CMakeLists.txt b/dorado/utils/CMakeLists.txt
@@ -70,13 +70,6 @@ target_compile_definitions(dorado_utils
         DORADO_GPU_BUILD=$<BOOL:${DORADO_GPU_BUILD}>
 )
 
-if (DORADO_ENABLE_PCH)
-    target_precompile_headers(dorado_utils
-        PRIVATE
-        "precompiled.h"
-    )
-endif()
-
 target_include_directories(dorado_utils
     INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}/..
@@ -103,6 +96,12 @@ target_link_libraries(dorado_utils
         htslib
 )
 
+if (DORADO_ENABLE_PCH)
+    add_subdirectory(pch)
+    target_link_libraries(dorado_utils PUBLIC dorado_pch)
+    target_precompile_headers(dorado_utils REUSE_FROM dorado_pch)
+endif()
+
 if(APPLE AND DORADO_GPU_BUILD)
     add_dependencies(dorado_utils metal-lib)
     target_link_libraries(

diff --git a/dorado/utils/pch/CMakeLists.txt b/dorado/utils/pch/CMakeLists.txt
@@ -0,0 +1,23 @@
+add_library(dorado_pch
+    precompiled.cpp
+    precompiled.h
+)
+
+target_precompile_headers(dorado_pch
+    PUBLIC
+        precompiled.h
+)
+
+target_link_libraries(dorado_pch
+    PUBLIC
+        ${TORCH_LIBRARIES}
+)
+
+# 3rdparty libs should be considered SYSTEM headers
+target_include_directories(dorado_pch
+    SYSTEM
+    PUBLIC
+        ${TORCH_INCLUDE_DIRS}
+)
+
+enable_warnings_as_errors(dorado_pch)
diff --git a/dorado/utils/pch/precompiled.cpp b/dorado/utils/pch/precompiled.cpp
@@ -0,0 +1 @@
+#include "precompiled.h"
diff --git a/dorado/utils/precompiled.h → dorado/utils/pch/precompiled.h b/dorado/utils/precompiled.h → dorado/utils/pch/precompiled.h