fix root location

This commit is contained in:
Jia Guo
2021-07-08 13:14:28 +08:00
parent 2669ad984f
commit c0ae26f393
3 changed files with 4 additions and 7 deletions

View File

@@ -22,12 +22,9 @@ from ..utils import DEFAULT_MP_NAME
__all__ = ['FaceAnalysis']
class FaceAnalysis:
def __init__(self, name=DEFAULT_MP_NAME, root='~/.insightface/models', allowed_modules=None):
def __init__(self, name=DEFAULT_MP_NAME, root='~/.insightface', allowed_modules=None):
onnxruntime.set_default_logger_severity(3)
self.models = {}
#root = os.path.expanduser(root)
#self.model_dir = osp.join(root, name)
#self.model_dir = get_model_dir(name, root)
self.model_dir = ensure_available('models', name, root=root)
onnx_files = glob.glob(osp.join(self.model_dir, '*.onnx'))
onnx_files = sorted(onnx_files)

View File

@@ -11,7 +11,7 @@ from ..utils import DEFAULT_MP_NAME
import cv2
class MaskRenderer:
def __init__(self, name=DEFAULT_MP_NAME, root='~/.insightface/models', insfa=None):
def __init__(self, name=DEFAULT_MP_NAME, root='~/.insightface', insfa=None):
#if insfa is None, enter render_only mode
self.mp_name = name
self.root = root

View File

@@ -6,9 +6,9 @@ import os.path as osp
import errno
def get_model_dir(name, root='~/.insightface/models'):
def get_model_dir(name, root='~/.insightface'):
root = os.path.expanduser(root)
model_dir = osp.join(root, name)
model_dir = osp.join(root, 'models', name)
return model_dir
def makedirs(path):