diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2020-09-24 15:15:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-24 15:15:06 -0700 |
| commit | 4cbbcbddfd42d94d6d8ee6c8b6ad00ef6a0927d3 (patch) | |
| tree | 371509cc59c45895c85e5e049aaa2cd9c39cc7b0 /ports/darknet | |
| parent | c1acea1f044d3300b0c3791c2ce74d53e5a15548 (diff) | |
| download | vcpkg-4cbbcbddfd42d94d6d8ee6c8b6ad00ef6a0927d3.tar.gz vcpkg-4cbbcbddfd42d94d6d8ee6c8b6ad00ef6a0927d3.zip | |
[vcpkg macos ci] Switch to using our own base boxes, to fix bringing up mac machines (#13619)
* [vcpkg ci:osx] Remove brew install
* add instructions for creating a new vagrant box
* fix the vagrant scripts for the new box
* finish fixing the setup
* [mecab jxrlib] fix ports for CI
mecab needed to use an actual ref that wasn't master,
and jxrlib needed a patch for xcode 12 CLTs.
Additionally, this fixes the mecab version to be a date, the date of the last commit,
since `1.0` is not the correct version (mecab doesn't have released versions)
* [many ports] fix compile with Xcode 12 CLTs
This mostly means fixing errors on implicit-function-declaration,
and removing some Werrors
* alac-decoder
* apr
* argtable2
* arrow
* hyperscan
* mcpp
* minizip
* mosquitto
* stormlib
* [many ports] even more Xcode 12 CLT fixes
* [jxrlib darknet] fix the last ports! (hopefully)
* CRs, plus minor wip changes to osx scripts
Diffstat (limited to 'ports/darknet')
| -rw-r--r-- | ports/darknet/0001-rename-_castu32_f32-to-gemm_castu32_f32.patch | 26 | ||||
| -rw-r--r-- | ports/darknet/CONTROL | 1 | ||||
| -rw-r--r-- | ports/darknet/portfile.cmake | 2 |
3 files changed, 29 insertions, 0 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 new file mode 100644 index 000000000..3e459c225 --- /dev/null +++ b/ports/darknet/0001-rename-_castu32_f32-to-gemm_castu32_f32.patch @@ -0,0 +1,26 @@ +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 32e5b629f..25617ab14 100644 --- a/ports/darknet/CONTROL +++ b/ports/darknet/CONTROL @@ -1,5 +1,6 @@ Source: darknet Version: 2020-08-30 +Port-Version: 1 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 b1ba7cf15..54f204f84 100644 --- a/ports/darknet/portfile.cmake +++ b/ports/darknet/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF ecad770071eb776208a46977347e6d2410d4f50e SHA512 1de0dc3f4842c68f5c12addf100996f7176ffb50dcd89a0b57446ba996d9199e31531f64c32eedbc2ea6a449459573811444dd35f1a50ece3880f58717c795ab HEAD_REF master + PATCHES + 0001-rename-_castu32_f32-to-gemm_castu32_f32.patch ) # enable CUDA inside DARKNET |