Skip to content

Commit 19500db

Browse files
takuya-takeuchitakuya-takeuchi
authored
0.0.0.20221128 (#52)
1 parent 758e11f commit 19500db

152 files changed

Lines changed: 3251 additions & 132 deletions

File tree

Some content is hidden

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

‎.gitlab-ci.yml‎

Lines changed: 3 additions & 1 deletion
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:

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
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)|

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

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ FROM ubuntu:16.04
22
LABEL maintainer "Takuya Takeuchi <takuya.takeuchi.dev@gmail.com>"
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‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ FROM ubuntu:18.04
22
LABEL maintainer "Takuya Takeuchi <takuya.takeuchi.dev@gmail.com>"
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 3 additions & 2 deletions
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‎

Lines changed: 8 additions & 1 deletion
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‎

Lines changed: 8 additions & 1 deletion
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‎

Lines changed: 11 additions & 4 deletions
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

0 commit comments

Comments
 (0)