From 3f3d8b00361ff1043f27ce9ad30b399f662f4507 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Wed, 13 Dec 2023 07:23:17 +0800 Subject: [PATCH] [darknet] Fix dependence cuda (#35413) * [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 --- ports/darknet/portfile.cmake | 7 +++++-- ports/darknet/vcpkg.json | 14 +++++++++++++- versions/baseline.json | 2 +- versions/d-/darknet.json | 5 +++++ 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/ports/darknet/portfile.cmake b/ports/darknet/portfile.cmake index 91f8d347b7e4f5..4626d33f2993ba 100644 --- a/ports/darknet/portfile.cmake +++ b/ports/darknet/portfile.cmake @@ -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 @@ -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} @@ -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") diff --git a/ports/darknet/vcpkg.json b/ports/darknet/vcpkg.json index ff05fd5a26b63e..db3e543dfc4891 100644 --- a/ports/darknet/vcpkg.json +++ b/ports/darknet/vcpkg.json @@ -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, @@ -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": [ @@ -114,6 +120,12 @@ "opencv3-cuda": { "description": "Build darknet with support for CUDA-enabled OpenCV3", "dependencies": [ + { + "name": "darknet", + "features": [ + "cuda" + ] + }, { "name": "opencv3", "features": [ diff --git a/versions/baseline.json b/versions/baseline.json index 34fbbec0e5d44c..d339d58d6b5ba5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2086,7 +2086,7 @@ }, "darknet": { "baseline": "2022-03-06", - "port-version": 3 + "port-version": 4 }, "darts-clone": { "baseline": "1767ab87cffe", diff --git a/versions/d-/darknet.json b/versions/d-/darknet.json index a85c812eb51d55..3b988ac067bf85 100644 --- a/versions/d-/darknet.json +++ b/versions/d-/darknet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b61e4babb5696ae0a5b1d85f9d81540c69688675", + "version-date": "2022-03-06", + "port-version": 4 + }, { "git-tree": "0143bad2181e6280f1c59918b5c1767ff166ad31", "version-date": "2022-03-06",