Move torch to its own target

This is more cmake-y and will allow us to put torch in a link group for koi.
nanoporetech · Jul 10, 2024 · 9a6f05c · 9a6f05c
1 parent 5f53469
commit 9a6f05c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -305,7 +305,6 @@ target_include_directories(dorado_lib
 target_include_directories(dorado_lib
     SYSTEM
     PUBLIC
-        ${TORCH_INCLUDE_DIRS}
         ${DORADO_3RD_PARTY_SOURCE}/HighFive/include
         ${DORADO_3RD_PARTY_SOURCE}/argparse
         ${DORADO_3RD_PARTY_SOURCE}/toml11
@@ -328,7 +327,7 @@ endif()
 
 target_link_libraries(dorado_lib
     PUBLIC
-        ${TORCH_LIBRARIES}
+        torch_lib
         htslib
         edlib
         dorado_utils

diff --git a/cmake/Torch.cmake b/cmake/Torch.cmake
@@ -400,3 +400,8 @@ if (USING_STATIC_TORCH_LIB)
         endif()
     endif()
 endif()
+
+# Create the target which other libraries can link to
+add_library(torch_lib INTERFACE)
+target_link_libraries(torch_lib INTERFACE ${TORCH_LIBRARIES})
+target_include_directories(torch_lib SYSTEM INTERFACE ${TORCH_INCLUDE_DIRS})
diff --git a/dorado/basecall/CMakeLists.txt b/dorado/basecall/CMakeLists.txt
@@ -54,7 +54,7 @@ target_include_directories(dorado_basecall
 
 target_link_libraries(dorado_basecall
     PUBLIC
-        ${TORCH_LIBRARIES}
+        torch_lib
         dorado_utils
     PRIVATE
         ${KOI_LIBRARIES}

diff --git a/dorado/modbase/CMakeLists.txt b/dorado/modbase/CMakeLists.txt
@@ -27,7 +27,7 @@ target_include_directories(dorado_modbase
 
 target_link_libraries(dorado_modbase
     PUBLIC
-        ${TORCH_LIBRARIES}
+        torch_lib
     PRIVATE
         dorado_utils
         spdlog::spdlog

diff --git a/dorado/utils/CMakeLists.txt b/dorado/utils/CMakeLists.txt
@@ -98,15 +98,14 @@ target_include_directories(dorado_utils
 target_include_directories(dorado_utils
     SYSTEM
     PUBLIC
-    ${TORCH_INCLUDE_DIRS}
     ${DORADO_3RD_PARTY_SOURCE}/NVTX/c/include
     ${DORADO_3RD_PARTY_DOWNLOAD}/metal-cpp/metal-cpp
     ${DORADO_3RD_PARTY_SOURCE}/toml11
 )
 
 target_link_libraries(dorado_utils
     PUBLIC
-        ${TORCH_LIBRARIES}
+        torch_lib
         date::date
         edlib
         spdlog::spdlog

diff --git a/dorado/utils/pch/CMakeLists.txt b/dorado/utils/pch/CMakeLists.txt
@@ -10,14 +10,7 @@ target_precompile_headers(dorado_pch
 
 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}
+        torch_lib
 )
 
 enable_warnings_as_errors(dorado_pch)