Skip to content

Commit 8b5c1cd

Browse files
committed
update readme usage, add ubuntu-20.04 ci
1 parent 57a709e commit 8b5c1cd

File tree

2 files changed

+39
-5
lines changed

2 files changed

+39
-5
lines changed

.github/workflows/CI.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,40 @@ jobs:
139139
name: waifu2x-ncnn-vulkan-artifact-ubuntu-18.04
140140
path: waifu2x-ncnn-vulkan-artifact
141141

142+
ubuntu-2004:
143+
runs-on: ubuntu-20.04
144+
steps:
145+
- uses: actions/checkout@v2
146+
with:
147+
submodules: 'recursive'
148+
- name: cache-vulkansdk
149+
id: cache-vulkansdk
150+
uses: actions/cache@v1
151+
with:
152+
path: "1.2.135.0"
153+
key: vulkansdk-linux-x86_64-1.2.135.0
154+
- name: vulkansdk
155+
if: steps.cache-vulkansdk.outputs.cache-hit != 'true'
156+
run: |
157+
wget https://sdk.lunarg.com/sdk/download/1.2.135.0/linux/vulkansdk-linux-x86_64-1.2.135.0.tar.gz?Human=true -O vulkansdk-linux-x86_64-1.2.135.0.tar.gz
158+
tar -xf vulkansdk-linux-x86_64-1.2.135.0.tar.gz
159+
rm -rf 1.2.135.0/source 1.2.135.0/samples
160+
find 1.2.135.0 -type f | grep -v -E 'vulkan|glslang' | xargs rm
161+
- name: configure
162+
run: export VULKAN_SDK=`pwd`/1.2.135.0/x86_64 && mkdir build && cd build && cmake ../src
163+
- name: build
164+
run: cmake --build build -j 2
165+
- name: deploy
166+
run: |
167+
mkdir waifu2x-ncnn-vulkan-artifact
168+
strip build/waifu2x-ncnn-vulkan
169+
cp -v build/waifu2x-ncnn-vulkan waifu2x-ncnn-vulkan-artifact
170+
cp -v -r models/* waifu2x-ncnn-vulkan-artifact
171+
- uses: actions/upload-artifact@v2
172+
with:
173+
name: waifu2x-ncnn-vulkan-artifact-ubuntu-20.04
174+
path: waifu2x-ncnn-vulkan-artifact
175+
142176
macos-1015:
143177
runs-on: macos-10.15
144178
steps:

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ Usage: waifu2x-ncnn-vulkan -i infile -o outfile [options]...
3030
-h show this help
3131
-v verbose output
3232
-i input-path input image path (jpg/png/webp) or directory
33-
-o output-path output image path (png/webp) or directory
33+
-o output-path output image path (jpg/png/webp) or directory
3434
-n noise-level denoise level (-1/0/1/2/3, default=0)
3535
-s scale upscale ratio (1/2, default=2)
36-
-t tile-size tile size (>=32/0=auto, default=0)
36+
-t tile-size tile size (>=32/0=auto, default=0) can be 0,0,0 for multi-gpu
3737
-m model-path waifu2x model path (default=models-cunet)
38-
-g gpu-id gpu device to use (default=0)
39-
-j load:proc:save thread count for load/proc/save (default=1:2:2)
38+
-g gpu-id gpu device to use (default=0) can be 0,1,2 for multi-gpu
39+
-j load:proc:save thread count for load/proc/save (default=1:2:2) can be 1:2,2,2:2 for multi-gpu
4040
-x enable tta mode
41-
-f format output image format (png/webp, default=ext/png)
41+
-f format output image format (jpg/png/webp, default=ext/png)
4242
```
4343

4444
- `input-path` and `output-path` accept either file path or directory path

0 commit comments

Comments
 (0)