OpenSourceJoker/video2x
3
0
Fork 0
mirror of https://github.com/k4yt3x/video2x.git synced 2025-01-01 10:29:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

addressed srmd-ncnn-vulkan and waifu2x-ncnn-vulkan model path issues

Browse Source
This commit is contained in:
k4yt3x 2020-05-05 02:49:10 -04:00
parent 63de63e594
commit 82715ade18
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/wrappers/srmd_ncnn_vulkan.py
View File

@ -13,6 +13,8 @@ for srmd_ncnn_vulkan.
# built-in imports # built-in imports
import argparse import argparse
import os import os
import pathlib
import platform
import shlex import shlex
import subprocess import subprocess
import threading import threading
@ -32,13 +34,6 @@ class WrapperMain:
def __init__(self, driver_settings): def __init__(self, driver_settings):
self.driver_settings = driver_settings self.driver_settings = driver_settings
# arguments passed through command line overwrites config file values
# srmd_ncnn_vulkan can't find its own model directory if its not in the current dir
# so change to it
os.chdir(os.path.join(self.driver_settings['path'], '..'))
self.print_lock = threading.Lock() self.print_lock = threading.Lock()
@staticmethod @staticmethod
@ -71,6 +66,11 @@ class WrapperMain:
self.driver_settings['o'] = output_directory self.driver_settings['o'] = output_directory
self.driver_settings['s'] = scale_ratio self.driver_settings['s'] = scale_ratio
# by default, srmd-ncnn-vulkan will look for the models under the current working directory
# change the working directory to its containing folder if model directory not specified
if self.driver_settings['m'] is None and platform.system() == 'Windows':
os.chdir(pathlib.Path(self.driver_settings['path']).parent)
# list to be executed # list to be executed
# initialize the list with the binary path as the first element # initialize the list with the binary path as the first element
execute = [self.driver_settings.pop('path')] execute = [self.driver_settings.pop('path')]

16
src/wrappers/waifu2x_ncnn_vulkan.py
View File

@ -4,7 +4,7 @@
Name: Waifu2x NCNN Vulkan Driver Name: Waifu2x NCNN Vulkan Driver
Creator: SAT3LL Creator: SAT3LL
Date Created: June 26, 2019 Date Created: June 26, 2019
Last Modified: May 4, 2020 Last Modified: May 5, 2020
Editor: K4YT3X Editor: K4YT3X
Last Modified: February 22, 2020 Last Modified: February 22, 2020
@ -16,6 +16,8 @@ for waifu2x_ncnn_vulkan.
# built-in imports # built-in imports
import argparse import argparse
import os import os
import pathlib
import platform
import shlex import shlex
import subprocess import subprocess
import threading import threading
@ -35,13 +37,6 @@ class WrapperMain:
def __init__(self, driver_settings): def __init__(self, driver_settings):
self.driver_settings = driver_settings self.driver_settings = driver_settings
# arguments passed through command line overwrites config file values
# waifu2x_ncnn_vulkan can't find its own model directory if its not in the current dir
# so change to it
os.chdir(os.path.join(self.driver_settings['path'], '..'))
self.print_lock = threading.Lock() self.print_lock = threading.Lock()
@staticmethod @staticmethod
@ -74,6 +69,11 @@ class WrapperMain:
self.driver_settings['o'] = output_directory self.driver_settings['o'] = output_directory
self.driver_settings['s'] = int(scale_ratio) self.driver_settings['s'] = int(scale_ratio)
# by default, waifu2x-ncnn-vulkan will look for the models under the current working directory
# change the working directory to its containing folder if model directory not specified
if self.driver_settings['m'] is None and platform.system() == 'Windows':
os.chdir(pathlib.Path(self.driver_settings['path']).parent)
# list to be executed # list to be executed
# initialize the list with waifu2x binary path as the first element # initialize the list with waifu2x binary path as the first element
execute = [self.driver_settings.pop('path')] execute = [self.driver_settings.pop('path')]