Add supports for Ubuntu 18.04 and other Linux Distro with GLIBC Versi…

…on < 2.29 and cmake version < 3.15 Signed-off-by: ArchieMeng <[email protected]>
media2x · May 4, 2021 · 9ae5750 · 9ae5750
1 parent 1bf739d
commit 9ae5750
Show file tree

Hide file tree

Showing 4 changed files with 105 additions and 11 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -69,6 +69,32 @@ jobs:
         cmake ../src
         cmake --build . -j 2
 
+  ubuntu-1804:  # no needs to install swig for it is already there
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
+      - name: cache-vulkansdk
+        id: cache-vulkansdk
+        uses: actions/cache@v1
+        with:
+          path: "1.2.162.0"
+          key: vulkansdk-linux-x86_64-1.2.162.0
+      - name: vulkansdk
+        if: steps.cache-vulkansdk.outputs.cache-hit != 'true'
+        run: |
+          wget https://sdk.lunarg.com/sdk/download/1.2.162.0/linux/vulkansdk-linux-x86_64-1.2.162.0.tar.gz?Human=true -O vulkansdk-linux-x86_64-1.2.162.0.tar.gz
+          tar -xf vulkansdk-linux-x86_64-1.2.162.0.tar.gz
+          rm -rf 1.2.162.0/source 1.2.162.0/samples
+          find 1.2.162.0 -type f | grep -v -E 'vulkan|glslang' | xargs rm
+      - name: build
+        run: |
+          export VULKAN_SDK=`pwd`/1.2.162.0/x86_64
+          mkdir build && cd build
+          cmake ../src
+          cmake --build . -j 2
+
   macos:
     runs-on: macos-latest
     steps:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,6 +7,7 @@ on:
 env:
   DEVELOPER_DIR: /Applications/Xcode_12.2.app/Contents/Developer
   APPLICATION_NAME: waifu2x-ncnn-vulkan-python
+  APPNAME_SHORT: waifu2x
 
 jobs:
 
@@ -55,9 +56,9 @@ jobs:
       run: |
         mkdir -p ${{ env.PACKAGENAME }}
         cp README.md LICENSE ${{ env.PACKAGENAME }}
-        cp build/waifu2x_ncnn_vulkan.py ${{ env.PACKAGENAME }}
-        cp build/waifu2x_ncnn_vulkan_wrapper.py ${{ env.PACKAGENAME }}
-        cp build/_waifu2x_ncnn_vulkan_wrapper.so ${{ env.PACKAGENAME }}
+        cp build/${{ env.APPNAME_SHORT }}_ncnn_vulkan.py ${{ env.PACKAGENAME }}
+        cp build/${{ env.APPNAME_SHORT }}_ncnn_vulkan_wrapper.py ${{ env.PACKAGENAME }}
+        cp build/_${{ env.APPNAME_SHORT }}_ncnn_vulkan_wrapper.so ${{ env.PACKAGENAME }}
         cp -r models/ ${{ env.PACKAGENAME }}
         zip -9 -r ${{ env.PACKAGENAME }}.zip ${{ env.PACKAGENAME }}
     - name: upload
@@ -66,6 +67,49 @@ jobs:
         name: ${{ env.PACKAGENAME }}
         path: ${{ env.PACKAGENAME }}.zip
 
+  ubuntu-1804:
+    needs: [setup]
+    runs-on: ubuntu-18.04
+    env:
+      PACKAGENAME: ${{ needs.setup.outputs.APPNAME }}-${{ needs.setup.outputs.VERSION }}-ubuntu-1804
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
+      - name: cache-vulkansdk
+        id: cache-vulkansdk
+        uses: actions/cache@v1
+        with:
+          path: "1.2.162.0"
+          key: vulkansdk-linux-x86_64-1.2.162.0
+      - name: vulkansdk
+        if: steps.cache-vulkansdk.outputs.cache-hit != 'true'
+        run: |
+          wget https://sdk.lunarg.com/sdk/download/1.2.162.0/linux/vulkansdk-linux-x86_64-1.2.162.0.tar.gz?Human=true -O vulkansdk-linux-x86_64-1.2.162.0.tar.gz
+          tar -xf vulkansdk-linux-x86_64-1.2.162.0.tar.gz
+          rm -rf 1.2.162.0/source 1.2.162.0/samples
+          find 1.2.162.0 -type f | grep -v -E 'vulkan|glslang' | xargs rm
+      - name: build
+        run: |
+          export VULKAN_SDK=`pwd`/1.2.162.0/x86_64
+          mkdir build && cd build
+          cmake ../src
+          cmake --build . -j 2
+      - name: package
+        run: |
+          mkdir -p ${{ env.PACKAGENAME }}
+          cp README.md LICENSE ${{ env.PACKAGENAME }}
+          cp build/${{ env.APPNAME_SHORT }}_ncnn_vulkan.py ${{ env.PACKAGENAME }}
+          cp build/${{ env.APPNAME_SHORT }}_ncnn_vulkan_wrapper.py ${{ env.PACKAGENAME }}
+          cp build/_${{ env.APPNAME_SHORT }}_ncnn_vulkan_wrapper.so ${{ env.PACKAGENAME }}
+          cp -r models/ ${{ env.PACKAGENAME }}
+          zip -9 -r ${{ env.PACKAGENAME }}.zip ${{ env.PACKAGENAME }}
+      - name: upload
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ env.PACKAGENAME }}
+          path: ${{ env.PACKAGENAME }}.zip
+
   openmp-macos:
     runs-on: macos-latest
     steps:
@@ -182,9 +226,9 @@ jobs:
       run: |
         mkdir -p ${{ env.PACKAGENAME }}
         cp README.md LICENSE ${{ env.PACKAGENAME }}
-        cp build-x86_64/waifu2x_ncnn_vulkan.py ${{ env.PACKAGENAME }}
-        cp build-x86_64/waifu2x_ncnn_vulkan_wrapper.py ${{ env.PACKAGENAME }}
-        cp build-x86_64/_waifu2x_ncnn_vulkan_wrapper.so ${{ env.PACKAGENAME }}
+        cp build-x86_64/${{ env.APPNAME_SHORT }}_ncnn_vulkan.py ${{ env.PACKAGENAME }}
+        cp build-x86_64/${{ env.APPNAME_SHORT }}_ncnn_vulkan_wrapper.py ${{ env.PACKAGENAME }}
+        cp build-x86_64/_${{ env.APPNAME_SHORT }}_ncnn_vulkan_wrapper.so ${{ env.PACKAGENAME }}
         cp -r models/ ${{ env.PACKAGENAME }}
         zip -9 -r ${{ env.PACKAGENAME }}.zip ${{ env.PACKAGENAME }}
     - name: upload
@@ -241,9 +285,9 @@ jobs:
         ls build
         Copy-Item -Verbose -Path "README.md" -Destination "${{ env.PACKAGENAME }}"
         Copy-Item -Verbose -Path "LICENSE" -Destination "${{ env.PACKAGENAME }}"
-        Copy-Item -Verbose -Path "src\waifu2x_ncnn_vulkan.py" -Destination "${{ env.PACKAGENAME }}"
-        Copy-Item -Verbose -Path "build\waifu2x_ncnn_vulkan_wrapper.py" -Destination "${{ env.PACKAGENAME }}"
-        Copy-Item -Verbose -Path "build\Release\_waifu2x_ncnn_vulkan_wrapper.pyd" -Destination "${{ env.PACKAGENAME }}"
+        Copy-Item -Verbose -Path "src\${{ env.APPNAME_SHORT }}_ncnn_vulkan.py" -Destination "${{ env.PACKAGENAME }}"
+        Copy-Item -Verbose -Path "build\${{ env.APPNAME_SHORT }}_ncnn_vulkan_wrapper.py" -Destination "${{ env.PACKAGENAME }}"
+        Copy-Item -Verbose -Path "build\Release\_${{ env.APPNAME_SHORT }}_ncnn_vulkan_wrapper.pyd" -Destination "${{ env.PACKAGENAME }}"
         Copy-Item -Verbose -Path "C:\windows\system32\vcomp140.dll" -Destination "${{ env.PACKAGENAME }}"
         Copy-Item -Verbose -Recurse -Path "models" -Destination "${{ env.PACKAGENAME }}"
         7z a -r ${{ env.PACKAGENAME }}.zip ${{ env.PACKAGENAME }}
@@ -254,7 +298,7 @@ jobs:
         path: ${{ env.PACKAGENAME }}.zip
 
   release:
-    needs: [setup, ubuntu, macos, windows]
+    needs: [setup, ubuntu, ubuntu-1804, macos, windows]
     runs-on: ubuntu-latest
     steps:
     - name: download
@@ -284,6 +328,17 @@ jobs:
         asset_name: ${{ env.PACKAGENAME }}.zip
         asset_content_type: application/zip
 
+    - name: upload-ubuntu-1804
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        PACKAGENAME: ${{ needs.setup.outputs.APPNAME }}-${{ needs.setup.outputs.VERSION }}-ubuntu-1804
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: artifacts/${{ env.PACKAGENAME }}/${{ env.PACKAGENAME }}.zip
+        asset_name: ${{ env.PACKAGENAME }}.zip
+        asset_content_type: application/zip
+
     - name: upload-macos
       uses: actions/upload-release-asset@v1
       env:

diff --git a/README.md b/README.md
@@ -17,6 +17,7 @@ This project only wrapped the original Waifu2x class. As a result, functions oth
 linux x64, Windows x64 and MacOS x64 releases are available now. For other platforms, you may compile it on your own.
 The reason why MacOS ARM64 build is not available is that it needs ARM Python Dev Libs which I have no ideas on how to
 get it on Github's MacOS x64 VM. Moreover, I don't have a Mac.
+For Linux distro with GLIBC < 2.29 (like Ubuntu 18.04), ubuntu-1804 pre-built should be used.
 
 
 ## Build

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -5,6 +5,13 @@ set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 
 project(waifu2x-ncnn-vulkan-python)
 
+# Python
+if (${CMAKE_VERSION} VERSION_LESS "3.15")
+    find_package(Python REQUIRED)
+else()
+    find_package(Python REQUIRED COMPONENTS Development)
+endif()
+
 # SWIG
 find_package(Python REQUIRED COMPONENTS Development)
 find_package(SWIG REQUIRED COMPONENTS python)
@@ -239,4 +246,9 @@ set_property(SOURCE waifu2x.i PROPERTY CPLUSPLUS ON DEPENDS generate-spirv)
 swig_add_library(waifu2x_ncnn_vulkan_wrapper LANGUAGE python SOURCES waifu2x.i waifu2x.cpp waifu2x_wrapped.cpp)
 add_dependencies(waifu2x_ncnn_vulkan_wrapper generate-spirv)
 target_compile_options(waifu2x_ncnn_vulkan_wrapper PUBLIC -fexceptions)
-target_link_libraries(waifu2x_ncnn_vulkan_wrapper ${WAIFU2X_LINK_LIBRARIES} Python::Module)
+if (${CMAKE_VERSION} VERSION_LESS "3.15")
+    include_directories(${PYTHON_INCLUDE_DIRS})
+    target_link_libraries(waifu2x_ncnn_vulkan_wrapper ${WAIFU2X_LINK_LIBRARIES} ${PYTHON_LIBRARIES})
+else()
+    target_link_libraries(waifu2x_ncnn_vulkan_wrapper ${WAIFU2X_LINK_LIBRARIES} Python::Module)
+endif()