From 0b196490e6a701a08fb53c48fbe3d02bb40536dc Mon Sep 17 00:00:00 2001 From: Su Yang Date: Sun, 30 Jul 2023 17:11:22 +0800 Subject: [PATCH 1/2] fix: use regexp to extract pytorch version in misc.py --- basicsr/utils/misc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basicsr/utils/misc.py b/basicsr/utils/misc.py index f425d68e..1846efcc 100644 --- a/basicsr/utils/misc.py +++ b/basicsr/utils/misc.py @@ -9,7 +9,7 @@ from .dist_util import master_only from .logger import get_root_logger -IS_HIGH_VERSION = [int(m) for m in list(re.findall(r"^([0-9]+)\.([0-9]+)\.([0-9]+)([^0-9][a-zA-Z0-9]*)?(\+git.*)?$",\ +IS_HIGH_VERSION = [int(m) for m in list(re.findall(r"^(\d+)\.(\d+)\.(\d+)([\w\d\.].*)?$",\ torch.__version__)[0][:3])] >= [1, 12, 0] def gpu_is_available(): From 14746a42f468f410dd21076e64392bca384ae102 Mon Sep 17 00:00:00 2001 From: Su Yang Date: Sun, 30 Jul 2023 17:48:47 +0800 Subject: [PATCH 2/2] fix: face_detector.py use regexp check torch high version --- facelib/detection/yolov5face/face_detector.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/facelib/detection/yolov5face/face_detector.py b/facelib/detection/yolov5face/face_detector.py index 1b27e970..f489a208 100644 --- a/facelib/detection/yolov5face/face_detector.py +++ b/facelib/detection/yolov5face/face_detector.py @@ -14,11 +14,9 @@ scale_coords_landmarks, ) -# IS_HIGH_VERSION = tuple(map(int, torch.__version__.split('+')[0].split('.')[:2])) >= (1, 9) -IS_HIGH_VERSION = [int(m) for m in list(re.findall(r"^([0-9]+)\.([0-9]+)\.([0-9]+)([^0-9][a-zA-Z0-9]*)?(\+git.*)?$",\ +IS_HIGH_VERSION = [int(m) for m in list(re.findall(r"^(\d+)\.(\d+)\.(\d+)([\w\d\.].*)?$",\ torch.__version__)[0][:3])] >= [1, 9, 0] - def isListempty(inList): if isinstance(inList, list): # Is a list return all(map(isListempty, inList))