Skip to content

Commit 69a2914

Browse files
takuya-takeuchitakuya-takeuchi
committed
0.0.0.20221128
1 parent de058e3 commit 69a2914

File tree

220 files changed

+5912
-1043
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

220 files changed

+5912
-1043
lines changed

‎.gitlab-ci.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
variables:
2+
GIT_CLEAN_FLAGS: -ffdx -e build_*
3+
14
stages:
25
- build
36
- package
@@ -11,7 +14,6 @@ build:win:
1114
- "Get-ChildItem env:"
1215
script:
1316
- cd nuget
14-
- git clean -fxd .
1517
- pwsh BuildWindows.ps1
1618
- pwsh BuildUniversalWindowsPlatform.ps1
1719
tags:

‎NcnnDotNet.sln

+15-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestDeconvolution", "tests\
5353
EndProject
5454
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestDeconvolutionDepthWise", "tests\tests\TestDeconvolutionDepthWise\TestDeconvolutionDepthWise.csproj", "{942FB51E-24DD-43FE-964C-8A72DB573DD3}"
5555
EndProject
56-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NcnnDotNet.Tests", "tests\NcnnDotNet.Tests\NcnnDotNet.Tests.csproj", "{26CC3A91-3ADE-4EB7-A55F-61BD8E9A98A2}"
56+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NcnnDotNet.Tests", "tests\NcnnDotNet.Tests\NcnnDotNet.Tests.csproj", "{26CC3A91-3ADE-4EB7-A55F-61BD8E9A98A2}"
57+
EndProject
58+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YoloV5", "examples\YoloV5\YoloV5.csproj", "{D1B00D23-B0AA-45B4-B222-73587BA15E1E}"
59+
EndProject
60+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SCRFD ", "examples\SCRFD\SCRFD .csproj", "{6180B1EC-0A2F-428B-8F0B-F0E115312DA2}"
5761
EndProject
5862
Global
5963
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -149,6 +153,14 @@ Global
149153
{26CC3A91-3ADE-4EB7-A55F-61BD8E9A98A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
150154
{26CC3A91-3ADE-4EB7-A55F-61BD8E9A98A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
151155
{26CC3A91-3ADE-4EB7-A55F-61BD8E9A98A2}.Release|Any CPU.Build.0 = Release|Any CPU
156+
{D1B00D23-B0AA-45B4-B222-73587BA15E1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
157+
{D1B00D23-B0AA-45B4-B222-73587BA15E1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
158+
{D1B00D23-B0AA-45B4-B222-73587BA15E1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
159+
{D1B00D23-B0AA-45B4-B222-73587BA15E1E}.Release|Any CPU.Build.0 = Release|Any CPU
160+
{6180B1EC-0A2F-428B-8F0B-F0E115312DA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
161+
{6180B1EC-0A2F-428B-8F0B-F0E115312DA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
162+
{6180B1EC-0A2F-428B-8F0B-F0E115312DA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
163+
{6180B1EC-0A2F-428B-8F0B-F0E115312DA2}.Release|Any CPU.Build.0 = Release|Any CPU
152164
EndGlobalSection
153165
GlobalSection(SolutionProperties) = preSolution
154166
HideSolutionNode = FALSE
@@ -176,6 +188,8 @@ Global
176188
{516226CF-57D7-4797-8DC0-74C9832E685C} = {43124B0A-942F-479D-B5AF-B928D6FD59D7}
177189
{942FB51E-24DD-43FE-964C-8A72DB573DD3} = {43124B0A-942F-479D-B5AF-B928D6FD59D7}
178190
{26CC3A91-3ADE-4EB7-A55F-61BD8E9A98A2} = {43124B0A-942F-479D-B5AF-B928D6FD59D7}
191+
{D1B00D23-B0AA-45B4-B222-73587BA15E1E} = {65E02C5F-4C5C-4444-AC3C-63CBBE76C4B5}
192+
{6180B1EC-0A2F-428B-8F0B-F0E115312DA2} = {65E02C5F-4C5C-4444-AC3C-63CBBE76C4B5}
179193
EndGlobalSection
180194
GlobalSection(ExtensibilityGlobals) = postSolution
181195
SolutionGuid = {C7789377-10BC-434A-87CC-8001AE7F93C6}

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# ![Alt text](nuget/nn48.png "NcnnDotNet") NcnnDotNet [![GitHub license](https://img.shields.io/github/license/mashape/apistatus.svg)]()
1+
![NcnnDotNet](https://socialify.git.ci/takuya-takeuchi/NcnnDotNet/image?description=1&font=Raleway&language=1&logo=https%3A%2F%2Fgithub.com%2Ftakuya-takeuchi%2FNcnnDotNet%2Fraw%2Fmaster%2Fnuget%2Fnn128.png&owner=1&pattern=Circuit%20Board&theme=Light)
22

3-
ncnn wrapper written in C++ and C# for Windows, MacOS, Linux, iOS and Android.
3+
[![GitHub Stars](https://img.shields.io/github/stars/takuya-takeuchi/ncnndotnet?label=STARS&color=%23DFB317&style=for-the-badge)]() [![GitHub Forks](https://img.shields.io/github/forks/takuya-takeuchi/ncnndotnet?label=FORKS&color=%236ECA00&style=for-the-badge)]() [![GitHub Issues](https://img.shields.io/github/issues/takuya-takeuchi/ncnndotnet?label=ISSUES&color=%23007EC6&style=for-the-badge)]() [![GitHub Lisence](https://img.shields.io/github/license/takuya-takeuchi/ncnndotnet?label=LISENCE&color=%239109BD&style=for-the-badge)]()
44

55
|Package|OS|x86|x64|ARM|ARM64|Nuget|
66
|---|---|---|---|---|---|---|
7-
|NcnnDotNet (CPU)|Windows|-|✓|-|-|[![NuGet version](https://img.shields.io/nuget/v/NcnnDotNet.svg)](https://www.nuget.org/packages/NcnnDotNet)|
7+
|NcnnDotNet (CPU)|Windows|✓|✓|-|-|[![NuGet version](https://img.shields.io/nuget/v/NcnnDotNet.svg)](https://www.nuget.org/packages/NcnnDotNet)|
88
||Linux|-|✓|-|✓|[![NuGet version](https://img.shields.io/nuget/v/NcnnDotNet.svg)](https://www.nuget.org/packages/NcnnDotNet)|
99
||OSX|-|✓|-|-|[![NuGet version](https://img.shields.io/nuget/v/NcnnDotNet.svg)](https://www.nuget.org/packages/NcnnDotNet)|
1010
|NcnnDotNet (GPU)|Windows|-|✓|-|-|[![NuGet version](https://img.shields.io/nuget/v/NcnnDotNet.GPU.svg)](https://www.nuget.org/packages/NcnnDotNet.GPU)|

‎benchmark/BenchCNN/DataReaderFromEmpty.cs

-30
This file was deleted.

‎docker/base/centos/7/vulkan/x64/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ RUN yum update -y && yum install -y \
66
wget
77

88
# install vulkan sdk
9-
ENV VULKAN_SDK_VERSION 1.2.162.0
9+
ENV VULKAN_SDK_VERSION 1.2.189.0
1010
WORKDIR /usr/share/vulkan
11-
RUN wget https://sdk.lunarg.com/sdk/download/${VULKAN_SDK_VERSION}/linux/vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz?Human=true -O vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz
11+
RUN curl --output vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz https://sdk.lunarg.com/sdk/download/${VULKAN_SDK_VERSION}/linux/vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz?Human=true
1212
RUN tar -xf vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz
1313
RUN rm vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz
1414
ENV VULKAN_SDK /usr/share/vulkan/${VULKAN_SDK_VERSION}/x86_64

‎docker/base/ubuntu/16/vulkan/x64/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ FROM ubuntu:16.04
22
LABEL maintainer "Takuya Takeuchi <[email protected]>"
33

44
# install vulkan sdk
5-
RUN apt-get update && apt install -y wget apt-transport-https
5+
RUN apt-get update && apt install -y wget apt-transport-https curl
66

77
# install vulkan sdk
8-
ENV VULKAN_SDK_VERSION 1.2.162.0
8+
ENV VULKAN_SDK_VERSION 1.2.189.0
99
WORKDIR /usr/share/vulkan
10-
RUN wget https://sdk.lunarg.com/sdk/download/${VULKAN_SDK_VERSION}/linux/vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz?Human=true -O vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz
10+
RUN curl --output vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz https://sdk.lunarg.com/sdk/download/${VULKAN_SDK_VERSION}/linux/vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz?Human=true
1111
RUN tar -xf vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz
1212
RUN rm vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz
1313
ENV VULKAN_SDK /usr/share/vulkan/${VULKAN_SDK_VERSION}/x86_64

‎docker/base/ubuntu/18/vulkan/x64/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ FROM ubuntu:18.04
22
LABEL maintainer "Takuya Takeuchi <[email protected]>"
33

44
# install vulkan sdk
5-
RUN apt-get update && apt install -y wget apt-transport-https
5+
RUN apt-get update && apt install -y wget apt-transport-https curl
66

77
# install vulkan sdk
8-
ENV VULKAN_SDK_VERSION 1.2.162.0
8+
ENV VULKAN_SDK_VERSION 1.2.189.0
99
WORKDIR /usr/share/vulkan
10-
RUN wget https://sdk.lunarg.com/sdk/download/${VULKAN_SDK_VERSION}/linux/vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz?Human=true -O vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz
10+
RUN curl --output vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz https://sdk.lunarg.com/sdk/download/${VULKAN_SDK_VERSION}/linux/vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz?Human=true
1111
RUN tar -xf vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz
1212
RUN rm vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz
1313
ENV VULKAN_SDK /usr/share/vulkan/${VULKAN_SDK_VERSION}/x86_64

‎docker/devel/centos/7/vulkan/x64/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ RUN alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake3 20 \
3939
--family cmake
4040

4141
# install vulkan sdk
42-
ENV VULKAN_SDK_VERSION 1.2.162.0
42+
ENV VULKAN_SDK_VERSION 1.2.189.0
4343
WORKDIR /usr/share/vulkan
44-
RUN wget https://sdk.lunarg.com/sdk/download/${VULKAN_SDK_VERSION}/linux/vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz?Human=true -O vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz
44+
RUN curl --output vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz https://sdk.lunarg.com/sdk/download/${VULKAN_SDK_VERSION}/linux/vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz?Human=true
4545
RUN tar -xf vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz
4646
RUN rm vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz
4747
ENV VULKAN_SDK /usr/share/vulkan/${VULKAN_SDK_VERSION}/x86_64

‎docker/devel/ubuntu/16/android/28.0.3-r20-jdk8/Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ RUN cd /opt && mkdir -p /opt/android-sdk-linux && mkdir -p ~/.android && touch ~
3333
RUN apt-get update && apt-get install -y --no-install-recommends \
3434
unzip \
3535
wget \
36+
curl \
3637
apt-transport-https
3738

3839
RUN cd /opt/android-sdk-linux \
@@ -84,9 +85,9 @@ RUN apt-get update && apt-get install -y \
8485
# install vulkan sdk
8586
RUN apt-get update && apt install -y wget apt-transport-https
8687

87-
ENV VULKAN_SDK_VERSION 1.2.162.0
88+
ENV VULKAN_SDK_VERSION 1.2.189.0
8889
WORKDIR /usr/share/vulkan
89-
RUN wget https://sdk.lunarg.com/sdk/download/${VULKAN_SDK_VERSION}/linux/vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz?Human=true -O vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz
90+
RUN curl --output vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz https://sdk.lunarg.com/sdk/download/${VULKAN_SDK_VERSION}/linux/vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz?Human=true
9091
RUN tar -xf vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz
9192
RUN rm vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz
9293
ENV VULKAN_SDK /usr/share/vulkan/${VULKAN_SDK_VERSION}/x86_64

‎docker/devel/ubuntu/16/arm/arm64/Dockerfile

+8-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,14 @@ RUN apt-get update && apt-get install -y \
77
libx11-dev \
88
libgtk2.0-dev \
99
pkg-config \
10-
cmake
10+
wget
11+
12+
# cmake
13+
ENV CMAKE_VERSION 3.21.3
14+
ENV ARCH linux-aarch64
15+
RUN wget -q https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-${ARCH}.sh && chmod +x cmake-${CMAKE_VERSION}-${ARCH}.sh
16+
RUN echo y | ./cmake-${CMAKE_VERSION}-${ARCH}.sh
17+
RUN mv cmake-${CMAKE_VERSION}-${ARCH} /opt && echo y | ln -s /opt/cmake-${CMAKE_VERSION}-${ARCH}/bin/* /usr/bin
1118

1219
# install compiler for arm
1320
# At fist, install binfmt-support before install qemu-user-static

‎docker/devel/ubuntu/16/cpu/x64/Dockerfile

+8-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,14 @@ RUN apt-get update && apt-get install -y \
77
libx11-dev \
88
libgtk2.0-dev \
99
pkg-config \
10-
cmake
10+
wget
11+
12+
# cmake
13+
ENV CMAKE_VERSION 3.21.3
14+
ENV ARCH linux-x86_64
15+
RUN wget -q https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-${ARCH}.sh && chmod +x cmake-${CMAKE_VERSION}-${ARCH}.sh
16+
RUN echo y | ./cmake-${CMAKE_VERSION}-${ARCH}.sh
17+
RUN mv cmake-${CMAKE_VERSION}-${ARCH} /opt && echo y | ln -s /opt/cmake-${CMAKE_VERSION}-${ARCH}/bin/* /usr/bin
1118

1219
# set compiler
1320
ENV CMAKE_C_COMPILER=/usr/bin/gcc

‎docker/devel/ubuntu/16/vulkan/x64/Dockerfile

+11-4
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,24 @@ RUN apt-get update && apt-get install -y \
77
libx11-dev \
88
libgtk2.0-dev \
99
pkg-config \
10-
cmake \
1110
apt-transport-https \
1211
wget
1312

13+
# cmake
14+
ENV CMAKE_VERSION 3.21.3
15+
ENV ARCH linux-x86_64
16+
RUN wget -q https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-${ARCH}.sh && chmod +x cmake-${CMAKE_VERSION}-${ARCH}.sh
17+
RUN echo y | ./cmake-${CMAKE_VERSION}-${ARCH}.sh
18+
RUN mv cmake-${CMAKE_VERSION}-${ARCH} /opt && echo y | ln -s /opt/cmake-${CMAKE_VERSION}-${ARCH}/bin/* /usr/bin
19+
1420
# set compiler
1521
ENV CMAKE_C_COMPILER=/usr/bin/gcc
1622
ENV CMAKE_CXX_COMPILER=/usr/bin/g++
1723

1824
# Register Microsoft key and feed
1925
RUN apt-get update && apt-get install -y \
2026
wget \
27+
curl \
2128
apt-transport-https
2229
RUN wget -q https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb
2330
RUN dpkg -i packages-microsoft-prod.deb && rm packages-microsoft-prod.deb
@@ -26,13 +33,13 @@ RUN apt-get update && apt-get install -y \
2633
&& apt-get clean && rm -rf /var/lib/apt/lists/*
2734

2835
# install vulkan sdk
29-
ENV VULKAN_SDK_VERSION 1.2.162.0
36+
ENV VULKAN_SDK_VERSION 1.2.189.0
3037
WORKDIR /usr/share/vulkan
31-
RUN wget https://sdk.lunarg.com/sdk/download/${VULKAN_SDK_VERSION}/linux/vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz?Human=true -O vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz
38+
RUN curl --output vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz https://sdk.lunarg.com/sdk/download/${VULKAN_SDK_VERSION}/linux/vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz?Human=true
3239
RUN tar -xf vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz
3340
RUN rm vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.gz
3441
ENV VULKAN_SDK /usr/share/vulkan/${VULKAN_SDK_VERSION}/x86_64
3542

3643
WORKDIR /
3744
# old cmake does not have FindVulkan.cmake
38-
RUN cp /usr/share/vulkan/${VULKAN_SDK_VERSION}/samples/cmake/FindVulkan.cmake /usr/share/cmake-3.5/Modules
45+
RUN cp /usr/share/vulkan/${VULKAN_SDK_VERSION}/source/Vulkan-Tools/cmake/FindVulkan.cmake /opt/cmake-${CMAKE_VERSION}-${ARCH}/Modules

‎examples/FasterRCNN/Program.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ private static int Main(string[] args)
2727
{
2828
if (m.IsEmpty)
2929
{
30-
Console.WriteLine($"cv::imread {imagepath} failed");
30+
Console.WriteLine($"Cv2.ImRead {imagepath} failed");
3131
return -1;
3232
}
3333

‎examples/MobileNetSSD/Program.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ private static int Main(string[] args)
2626
{
2727
if (m.IsEmpty)
2828
{
29-
Console.WriteLine($"cv::imread {imagepath} failed");
29+
Console.WriteLine($"Cv2.ImRead {imagepath} failed");
3030
return -1;
3131
}
3232

‎examples/MobileNetV2SSDLite/Program.cs

+4-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ private sealed class Noop : CustomLayer
1414
{
1515
}
1616

17-
private static Noop NoopLayerCreator()
17+
private static Noop NoopLayerCreator(IntPtr userData)
1818
{
1919
return new Noop();
2020
}
@@ -35,7 +35,7 @@ private static int Main(string[] args)
3535
{
3636
if (m.IsEmpty)
3737
{
38-
Console.WriteLine($"cv::imread {imagepath} failed");
38+
Console.WriteLine($"Cv2.ImRead {imagepath} failed");
3939
return -1;
4040
}
4141

@@ -63,7 +63,8 @@ private static int DetectMobileNetV2(NcnnDotNet.OpenCV.Mat bgr, List<Object> obj
6363
if (Ncnn.IsSupportVulkan)
6464
mobilenetV2.Opt.UseVulkanCompute = true;
6565

66-
mobilenetV2.RegisterCustomLayer("Silence", new DelegateHandler<LayerCreatorFunc>(NoopLayerCreator));
66+
using var reg = new CustomLayerRegister("Silence", NoopLayerCreator);
67+
mobilenetV2.RegisterCustomLayer(reg);
6768

6869
// original pretrained model from https://github.com/chuanqi305/MobileNetv2-SSDLite
6970
// https://github.com/chuanqi305/MobileNetv2-SSDLite/blob/master/ssdlite/voc/deploy.prototxt

‎examples/MobileNetV3SSDLite/Program.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ private static int Main(string[] args)
2626
{
2727
if (m.IsEmpty)
2828
{
29-
Console.WriteLine($"cv::imread {imagepath} failed");
29+
Console.WriteLine($"Cv2.ImRead {imagepath} failed");
3030
return -1;
3131
}
3232

‎examples/PeleeNetSSDSeg/Program.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ private static int Main(string[] args)
2626
{
2727
if (m.IsEmpty)
2828
{
29-
Console.WriteLine($"cv::imread {imagepath} failed");
29+
Console.WriteLine($"Cv2.ImRead {imagepath} failed");
3030
return -1;
3131
}
3232

‎examples/RFCN/Program.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ private static int Main(string[] args)
2727
{
2828
if (m.IsEmpty)
2929
{
30-
Console.WriteLine($"cv::imread {imagepath} failed");
30+
Console.WriteLine($"Cv2.ImRead {imagepath} failed");
3131
return -1;
3232
}
3333

@@ -317,7 +317,7 @@ private static void NmsSortedBBoxes(IList<Object> objects, IList<int> picked, fl
317317
// intersection over union
318318
var interArea = IntersectionArea(a, b);
319319
var unionArea = areas[i] + areas[picked[j]] - interArea;
320-
// float IoU = inter_area / union_area
320+
// float IoU = inter_area / union_area
321321
if (interArea / unionArea > nmsThreshold)
322322
keep = 0;
323323
}

‎examples/RetinaFace/Program.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ private static int Main(string[] args)
2727
{
2828
if (m.IsEmpty)
2929
{
30-
Console.WriteLine($"cv::imread {imagepath} failed");
30+
Console.WriteLine($"Cv2.ImRead {imagepath} failed");
3131
return -1;
3232
}
3333

‎examples/SCRFD/.gitignore

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
scrfd_1g-opt2.bin
2+
scrfd_1g-opt2.param
3+
scrfd_2.5g_kps-opt2.bin
4+
scrfd_2.5g_kps-opt2.param
5+
scrfd_2.5g-opt2.bin
6+
scrfd_2.5g-opt2.param
7+
scrfd_10g_kps-opt2.bin
8+
scrfd_10g_kps-opt2.param
9+
scrfd_10g-opt2.bin
10+
scrfd_10g-opt2.param
11+
scrfd_34g-opt2.bin
12+
scrfd_34g-opt2.param
13+
scrfd_500m_kps-opt2.bin
14+
scrfd_500m_kps-opt2.param
15+
scrfd_500m-opt2.bin
16+
scrfd_500m-opt2.param

‎examples/SCRFD/FaceObject.cs

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
using NcnnDotNet.OpenCV;
2+
3+
namespace SCRFD
4+
{
5+
6+
internal sealed class FaceObject
7+
{
8+
9+
#region Properties
10+
11+
public Rect<float> Rect
12+
{
13+
get;
14+
set;
15+
}
16+
17+
public Point<float>[] Landmark
18+
{
19+
get;
20+
set;
21+
}
22+
23+
public float Prob
24+
{
25+
get;
26+
set;
27+
}
28+
29+
#endregion
30+
31+
}
32+
33+
}

0 commit comments

Comments
 (0)