Skip to content

Commit

Permalink
[darknet] Fix dependence cuda (#35413)
Browse files Browse the repository at this point in the history
* [darknet] Fix dependence cuda

* version

* version

* version

* tool update

* version

* add option

* version

* option

* version

* update tool

* version

* del patch

* version

* Correct cuda dependencies

* version

* revert portfile.cmake

* version
  • Loading branch information
FrankXie05 authored Dec 12, 2023
1 parent f562387 commit 3f3d8b0
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 4 deletions.
7 changes: 5 additions & 2 deletions ports/darknet/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ vcpkg_from_github(
REF 8a0bf84c19e38214219dbd3345f04ce778426c57
SHA512 6253d5b498f4f6eba7fc539d5a4b4e163139f4841623f11d84760bcf1ffabe6519f85e98e3d4aeac6846313fea3b98451407134b6b6f5b91137c62d1647109d9
HEAD_REF master
PATCHES fix-dependence-getopt.patch
PATCHES
fix-dependence-getopt.patch
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
Expand Down Expand Up @@ -33,7 +34,8 @@ file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/Modules")
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
DISABLE_PARALLEL_CONFIGURE
OPTIONS ${FEATURE_OPTIONS}
OPTIONS
${FEATURE_OPTIONS}
-DINSTALL_BIN_DIR:STRING=bin
-DINSTALL_LIB_DIR:STRING=lib
-DENABLE_OPENCV:BOOL=${ENABLE_OPENCV}
Expand All @@ -59,4 +61,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

file(INSTALL "${SOURCE_PATH}/scripts/download_weights.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/scripts")
message(STATUS "To download weight files, please go to ${CURRENT_INSTALLED_DIR}/tools/${PORT}/scripts and run ./download_weights.ps1")

vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
14 changes: 13 additions & 1 deletion ports/darknet/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "darknet",
"version-date": "2022-03-06",
"port-version": 3,
"port-version": 4,
"description": "Darknet is an open source neural network framework written in C and CUDA. You only look once (YOLO) is a state-of-the-art, real-time object detection system, best example of darknet functionalities.",
"homepage": "https://github.com/alexeyab/darknet",
"license": null,
Expand Down Expand Up @@ -64,6 +64,12 @@
"opencv-cuda": {
"description": "Build darknet with support for latest version of CUDA-enabled OpenCV",
"dependencies": [
{
"name": "darknet",
"features": [
"cuda"
]
},
{
"name": "opencv",
"features": [
Expand Down Expand Up @@ -114,6 +120,12 @@
"opencv3-cuda": {
"description": "Build darknet with support for CUDA-enabled OpenCV3",
"dependencies": [
{
"name": "darknet",
"features": [
"cuda"
]
},
{
"name": "opencv3",
"features": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -2086,7 +2086,7 @@
},
"darknet": {
"baseline": "2022-03-06",
"port-version": 3
"port-version": 4
},
"darts-clone": {
"baseline": "1767ab87cffe",
Expand Down
5 changes: 5 additions & 0 deletions versions/d-/darknet.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b61e4babb5696ae0a5b1d85f9d81540c69688675",
"version-date": "2022-03-06",
"port-version": 4
},
{
"git-tree": "0143bad2181e6280f1c59918b5c1767ff166ad31",
"version-date": "2022-03-06",
Expand Down

0 comments on commit 3f3d8b0

Please sign in to comment.