Unverified Commit 52b39ecc authored by bmanga's avatar bmanga Committed by GitHub
Browse files

Replace pybind11 with cmake's Python3 package (#1850)

parent 2d1bf7cb
...@@ -10,8 +10,8 @@ if(WITH_CUDA) ...@@ -10,8 +10,8 @@ if(WITH_CUDA)
add_definitions(-D__CUDA_NO_HALF_OPERATORS__) add_definitions(-D__CUDA_NO_HALF_OPERATORS__)
endif() endif()
find_package(Python3 COMPONENTS Development)
find_package(Torch REQUIRED) find_package(Torch REQUIRED)
find_package(pybind11 REQUIRED)
file(GLOB HEADERS torchvision/csrc/*.h) file(GLOB HEADERS torchvision/csrc/*.h)
file(GLOB OPERATOR_SOURCES torchvision/csrc/cpu/*.h torchvision/csrc/cpu/*.cpp) file(GLOB OPERATOR_SOURCES torchvision/csrc/cpu/*.h torchvision/csrc/cpu/*.cpp)
...@@ -22,7 +22,7 @@ file(GLOB MODELS_HEADERS torchvision/csrc/models/*.h) ...@@ -22,7 +22,7 @@ file(GLOB MODELS_HEADERS torchvision/csrc/models/*.h)
file(GLOB MODELS_SOURCES torchvision/csrc/models/*.h torchvision/csrc/models/*.cpp) file(GLOB MODELS_SOURCES torchvision/csrc/models/*.h torchvision/csrc/models/*.cpp)
add_library(${PROJECT_NAME} SHARED ${MODELS_SOURCES} ${OPERATOR_SOURCES}) add_library(${PROJECT_NAME} SHARED ${MODELS_SOURCES} ${OPERATOR_SOURCES})
target_link_libraries(${PROJECT_NAME} PRIVATE ${TORCH_LIBRARIES} pybind11::pybind11) target_link_libraries(${PROJECT_NAME} PRIVATE ${TORCH_LIBRARIES} Python3::Python)
set_target_properties(${PROJECT_NAME} PROPERTIES EXPORT_NAME TorchVision) set_target_properties(${PROJECT_NAME} PROPERTIES EXPORT_NAME TorchVision)
target_include_directories(${PROJECT_NAME} INTERFACE target_include_directories(${PROJECT_NAME} INTERFACE
......
...@@ -28,10 +28,10 @@ include("${CMAKE_CURRENT_LIST_DIR}/${PN}Targets.cmake") ...@@ -28,10 +28,10 @@ include("${CMAKE_CURRENT_LIST_DIR}/${PN}Targets.cmake")
if(NOT TARGET torch_library) if(NOT TARGET torch_library)
find_package(Torch REQUIRED) find_package(Torch REQUIRED)
endif() endif()
if(NOT TARGET pybind11::pybind11) if(NOT TARGET Python3::Python)
find_package(pybind11 REQUIRED) find_package(Python3 COMPONENTS Development)
endif() endif()
target_link_libraries(TorchVision::TorchVision INTERFACE ${TORCH_LIBRARIES} pybind11::pybind11) target_link_libraries(TorchVision::TorchVision INTERFACE ${TORCH_LIBRARIES} Python3::Python)
if(@WITH_CUDA@) if(@WITH_CUDA@)
target_compile_definitions(TorchVision::TorchVision INTERFACE WITH_CUDA) target_compile_definitions(TorchVision::TorchVision INTERFACE WITH_CUDA)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment