Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[headers] remove many installed files which should remain private, add more fixes for downstream projects #2952

Merged
merged 22 commits into from
Jun 5, 2019
Merged

[headers] remove many installed files which should remain private, add more fixes for downstream projects #2952

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
77917d0
[headers] move .h files to our own subfolder to avoid clashes with ot…
cenit Apr 17, 2019
ff7d920
[build.sh] use correct osx triplet name
cenit Apr 17, 2019
eebe735
[FindCUDNN] fix unnecessary message and dll symbol
cenit Apr 18, 2019
df0d33d
[build.sh] fix problems with empty env variables
cenit Apr 18, 2019
6497ba1
[dark.lib] set correct function visibility when building shared libs …
cenit Apr 18, 2019
f0a158e
[ci] add tests with vcpkg on linux
cenit Apr 18, 2019
b8962b2
disable vcpkg bootstrap when not required
cenit Apr 18, 2019
73cc42c
improve CI compatibility with updated opencv@2 and opencv@3 on mac, f…
cenit Apr 23, 2019
b805bde
[travis,cuda] add missing symbol
cenit Apr 23, 2019
49986d5
install header files to darknet/ subfolder
cenit Apr 23, 2019
c2071db
fully recicle install location in target definition
cenit Apr 23, 2019
21e6372
[ci] allow vcpkg failures, export CC and CXX symbols, use stb from vc…
cenit Apr 30, 2019
3a20020
[ci] extend timeout for vcpkg, add all vcpkg configs to allowed failures
cenit Apr 30, 2019
84ee1f4
[travis] disable vcpkg's built opencv[cuda] also on cuda-enabled conf…
cenit Apr 30, 2019
f27f7cc
move towards using only modern cmake
cenit May 12, 2019
52dabbb
move towards using only modern cmake - part 2
cenit May 13, 2019
d21dc00
move towards using only modern cmake - part 3
cenit May 13, 2019
920b29f
fixes for ci and included files
cenit May 13, 2019
d853658
fix symbols usage
cenit May 14, 2019
5e242df
remove deprecated json file
cenit May 14, 2019
578d1c0
[cmake+cuda] improve friendliness of architecture selection
cenit May 20, 2019
a3d5cc4
Merge branch 'master' into dev/cenit/include
cenit May 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ Thumbs.db
.vscode/

lib/
include/
include/darknet/
share/
15 changes: 10 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ configure_file(
)

set(ENABLE_CUDA "TRUE" CACHE BOOL "Enable CUDA build")
set(ENABLE_CUDNN "FALSE" CACHE BOOL "Enable CUDNN")
set(ENABLE_OPENMP "TRUE" CACHE BOOL "Enable OpenMP")
if(${CMAKE_VERSION} VERSION_LESS "3.8.0")
set(ENABLE_CUDA "FALSE" CACHE BOOL "Enable CUDA build" FORCE)
message(WARNING "To build with CUDA support you need CMake 3.8.0+")
Expand Down Expand Up @@ -146,6 +148,7 @@ if(ENABLE_CUDA)
find_package(CUDNN)
if(CUDNN_FOUND)
add_definitions(-DCUDNN)
set(ENABLE_CUDNN "TRUE" CACHE BOOL "Enable CUDNN" FORCE)
if(CUDA_COMPUTE_MODEL VERSION_GREATER_EQUAL ${CUDA_COMPUTE_MODEL_70})
add_definitions(-DCUDNN_HALF)
message(STATUS "Enabled CUDNN_HALF")
Expand Down Expand Up @@ -213,6 +216,8 @@ else()
find_package(OpenMP)
if(OPENMP_FOUND)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
else()
set(ENABLE_OPENMP "FALSE" CACHE BOOL "Enable OpenMP" FORCE)
endif()
endif()

Expand Down Expand Up @@ -276,7 +281,7 @@ if(OpenCV_FOUND AND OpenCV_VERSION VERSION_GREATER "3.0" AND NOT SKIP_USELIB_TRA
add_executable(uselib_track ${CMAKE_CURRENT_LIST_DIR}/src/yolo_console_dll.cpp)
target_compile_definitions(uselib_track PRIVATE TRACK_OPTFLOW=1)
set_target_properties(uselib_track PROPERTIES LINKER_LANGUAGE CXX)
target_include_directories(uselib_track PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src> $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${Stb_INCLUDE_DIR}>)
target_include_directories(uselib_track PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src> $<INSTALL_INTERFACE:include/darknet> $<BUILD_INTERFACE:${Stb_INCLUDE_DIR}>)
target_link_libraries(uselib_track PRIVATE ${OpenCV_LIBS})
endif()

Expand All @@ -287,9 +292,9 @@ add_executable(darknet ${CMAKE_CURRENT_LIST_DIR}/src/darknet.c ${sources} ${head
set_source_files_properties(${CMAKE_CURRENT_LIST_DIR}/src/darknet.c PROPERTIES LANGUAGE CXX)
set_target_properties(darknet PROPERTIES LINKER_LANGUAGE CXX)

target_include_directories(darknet PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src> $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${Stb_INCLUDE_DIR}>)
target_include_directories(darklib PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src> $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${Stb_INCLUDE_DIR}>)
target_include_directories(uselib PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src> $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${Stb_INCLUDE_DIR}>)
target_include_directories(darknet PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src> $<INSTALL_INTERFACE:include/darknet> $<BUILD_INTERFACE:${Stb_INCLUDE_DIR}>)
target_include_directories(darklib PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src> $<INSTALL_INTERFACE:include/darknet> $<BUILD_INTERFACE:${Stb_INCLUDE_DIR}>)
target_include_directories(uselib PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src> $<INSTALL_INTERFACE:include/darknet> $<BUILD_INTERFACE:${Stb_INCLUDE_DIR}>)

if(CUDNN_FOUND)
target_link_libraries(darknet PRIVATE CuDNN::CuDNN)
Expand Down Expand Up @@ -344,7 +349,7 @@ install(TARGETS darklib EXPORT DarknetTargets
RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}"
PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}/darknet"
cenit marked this conversation as resolved.
Show resolved Hide resolved
COMPONENT dev
)
install(TARGETS uselib darknet
Expand Down
19 changes: 6 additions & 13 deletions DarknetConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,21 @@
# Config file for the Darknet package
# It defines the following variables
# Darknet_INCLUDE_DIRS - include directories for Darknet
# Darknet_LIBRARIES - libraries to link against

# Compute paths
get_filename_component(Darknet_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
set(Darknet_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@")
list(APPEND CMAKE_MODULE_PATH "${Darknet_CMAKE_DIR}")

include(CMakeFindDependencyMacro)

if(@ENABLE_OPENCV@)
find_dependency(OpenCV REQUIRED)
find_dependency(OpenCV)
add_definitions(-DOPENCV)
endif()

find_dependency(Stb REQUIRED)
find_dependency(Stb)

if(@ENABLE_CUDA@)
find_dependency(CUDNN)
add_definitions(-DGPU)
if(CUDNN_FOUND)
if(@ENABLE_CUDNN@)
find_dependency(CUDNN)
add_definitions(-DCUDNN)
if(@CUDA_COMPUTE_MODEL@ VERSION_GREATER_EQUAL @CUDA_COMPUTE_MODEL_70@)
add_definitions(-DCUDNN_HALF)
Expand All @@ -36,12 +31,10 @@ if(MSVC)
find_dependency(PThreads_windows)
endif()

if("${CMAKE_VERSION}" VERSION_GREATER "3.9.0")
if(@ENABLE_OPENMP@)
find_dependency(OpenMP)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
endif()

# Our library dependencies (contains definitions for IMPORTED targets)
include("${Darknet_CMAKE_DIR}/DarknetTargets.cmake")

# These are IMPORTED targets created by DarknetTargets.cmake
set(Darknet_LIBRARIES darklib)
2 changes: 1 addition & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
export CC="/usr/local/bin/gcc-8"
export CXX="/usr/local/bin/g++-8"
fi
vcpkg_triplet="x64-darwin"
vcpkg_triplet="x64-osx"
else
vcpkg_triplet="x64-linux"
fi
Expand Down