diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2021-01-22 21:08:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-22 12:08:50 -0800 |
| commit | a528e6ac1f239dbbae281e3a59ad3696bb4a8ee5 (patch) | |
| tree | dfd1fb76df41714dcfde7ba71fb5f01c94651cac | |
| parent | 925b64efd2210e04568dfd5a33473e86a6d618a9 (diff) | |
| download | vcpkg-a528e6ac1f239dbbae281e3a59ad3696bb4a8ee5.tar.gz vcpkg-a528e6ac1f239dbbae281e3a59ad3696bb4a8ee5.zip | |
[darknet] update to latest version (#15770)
* [darknet] update to latest version
* update version refs
* [darknet] update to latest version
* update version refs
Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
| -rw-r--r-- | ports/darknet/0001-rename-_castu32_f32-to-gemm_castu32_f32.patch | 26 | ||||
| -rw-r--r-- | ports/darknet/CONTROL | 3 | ||||
| -rw-r--r-- | ports/darknet/portfile.cmake | 10 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/d-/darknet.json | 5 |
5 files changed, 12 insertions, 36 deletions
diff --git a/ports/darknet/0001-rename-_castu32_f32-to-gemm_castu32_f32.patch b/ports/darknet/0001-rename-_castu32_f32-to-gemm_castu32_f32.patch deleted file mode 100644 index 3e459c225..000000000 --- a/ports/darknet/0001-rename-_castu32_f32-to-gemm_castu32_f32.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ed14dcf873775dcfc56883f55c10619779d8f87e Mon Sep 17 00:00:00 2001 -From: Nicole Mazzuca <mazzucan@outlook.com> -Date: Thu, 24 Sep 2020 09:48:16 -0700 -Subject: [PATCH] rename _castu32_f32 to gemm_castu32_f32 - -since _castu32_f32 is reserved, an implementation is allowed to name a function that, -and it turns out Xcode 12 did. ---- - src/gemm.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/gemm.c b/src/gemm.c -index 0b06d98..bc2aef3 100644 ---- a/src/gemm.c -+++ b/src/gemm.c -@@ -546,6 +546,7 @@ static inline float _mm256_extract_float32(__m256 a, const int index) { - #include <smmintrin.h> - #include <cpuid.h> - -+#define _castu32_f32 gemm_castu32_f32 - static inline float _castu32_f32(uint32_t a) { - return *((float *)&a); - } --- -2.24.3 (Apple Git-128) - diff --git a/ports/darknet/CONTROL b/ports/darknet/CONTROL index b41b9737d..e23b761d0 100644 --- a/ports/darknet/CONTROL +++ b/ports/darknet/CONTROL @@ -1,6 +1,5 @@ Source: darknet -Version: 2020-08-30 -Port-Version: 2 +Version: 2021-01-21 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. Build-Depends: pthreads, stb diff --git a/ports/darknet/portfile.cmake b/ports/darknet/portfile.cmake index d786e196e..3f3df1190 100644 --- a/ports/darknet/portfile.cmake +++ b/ports/darknet/portfile.cmake @@ -1,11 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AlexeyAB/darknet - REF ecad770071eb776208a46977347e6d2410d4f50e - SHA512 1de0dc3f4842c68f5c12addf100996f7176ffb50dcd89a0b57446ba996d9199e31531f64c32eedbc2ea6a449459573811444dd35f1a50ece3880f58717c795ab + REF 00d578e327c22638ea12e73c4efb74c798c08de5 + SHA512 ef2d46fab670759e9c22d0233b60192bfe47669e29d2ec1e020a77dfaf09894a93160c11de070bc39d86109dd2a37ca7172fbb081809b1ea2783207a6e385b2c HEAD_REF master - PATCHES - 0001-rename-_castu32_f32-to-gemm_castu32_f32.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -30,7 +28,7 @@ if("weights" IN_LIST FEATURES) vcpkg_download_distfile(YOLOV4-TINY_WEIGHTS URLS "https://github.com/AlexeyAB/darknet/releases/download/darknet_yolo_v4_pre/yolov4-tiny.weights" FILENAME "darknet-cache/yolov4-tiny.weights" - SHA512 7d4d9fe150f9fe3ea7d2310f1445fe983b31fbf06d301c70ecfe00e8559e6f1bf940198c2dd55db772238f23ea0092fb6553558e5414f3ee173b8b28e53c5b54 + SHA512 804ca2ab8e3699d31c95bf773d22f901f186703487c7945f30dc2dbb808094793362cb6f5da5cd0b4b83f820c8565a3cba22fafa069ee6ca2a925677137d95f4 ) vcpkg_download_distfile(YOLOV4_WEIGHTS URLS "https://github.com/AlexeyAB/darknet/releases/download/darknet_yolo_v3_optimal/yolov4.weights" @@ -73,7 +71,7 @@ if("weights-train" IN_LIST FEATURES) vcpkg_download_distfile(YOLOV4-TINY-CONV-29 URLS "https://github.com/AlexeyAB/darknet/releases/download/darknet_yolo_v4_pre/yolov4-tiny.conv.29" FILENAME "darknet-cache/yolov4-tiny.conv.29" - SHA512 d145deb80aea3d422752e784323d89919281ed7a37d15f939f5b680ff62e502072a30e074c34a09026669126d360c7d6817ea1afa53cfa53c56bd1e16333a602 + SHA512 318e47f4bdf43b7f4eff8f3669bc9ba66cd7bd8ffb31df5bc1978682c85fec8e63a8349958022fd933cc676cbf5241953f2181bf4d1789f7cf9d371e012e3e49 ) vcpkg_download_distfile(YOLOV4-CONV-137 URLS "https://github.com/AlexeyAB/darknet/releases/download/darknet_yolo_v3_optimal/yolov4.conv.137" diff --git a/versions/baseline.json b/versions/baseline.json index 082055258..eeba29e0e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1513,8 +1513,8 @@ "port-version": 0 }, "darknet": { - "baseline": "2020-08-30", - "port-version": 2 + "baseline": "2021-01-21", + "port-version": 0 }, "darts-clone": { "baseline": "1767ab87cffe-1", diff --git a/versions/d-/darknet.json b/versions/d-/darknet.json index c7e4b4daa..89f7d3ced 100644 --- a/versions/d-/darknet.json +++ b/versions/d-/darknet.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "05bdc42da8656bf1acf80d6f3f821dff045c7b72", + "version-string": "2021-01-21", + "port-version": 0 + }, + { "git-tree": "5013a879bca7ed0f5a443fa9e379abbedfd38eeb", "version-string": "2020-08-30", "port-version": 2 |