From 40ae58b56829fdd529663452a1bcd2f948f8554f Mon Sep 17 00:00:00 2001 From: nihui Date: Wed, 10 Apr 2024 14:46:36 +0800 Subject: [PATCH 1/4] Update README.md --- README.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/README.md b/README.md index 771fc8c1053..f1064007c5b 100644 --- a/README.md +++ b/README.md @@ -132,7 +132,6 @@ https://github.com/Tencent/ncnn/releases/latest [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-ios-vulkan.zip) - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-ios-vulkan-bitcode.zip) @@ -146,7 +145,6 @@ https://github.com/Tencent/ncnn/releases/latest [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-ios.zip) - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-ios-bitcode.zip) @@ -155,7 +153,6 @@ https://github.com/Tencent/ncnn/releases/latest [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-ios-simulator-vulkan.zip) - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-ios-simulator-vulkan-bitcode.zip) @@ -164,7 +161,6 @@ https://github.com/Tencent/ncnn/releases/latest [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-ios-simulator.zip) - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-ios-simulator-bitcode.zip) @@ -205,7 +201,6 @@ https://github.com/Tencent/ncnn/releases/latest [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-mac-catalyst-vulkan.zip) - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-mac-catalyst-vulkan-bitcode.zip) @@ -219,7 +214,6 @@ https://github.com/Tencent/ncnn/releases/latest [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-mac-catalyst.zip) - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-mac-catalyst-bitcode.zip) @@ -270,7 +264,6 @@ https://github.com/Tencent/ncnn/releases/latest [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-apple-vulkan.zip) - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-apple-vulkan-bitcode.zip) @@ -282,7 +275,6 @@ https://github.com/Tencent/ncnn/releases/latest [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-apple.zip) - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-apple-bitcode.zip) From f623ec08db91ce90c3c18f17ad275f7d3c46dffb Mon Sep 17 00:00:00 2001 From: nihui Date: Wed, 10 Apr 2024 15:06:56 +0800 Subject: [PATCH 2/4] Update README.md --- README.md | 82 ++++++++++++++++++++++++------------------------------- 1 file changed, 35 insertions(+), 47 deletions(-) diff --git a/README.md b/README.md index f1064007c5b..6259c1edd89 100644 --- a/README.md +++ b/README.md @@ -98,7 +98,7 @@ https://github.com/Tencent/ncnn/releases/latest [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-android-vulkan.zip) - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-android-vulkan-shared.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-android.zip) @@ -108,17 +108,17 @@ https://github.com/Tencent/ncnn/releases/latest -Android cpuonly +Android shared - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-android.zip) - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-android-shared.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-android-vulkan-shared.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-android-shared.zip) - + @@ -132,20 +132,13 @@ https://github.com/Tencent/ncnn/releases/latest [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-ios-vulkan.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-ios.zip) - + [](https://github.com/Tencent/ncnn/actions?query=workflow%3Aios) - - - -iOS cpuonly - - - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-ios.zip) - @@ -153,20 +146,13 @@ https://github.com/Tencent/ncnn/releases/latest [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-ios-simulator-vulkan.zip) - - - - -iOS-Simulator cpuonly - - - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-ios-simulator.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-ios-simulator.zip) - + @@ -180,20 +166,13 @@ https://github.com/Tencent/ncnn/releases/latest [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-macos-vulkan.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-macos.zip) - + [](https://github.com/Tencent/ncnn/actions?query=workflow%3Amacos) - - - -macOS cpuonly - - - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-macos.zip) - @@ -201,20 +180,13 @@ https://github.com/Tencent/ncnn/releases/latest [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-mac-catalyst-vulkan.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-mac-catalyst.zip) - + [](https://github.com/Tencent/ncnn/actions?query=workflow%3Amac-catalyst) - - - -Mac-Catalyst cpuonly - - - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-mac-catalyst.zip) - @@ -242,7 +214,8 @@ https://github.com/Tencent/ncnn/releases/latest tvOS - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-tvos.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-tvos-vulkan.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-tvos.zip) @@ -255,26 +228,41 @@ https://github.com/Tencent/ncnn/releases/latest tvOS-Simulator - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-tvos-simulator.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-tvos-simulator-vulkan.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-tvos-simulator.zip) -Apple xcframework +visionOS - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-apple-vulkan.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-visionos.zip) + [](https://github.com/Tencent/ncnn/actions?query=workflow%3Avisionos) + -Apple xcframework cpuonly +watchOS-Simulator - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-apple.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-visionos-simulator.zip) + + + + +Apple xcframework + + + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-apple-vulkan.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-apple.zip) + + + From b0630c44719484bbdfe79f2368fac75f5e80c9c5 Mon Sep 17 00:00:00 2001 From: nihuini Date: Wed, 10 Apr 2024 15:21:39 +0800 Subject: [PATCH 3/4] release 20240410 --- README.md | 72 +++++++++++++++++++++++++++---------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index 6259c1edd89..3ac9838d48b 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ https://github.com/Tencent/ncnn/releases/latest Source - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-full-source.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-full-source.zip) @@ -97,8 +97,8 @@ https://github.com/Tencent/ncnn/releases/latest Android - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-android-vulkan.zip) - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-android.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-android-vulkan.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-android.zip) @@ -111,8 +111,8 @@ https://github.com/Tencent/ncnn/releases/latest Android shared - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-android-vulkan-shared.zip) - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-android-shared.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-android-vulkan-shared.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-android-shared.zip) @@ -131,8 +131,8 @@ https://github.com/Tencent/ncnn/releases/latest iOS - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-ios-vulkan.zip) - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-ios.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-ios-vulkan.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-ios.zip) @@ -145,8 +145,8 @@ https://github.com/Tencent/ncnn/releases/latest iOS-Simulator - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-ios-simulator-vulkan.zip) - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-ios-simulator.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-ios-simulator-vulkan.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-ios-simulator.zip) @@ -165,8 +165,8 @@ https://github.com/Tencent/ncnn/releases/latest macOS - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-macos-vulkan.zip) - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-macos.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-macos-vulkan.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-macos.zip) @@ -179,8 +179,8 @@ https://github.com/Tencent/ncnn/releases/latest Mac-Catalyst - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-mac-catalyst-vulkan.zip) - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-mac-catalyst.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-mac-catalyst-vulkan.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-mac-catalyst.zip) @@ -193,7 +193,7 @@ https://github.com/Tencent/ncnn/releases/latest watchOS - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-watchos.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-watchos.zip) @@ -206,7 +206,7 @@ https://github.com/Tencent/ncnn/releases/latest watchOS-Simulator - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-watchos-simulator.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-watchos-simulator.zip) @@ -214,8 +214,8 @@ https://github.com/Tencent/ncnn/releases/latest tvOS - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-tvos-vulkan.zip) - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-tvos.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-tvos-vulkan.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-tvos.zip) @@ -228,8 +228,8 @@ https://github.com/Tencent/ncnn/releases/latest tvOS-Simulator - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-tvos-simulator-vulkan.zip) - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-tvos-simulator.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-tvos-simulator-vulkan.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-tvos-simulator.zip) @@ -237,7 +237,7 @@ https://github.com/Tencent/ncnn/releases/latest visionOS - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-visionos.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-visionos.zip) @@ -250,7 +250,7 @@ https://github.com/Tencent/ncnn/releases/latest watchOS-Simulator - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-visionos-simulator.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-visionos-simulator.zip) @@ -258,8 +258,8 @@ https://github.com/Tencent/ncnn/releases/latest Apple xcframework - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-apple-vulkan.zip) - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-apple.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-apple-vulkan.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-apple.zip) @@ -281,8 +281,8 @@ https://github.com/Tencent/ncnn/releases/latest Ubuntu 20.04 - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-ubuntu-2004.zip) - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-ubuntu-2004-shared.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-ubuntu-2004.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-ubuntu-2004-shared.zip) @@ -295,8 +295,8 @@ https://github.com/Tencent/ncnn/releases/latest Ubuntu 22.04 - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-ubuntu-2204.zip) - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-ubuntu-2204-shared.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-ubuntu-2204.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-ubuntu-2204-shared.zip) @@ -315,8 +315,8 @@ https://github.com/Tencent/ncnn/releases/latest VS2015 - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-windows-vs2015.zip) - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-windows-vs2015-shared.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-windows-vs2015.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-windows-vs2015-shared.zip) @@ -329,8 +329,8 @@ https://github.com/Tencent/ncnn/releases/latest VS2017 - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-windows-vs2017.zip) - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-windows-vs2017-shared.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-windows-vs2017.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-windows-vs2017-shared.zip) @@ -338,8 +338,8 @@ https://github.com/Tencent/ncnn/releases/latest VS2019 - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-windows-vs2019.zip) - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-windows-vs2019-shared.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-windows-vs2019.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-windows-vs2019-shared.zip) @@ -347,8 +347,8 @@ https://github.com/Tencent/ncnn/releases/latest VS2022 - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-windows-vs2022.zip) - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-windows-vs2022-shared.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-windows-vs2022.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-windows-vs2022-shared.zip) @@ -367,7 +367,7 @@ https://github.com/Tencent/ncnn/releases/latest WebAssembly - [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240102-webassembly.zip) + [](https://github.com/Tencent/ncnn/releases/latest/download/ncnn-20240410-webassembly.zip) From b5275bf25e18bd45e56278665b49eeb0c5c75b16 Mon Sep 17 00:00:00 2001 From: nihuini Date: Wed, 10 Apr 2024 15:33:34 +0800 Subject: [PATCH 4/4] install importlib-metadata for python build --- .github/workflows/python.yml | 2 +- pyproject.toml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 3e793f618cf..e8c5ee3847a 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -86,7 +86,7 @@ jobs: - name: install-deps run: | python -m pip install --upgrade pip - pip install pytest setuptools wheel twine + pip install pytest setuptools wheel twine importlib-metadata - name: build if: matrix.os == 'ubuntu-latest' diff --git a/pyproject.toml b/pyproject.toml index 84bca11705f..e2945c8b6ec 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,5 +4,6 @@ requires = [ "wheel", "ninja; sys_platform != 'win32'", "cmake>=3.12", + "importlib-metadata", ] build-backend = "setuptools.build_meta"