diff --git a/.github/workflows/CI-Linux-x64-Clang.yml b/.github/workflows/CI-Linux-x64-Clang.yml index b3fb11a..85193e3 100644 --- a/.github/workflows/CI-Linux-x64-Clang.yml +++ b/.github/workflows/CI-Linux-x64-Clang.yml @@ -69,7 +69,7 @@ jobs: pip install -r requirements.txt cp src/realcugan_ncnn_vulkan.py test cp src/build/realcugan_ncnn_vulkan_wrapper.*.so test - cp -r src/realcugan-ncnn-vulkan/models test + cp -r models test cd test ls python -m pytest @@ -79,7 +79,7 @@ jobs: mkdir dist cp src/build/realcugan_ncnn_vulkan_wrapper.*.so dist cp src/realcugan_ncnn_vulkan.py dist - cp -r src/realcugan-ncnn-vulkan/models dist + cp -r models dist - name: upload uses: actions/upload-artifact@v3 diff --git a/.github/workflows/CI-Linux-x64-GCC.yml b/.github/workflows/CI-Linux-x64-GCC.yml index 7ff5679..aa17497 100644 --- a/.github/workflows/CI-Linux-x64-GCC.yml +++ b/.github/workflows/CI-Linux-x64-GCC.yml @@ -66,7 +66,7 @@ jobs: pip install -r requirements.txt cp src/realcugan_ncnn_vulkan.py test cp src/build/realcugan_ncnn_vulkan_wrapper.*.so test - cp -r src/realcugan-ncnn-vulkan/models test + cp -r models test cd test ls python -m pytest @@ -76,7 +76,7 @@ jobs: mkdir dist cp src/build/realcugan_ncnn_vulkan_wrapper.*.so dist cp src/realcugan_ncnn_vulkan.py dist - cp -r src/realcugan-ncnn-vulkan/models dist + cp -r models dist - name: upload uses: actions/upload-artifact@v3 diff --git a/.github/workflows/CI-MacOS-Universal-Clang.yml b/.github/workflows/CI-MacOS-Universal-Clang.yml index 16a60e8..e3172ae 100644 --- a/.github/workflows/CI-MacOS-Universal-Clang.yml +++ b/.github/workflows/CI-MacOS-Universal-Clang.yml @@ -188,7 +188,7 @@ jobs: pip install -r requirements.txt cp src/realcugan_ncnn_vulkan.py test cp dist/realcugan_ncnn_vulkan_wrapper.*.so test - cp -r src/realcugan-ncnn-vulkan/models test + cp -r models test cd test ls python -m pytest @@ -196,7 +196,7 @@ jobs: - name: Upload dist run: | cp src/realcugan_ncnn_vulkan.py dist - cp -r src/realcugan-ncnn-vulkan/models dist + cp -r models dist - name: upload diff --git a/.github/workflows/CI-Windows-x64-MSVC.yml b/.github/workflows/CI-Windows-x64-MSVC.yml index 2fb192b..3d44fbe 100644 --- a/.github/workflows/CI-Windows-x64-MSVC.yml +++ b/.github/workflows/CI-Windows-x64-MSVC.yml @@ -69,7 +69,7 @@ jobs: cd .. echo F | xcopy .\src\realcugan_ncnn_vulkan.py test echo F | xcopy .\src\build\Release\realcugan_ncnn_vulkan_wrapper.*.pyd test - echo D | xcopy .\src\realcugan-ncnn-vulkan\models\*.* test\models /s /e + echo D | xcopy .\models\*.* test\models /s /e cd test ls python -m pytest @@ -82,7 +82,7 @@ jobs: cd .. echo F | xcopy .\src\realcugan_ncnn_vulkan.py dist echo F | xcopy .\src\build\Release\realcugan_ncnn_vulkan_wrapper.*.pyd dist - echo D | xcopy .\src\realcugan-ncnn-vulkan\models\*.* dist\models /s /e + echo D | xcopy .\models\*.* dist\models /s /e - name: upload uses: actions/upload-artifact@v3 diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index 5e8448f..7333bcd 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -184,7 +184,7 @@ jobs: pip install twine wheel setuptools pip install -r requirements.txt cp src/realcugan_ncnn_vulkan.py realcugan_ncnn_py - cp -r src/realcugan-ncnn-vulkan/models realcugan_ncnn_py + cp -r models realcugan_ncnn_py python setup.py bdist_wheel - name: upload @@ -246,7 +246,7 @@ jobs: cd .. echo F | xcopy .\src\realcugan_ncnn_vulkan.py realcugan_ncnn_py echo F | xcopy .\src\build\Release\realcugan_ncnn_vulkan_wrapper.*.pyd realcugan_ncnn_py - echo D | xcopy .\src\realcugan-ncnn-vulkan\models\*.* realcugan_ncnn_py\models /s /e + echo D | xcopy .\models\*.* realcugan_ncnn_py\models /s /e python setup.py bdist_wheel - name: upload @@ -307,7 +307,7 @@ jobs: pip install -r requirements.txt cp src/realcugan_ncnn_vulkan.py realcugan_ncnn_py cp src/build/realcugan_ncnn_vulkan_wrapper.*.so realcugan_ncnn_py - cp -r src/realcugan-ncnn-vulkan/models realcugan_ncnn_py + cp -r models realcugan_ncnn_py python setup.py bdist_wheel - name: upload