From d54fea03103c61548d729d7844c47f8f4297e2bc Mon Sep 17 00:00:00 2001 From: k4yt3x Date: Thu, 19 Dec 2019 23:03:58 -0500 Subject: [PATCH] enables available memory warning for Linux platform --- src/video2x.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/video2x.py b/src/video2x.py index e485c78..ef03146 100755 --- a/src/video2x.py +++ b/src/video2x.py @@ -13,7 +13,7 @@ __ __ _ _ ___ __ __ Name: Video2X Controller Creator: K4YT3X Date Created: Feb 24, 2018 -Last Modified: December 11, 2019 +Last Modified: December 19, 2019 Editor: BrianPetkovsek Editor: SAT3LL @@ -61,12 +61,9 @@ import yaml # third-party imports from avalon_framework import Avalon +import GPUtil import psutil -# platform-specific imports -if sys.platform == 'win32': - import GPUtil - VERSION = '3.0.0' @@ -148,7 +145,7 @@ def check_memory(): # check if Nvidia-smi is available # GPUtil requires nvidia-smi.exe to interact with GPU - if args.method == 'gpu' or args.method == 'cudnn': + if args.method in ['gpu', 'cudnn']: if not (shutil.which('nvidia-smi') or pathlib.Path(r'C:\Program Files\NVIDIA Corporation\NVSMI\nvidia-smi.exe').is_file()): # Nvidia System Management Interface not available @@ -285,7 +282,7 @@ if (args.width and not args.height) or (not args.width and args.height): raise ArgumentError('only one of width or height is specified') # check available memory if driver is waifu2x-based -if args.driver in ['waifu2x_caffe', 'waifu2x_converter', 'waifu2x_ncnn_vulkan'] and sys.platform == 'win32': +if args.driver in ['waifu2x_caffe', 'waifu2x_converter', 'waifu2x_ncnn_vulkan']: check_memory() # anime4k runs significantly faster with more threads