setup script 2.2.1: updated regex for new waifu2x/srmd/realsr NCNN Vulkan

Dockerfile

@@ -1,8 +1,20 @@
+# Name: Video2X Dockerfile
+# Creator: Danielle Douglas
+# Date Created: Unknown
+# Last Modified: January 14, 2020
+
+# Editor: Lhanjian
+# Last Modified: May 24, 2020
+
+# Editor: K4YT3X
+# Last Modified: May 29, 2020
+
 FROM ubuntu:19.10
 #FROM nvidia/cuda:10.1-cudnn7-devel-ubuntu18.04
-MAINTAINER Danielle Douglas <ddouglas87@gmail.com>
-MAINTAINER Lhanjian <lhjay1@foxmail.com>
-MAINTAINER K4YT3X <k4yt3x@k4yt3x.com>
+
+LABEL maintainer="Danielle Douglas <ddouglas87@gmail.com>"
+LABEL maintainer="Lhanjian <lhjay1@foxmail.com>"
+LABEL maintainer="K4YT3X <k4yt3x@k4yt3x.com>"
 
 # Don't ask questions during image setup.
 ENV DEBIAN_FRONTEND noninteractive
@@ -18,10 +30,7 @@ RUN apt-get update && apt-get install -y apt-utils &&\
     add-apt-repository -y ppa:graphics-drivers/ppa &&\
     apt-get install -y --no-install-recommends apt-fast && apt-fast update
 
-
-## Install Video2X ##
-
-# Dependencies
+# Install dependencies
 RUN apt-fast install -y --no-install-recommends git-core python3-pip python3-setuptools python3-wheel python3-psutil ffmpeg gcc g++ \
     libc6-dev python3-dev libmagic-dev libmagic1 python3.8 nvidia-driver-440 nvidia-cuda-toolkit gnupg2 curl ca-certificates pkg-config \
     autoconf libx264-dev libx265-dev libnuma-dev libvpx-dev libfdk-aac-dev libmp3lame-dev libopus-dev libass-dev libfreetype6-dev libgnutls28-dev \
@@ -34,6 +43,7 @@ RUN apt-fast install -y --no-install-recommends git-core python3-pip python3-set
     libvorbis-dev libvpx-dev libwavpack-dev libwebp-dev libx264-dev libx265-dev libxvidcore-dev libxml2-dev libzmq3-dev libzvbi-dev liblilv-dev \
     libopenal-dev opencl-dev libjack-dev libbluray-dev libfdk-aac-dev libmysofa-dev
 
+# Install MASM
 RUN curl -vfsSLO https://www.nasm.us/pub/nasm/releasebuilds/$NASM_VERSION/nasm-$NASM_VERSION.tar.bz2 \
     && tar -xjf nasm-$NASM_VERSION.tar.bz2 \
     && cd nasm-$NASM_VERSION \
@@ -42,6 +52,8 @@ RUN curl -vfsSLO https://www.nasm.us/pub/nasm/releasebuilds/$NASM_VERSION/nasm-$
     && make -j$(nproc) \
     && make install
 
+# Compile FFmpeg with CUDA support
+
 RUN git clone --recurse-submodules -b n$NVCODEC_VERSION --depth 1 https://git.videolan.org/git/ffmpeg/nv-codec-headers \
     && cd nv-codec-headers \
     && make install
@@ -72,19 +84,15 @@ RUN curl -vfsSLO https://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.bz2 \
     && make -j$(nproc) \
     && make install
 
-# Install Nvidia Driver
-
-RUN curl -fsSL https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/7fa2af80.pub | apt-key add -
-
-RUN echo "deb https://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1804/x86_64 /" > /etc/apt/sources.list.d/nvidia-ml.list
-
 # Install Video2X
 RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.7 1 && update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 2
 RUN  cd / && python3.8 -m pip install --upgrade pip &&\
     git clone --recurse-submodules --progress https://github.com/k4yt3x/video2x.git --depth=1 &&\
-    python3.8 -m pip install avalon_framework colorama python-magic patool psutil pyqt5 pyunpack pyyaml requests tqdm
+    python3.8 -m pip install -U -r video2x/src/requirements-linux.txt
 
-# eg: docker build -t video2x . --build-arg driver=waifu2x_ncnn_vulkan
+# Compile drivers
+
+# example: docker build -t video2x . --build-arg driver=waifu2x_ncnn_vulkan
 ARG driver=all
 
 # Check if driver exists.
@@ -178,9 +186,8 @@ RUN if [ "$driver" = "all" ] || [ "$driver" = "waifu2x_converter" ] ;\
 #ENTRYPOINT ["/entrypoint.sh"]
 
 WORKDIR /host
-ENTRYPOINT ["/bin/bash"]
+ENTRYPOINT ["python3", "/video2x/src/video2x.py"]
 
 ENV NVIDIA_DRIVER_CAPABILITIES all
 # Docker image can ask questions now, if needed.
 ENV DEBIAN_FRONTEND teletype
-

README.md

@@ -33,7 +33,7 @@ To download the latest nightly build, go to the [GitHub Actions](https://github.
 
 ## Introduction
 
-Video2X is a video/GIF/image upscaling software based on Waifu2X, Anime4K and SRMD written in Python 3. It upscales videos, GIFs and images, restoring details from low-resolution inputs. Video2X also accepts GIF input to video output and video input to GIF output.
+Video2X is a video/GIF/image upscaling software based on Waifu2X, Anime4K, SRMD and RealSR written in Python 3. It upscales videos, GIFs and images, restoring details from low-resolution inputs. Video2X also accepts GIF input to video output and video input to GIF output.
 
 Currently, Video2X supports the following drivers (implementations of algorithms).
 
@@ -41,6 +41,7 @@ Currently, Video2X supports the following drivers (implementations of algorithms
 - **Waifu2X Converter CPP**: CPP implementation of waifu2x based on OpenCL and OpenCV
 - **Waifu2X NCNN Vulkan**: NCNN implementation of waifu2x based on Vulkan API
 - **SRMD NCNN Vulkan**: NCNN implementation of SRMD based on Vulkan API
+- **RealSR NCNN Vulkan**: NCNN implementation of RealSR based on Vulkan API
 - **Anime4KCPP**: CPP implementation of Anime4K
 
 ### Video Upscaling
@@ -247,6 +248,7 @@ Available options are:
 - waifu2x_converter_cpp
 - waifu2x_ncnn_vulkan
 - srmd_ncnn_vulkan
+- realsr_ncnn_vulkan
 - anime4kcpp
 
 ### -r RATIO, --ratio RATIO
@@ -278,6 +280,7 @@ This project relies on the following software and projects.
 - [waifu2x-converter-cpp](https://github.com/DeadSix27/waifu2x-converter-cpp)
 - [waifu2x-ncnn-vulkan](https://github.com/nihui/waifu2x-ncnn-vulkan)
 - [srmd-ncnn-vulkan](https://github.com/nihui/srmd-ncnn-vulkan)
+- [realsr-ncnn-vulkan](https://github.com/nihui/realsr-ncnn-vulkan)
 - [Anime4K](https://github.com/bloc97/Anime4K)
 - [Anime4KCPP](https://github.com/TianZerL/Anime4KCPP)
 - [Gifski](https://github.com/ImageOptim/gifski)
@@ -286,10 +289,10 @@ This project relies on the following software and projects.
 
 Appreciations given to the following personnel who have contributed significantly to the project (specifically the technical perspective).
 
-- @BrianPetkovsek
-- @SAT3LL
-- @ddouglas87
-- @lhanjian
+- [@BrianPetkovsek](https://github.com/BrianPetkovsek)
+- [@sat3ll](https://github.com/sat3ll)
+- [@ddouglas87](https://github.com/ddouglas87)
+- [@lhanjian](https://github.com/lhanjian)
 
 ## Related Projects
 

src/video2x.yaml

@@ -1,7 +1,7 @@
 # Name: Video2X Configuration File
 # Creator: K4YT3X
 # Date Created: October 23, 2018
-# Last Modified: May 26, 2020
+# Last Modified: May 29, 2020
 # Values here are the default values. Change the value here to
 #   save the default value permanently.
 # Items commented out are parameters irrelevant to this context
@@ -167,6 +167,6 @@ gifski:
   nosort: false # Use files exactly in the order given, rather than sorted
   quiet: false # Do not show a progress bar
 video2x:
-  video2x_cache_directory: null # default: %TEMP%\video2x
-  image_format: png
-  preserve_frames: false
+  video2x_cache_directory: null # default: %TEMP%\video2x, directory where cache files are stored, will be deleted if preserve_frames is not set to true
+  image_format: png # png/jpg intermediate file format used for extracted frames during video processing
+  preserve_frames: false # if set to true, the cache directory won't be cleaned upon task completion

src/video2x_setup.py

@@ -4,7 +4,7 @@
 Name: Video2X Setup Script
 Creator: K4YT3X
 Date Created: November 28, 2018
-Last Modified: May 29, 2020
+Last Modified: May 30, 2020
 
 Editor: BrianPetkovsek
 Editor: SAT3LL
@@ -44,7 +44,7 @@ import zipfile
 # Therefore, they will be installed during the Python dependency
 #   installation step and imported later in the script.
 
-SETUP_VERSION = '2.2.0'
+SETUP_VERSION = '2.2.1'
 
 # global static variables
 LOCALAPPDATA = pathlib.Path(os.getenv('localappdata'))
@@ -56,7 +56,7 @@ DRIVER_OPTIONS = ['all',
                   'waifu2x_converter_cpp',
                   'waifu2x_ncnn_vulkan',
                   'srmd_ncnn_vulkan',
-                  # 'realsr_ncnn_vulkan',
+                  'realsr_ncnn_vulkan',
                   'anime4kcpp']
 
 
@@ -139,7 +139,7 @@ class Video2xSetup:
         print('\nInstalling Gifski')
         import requests
 
-        # Get latest release of waifu2x-ncnn-vulkan via Github API
+        # Get latest release of Gifski via Github API
         latest_release = requests.get('https://api.github.com/repos/ImageOptim/gifski/releases/latest').json()
 
         for a in latest_release['assets']:
@@ -195,7 +195,7 @@ class Video2xSetup:
         latest_release = requests.get('https://api.github.com/repos/nihui/waifu2x-ncnn-vulkan/releases/latest').json()
 
         for a in latest_release['assets']:
-            if re.search(r'waifu2x-ncnn-vulkan-\d*\.zip', a['browser_download_url']):
+            if re.search(r'waifu2x-ncnn-vulkan-\d*-windows\.zip', a['browser_download_url']):
                 waifu2x_ncnn_vulkan_zip = download(a['browser_download_url'], tempfile.gettempdir())
                 self.trash.append(waifu2x_ncnn_vulkan_zip)
 
@@ -211,6 +211,32 @@ class Video2xSetup:
             # rename the newly extracted directory
             (LOCALAPPDATA / 'video2x' / zipf.namelist()[0]).rename(waifu2x_ncnn_vulkan_directory)
 
+    def _install_srmd_ncnn_vulkan(self):
+        """ Install srmd-ncnn-vulkan
+        """
+        print('\nInstalling srmd-ncnn-vulkan')
+        import requests
+
+        # Get latest release of srmd-ncnn-vulkan via Github API
+        latest_release = requests.get('https://api.github.com/repos/nihui/srmd-ncnn-vulkan/releases/latest').json()
+
+        for a in latest_release['assets']:
+            if re.search(r'srmd-ncnn-vulkan-\d*-windows\.zip', a['browser_download_url']):
+                srmd_ncnn_vulkan_zip = download(a['browser_download_url'], tempfile.gettempdir())
+                self.trash.append(srmd_ncnn_vulkan_zip)
+
+        # extract and rename
+        srmd_ncnn_vulkan_directory = LOCALAPPDATA / 'video2x' / 'srmd-ncnn-vulkan'
+        with zipfile.ZipFile(srmd_ncnn_vulkan_zip) as zipf:
+            zipf.extractall(LOCALAPPDATA / 'video2x')
+
+            # if directory already exists, remove it
+            if srmd_ncnn_vulkan_directory.exists():
+                shutil.rmtree(srmd_ncnn_vulkan_directory)
+
+            # rename the newly extracted directory
+            (LOCALAPPDATA / 'video2x' / zipf.namelist()[0]).rename(srmd_ncnn_vulkan_directory)
+
     def _install_realsr_ncnn_vulkan(self):
         """ Install realsr-ncnn-vulkan
         """
@@ -221,7 +247,7 @@ class Video2xSetup:
         latest_release = requests.get('https://api.github.com/repos/nihui/realsr-ncnn-vulkan/releases/latest').json()
 
         for a in latest_release['assets']:
-            if re.search(r'realsr-ncnn-vulkan-\d*\.zip', a['browser_download_url']):
+            if re.search(r'realsr-ncnn-vulkan-\d*-windows\.zip', a['browser_download_url']):
                 realsr_ncnn_vulkan_zip = download(a['browser_download_url'], tempfile.gettempdir())
                 self.trash.append(realsr_ncnn_vulkan_zip)
 
@@ -266,32 +292,6 @@ class Video2xSetup:
             shutil.rmtree(LOCALAPPDATA / 'video2x' / 'anime4kcpp')
         patoolib.extract_archive(str(anime4kcpp_7z), outdir=str(LOCALAPPDATA / 'video2x' / 'anime4kcpp'))
 
-    def _install_srmd_ncnn_vulkan(self):
-        """ Install srmd-ncnn-vulkan
-        """
-        print('\nInstalling srmd-ncnn-vulkan')
-        import requests
-
-        # Get latest release of srmd-ncnn-vulkan via Github API
-        latest_release = requests.get('https://api.github.com/repos/nihui/srmd-ncnn-vulkan/releases/latest').json()
-
-        for a in latest_release['assets']:
-            if re.search(r'srmd-ncnn-vulkan-\d*\.zip', a['browser_download_url']):
-                srmd_ncnn_vulkan_zip = download(a['browser_download_url'], tempfile.gettempdir())
-                self.trash.append(srmd_ncnn_vulkan_zip)
-
-        # extract and rename
-        srmd_ncnn_vulkan_directory = LOCALAPPDATA / 'video2x' / 'srmd-ncnn-vulkan'
-        with zipfile.ZipFile(srmd_ncnn_vulkan_zip) as zipf:
-            zipf.extractall(LOCALAPPDATA / 'video2x')
-
-            # if directory already exists, remove it
-            if srmd_ncnn_vulkan_directory.exists():
-                shutil.rmtree(srmd_ncnn_vulkan_directory)
-
-            # rename the newly extracted directory
-            (LOCALAPPDATA / 'video2x' / zipf.namelist()[0]).rename(srmd_ncnn_vulkan_directory)
-
 
 def download(url, save_path, chunk_size=4096):
     """ Download file to local with requests library