OrgLion-ML
/
darknet
mirror of https://github.com/AlexeyAB/darknet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

apply feedback from vcpkg ci

This commit is contained in:
Stefano Sinigardi 2021-04-18 16:49:54 +02:00
parent ba8f7bf756
commit b6cd759218
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gemm.c
View File

@ -23,8 +23,18 @@ static inline uint32_t popcnt(uint32_t v) {
#define POPCNT64(x) (popcnt((unsigned)(x)) + popcnt((unsigned)((uint64_t)(x) >> 32))) #define POPCNT64(x) (popcnt((unsigned)(x)) + popcnt((unsigned)((uint64_t)(x) >> 32)))
#else #else
#include <intrin.h> #include <intrin.h>
#ifdef _WIN64
#define POPCNT(x) __popcnt(x) #define POPCNT(x) __popcnt(x)
#define POPCNT64(x) __popcnt64(x) #define POPCNT64(x) __popcnt64(x)
#else
static inline int popcnt_64(uint64_t val64) {
int tmp_count = __popcnt(val64);
tmp_count += __popcnt(val64 >> 32);
return tmp_count;
}
#define POPCNT(x) __popcnt(x)
#define POPCNT64(x) popcnt_64(x)
#endif
#endif #endif
#elif defined(__GNUC__) #elif defined(__GNUC__)
#define POPCNT(x) __builtin_popcount(x) #define POPCNT(x) __builtin_popcount(x)
@ -515,7 +525,7 @@ void transpose_bin(uint32_t *A, uint32_t *B, const int n, const int m,
} }
} }
#if (defined(__AVX__) && defined(__x86_64__)) || (defined(_WIN64) && !defined(__MINGW32__)) #if (defined(__AVX__) && defined(__x86_64__)) || (defined(_WIN64) && !defined(__MINGW32__) && !defined(_M_ARM64))
#if (defined(_WIN64) && !defined(__MINGW64__)) #if (defined(_WIN64) && !defined(__MINGW64__))
#include <intrin.h> #include <intrin.h>