diff --git a/ports/ncnn/fix_uwp.patch b/ports/ncnn/fix_uwp.patch deleted file mode 100644 index d678464aeaa3dc..00000000000000 --- a/ports/ncnn/fix_uwp.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/src/cpu.cpp b/src/cpu.cpp -index e56cd67..3ca1189 100644 ---- a/src/cpu.cpp -+++ b/src/cpu.cpp -@@ -184,6 +184,13 @@ static int g_cpu_is_arm_a53_a55; - #endif // defined __ANDROID__ || defined __linux__ - - #if defined _WIN32 -+#if WINAPI_FAMILY == WINAPI_FAMILY_APP -+static int detectisa(const void* /*some_inst*/) -+{ -+ // uwp does not support seh :( -+ return 0; -+} -+#else // WINAPI_FAMILY == WINAPI_FAMILY_APP - static int g_sigill_caught = 0; - static jmp_buf g_jmpbuf; - -@@ -213,6 +220,7 @@ static int detectisa(const void* some_inst) - - return g_sigill_caught ? 0 : 1; - } -+#endif // WINAPI_FAMILY == WINAPI_FAMILY_APP - - #if defined(__i386__) || defined(__x86_64__) || defined(_M_IX86) || defined(_M_X64) - #ifdef _MSC_VER -@@ -1966,12 +1974,12 @@ static void initialize_global_cpu_info() - - #if defined _WIN32 - #if __arm__ -- g_cpu_support_arm_neon = detectisa(some_neon); -+ g_cpu_support_arm_neon = 1; // all modern windows arm devices have neon - g_cpu_support_arm_vfpv4 = detectisa(some_vfpv4); - #if __aarch64__ - g_cpu_support_arm_cpuid = detectisa(some_cpuid); -- g_cpu_support_arm_asimdhp = detectisa(some_asimdhp); -- g_cpu_support_arm_asimddp = detectisa(some_asimddp); -+ g_cpu_support_arm_asimdhp = detectisa(some_asimdhp) || IsProcessorFeaturePresent(43); // dp implies hp -+ g_cpu_support_arm_asimddp = detectisa(some_asimddp) || IsProcessorFeaturePresent(43); // 43 is PF_ARM_V82_DP_INSTRUCTIONS_AVAILABLE - g_cpu_support_arm_asimdfhm = detectisa(some_asimdfhm); - g_cpu_support_arm_bf16 = detectisa(some_bf16); - g_cpu_support_arm_i8mm = detectisa(some_i8mm); diff --git a/ports/ncnn/portfile.cmake b/ports/ncnn/portfile.cmake index 40000fcc82aec1..91f058018f1efc 100644 --- a/ports/ncnn/portfile.cmake +++ b/ports/ncnn/portfile.cmake @@ -2,10 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Tencent/ncnn REF "${VERSION}" - SHA512 31bc3c2f461a00241fb8f69ca6ea8cc590af6618856b1b84a048bde924e4b474fd883ad5d54dbfbdd1e5b59015889e15ffc4fbafccb3e42e052a02071f2017b1 + SHA512 0a285589451334eac3fcb9135c17f8938d6110fc6950f1b9061bc98450132b88a205ed0318ca5d810d537406c96b397384936d2268f79fb4c8a1c3fd049ebc41 HEAD_REF master - PATCHES - fix_uwp.patch #https://github.com/Tencent/ncnn/pull/5328 ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) diff --git a/ports/ncnn/vcpkg.json b/ports/ncnn/vcpkg.json index 3369007843b65d..77885d565df63a 100644 --- a/ports/ncnn/vcpkg.json +++ b/ports/ncnn/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ncnn", - "version": "20240102", - "port-version": 1, + "version": "20241226", "description": "ncnn is a high-performance neural network inference computing framework.", "homepage": "https://github.com/Tencent/ncnn", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 44a299580f73e6..6fedac1c53adfd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6281,8 +6281,8 @@ "port-version": 2 }, "ncnn": { - "baseline": "20240102", - "port-version": 1 + "baseline": "20241226", + "port-version": 0 }, "ncurses": { "baseline": "6.4", diff --git a/versions/n-/ncnn.json b/versions/n-/ncnn.json index 3bff868a6d87aa..21f323f5b785a1 100644 --- a/versions/n-/ncnn.json +++ b/versions/n-/ncnn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "754f1c94d8a95a778236281d8cb743ab16e14d5d", + "version": "20241226", + "port-version": 0 + }, { "git-tree": "4d52e0be36ae3ae67d9d1b2dac78ec753e50fb66", "version": "20240102",