ok Merge branch 'fallback' of github.com:modelscope/modelscope into fallback

modelscope/hub/api.py

@@ -316,12 +316,13 @@ class HubApi:
            return the endpoint with which the given repo_id exists.
            if neither exists, throw 404 error
         """
-        if MODELSCOPE_DOMAIN in os.environ:
-            endpoint = MODELSCOPE_URL_SCHEME + os.getenv(MODELSCOPE_DOMAIN)
+        s = os.environ.get(MODELSCOPE_DOMAIN)
+        if s is not None and s.strip() != '':
+            endpoint = MODELSCOPE_URL_SCHEME + s
             try:
                 self.repo_exists(repo_id=repo_id, repo_type=repo_type, endpoint=endpoint, re_raise=True)
             except Exception:
-                logger.error(f'Repo {repo_id} not exists on {endpoint}.')
+                logger.error(f'Repo {repo_id} does not exist on {endpoint}.')
                 raise
             return endpoint
 

modelscope/models/cv/image_try_on/landmark.py

@@ -369,7 +369,7 @@ class VTONLandmark(nn.Module):
                 'SHIFT_HEATMAP': True
             },
             'DEBUG': {
-                'DEBUG': True,
+                'DEBUG': False,
                 'SAVE_BATCH_IMAGES_GT': True,
                 'SAVE_BATCH_IMAGES_PRED': True,
                 'SAVE_HEATMAPS_GT': True,

modelscope/models/cv/video_depth_estimation/utils/load.py

@@ -1,9 +1,6 @@
 # Part of the implementation is borrowed and modified from PackNet-SfM,
 # made publicly available under the MIT License at https://github.com/TRI-ML/packnet-sfm
 import importlib
-import logging
-import os
-import warnings
 from collections import OrderedDict
 from inspect import signature
 
@@ -16,23 +13,6 @@ from modelscope.models.cv.video_depth_estimation.utils.misc import (make_list,
 from modelscope.models.cv.video_depth_estimation.utils.types import is_str
 
 
-def set_debug(debug):
-    """
-    Enable or disable debug terminal logging
-
-    Parameters
-    ----------
-    debug : bool
-        Debugging flag (True to enable)
-    """
-    # Disable logging if requested
-    if not debug:
-        os.environ['NCCL_DEBUG'] = ''
-        os.environ['WANDB_SILENT'] = 'false'
-        warnings.filterwarnings('ignore')
-        logging.disable(logging.CRITICAL)
-
-
 def filter_args(func, keys):
     """
     Filters a dictionary so it only contains keys that are arguments of a function

modelscope/utils/logger.py

@@ -11,6 +11,7 @@ formatter = logging.Formatter(
     '%(asctime)s - %(name)s - %(levelname)s - %(message)s')
 
 default_log_level = int(os.getenv('MODELSCOPE_LOG_LEVEL', str(logging.INFO)))
+logging.getLogger('numba').setLevel(logging.INFO)
 
 
 def get_logger(log_file: Optional[str] = None,

tests/hub/test_file_exists.py

@@ -5,7 +5,6 @@ from modelscope.hub.api import HubApi
 from modelscope.utils.logger import get_logger
 
 logger = get_logger()
-logger.setLevel('DEBUG')
 DEFAULT_GIT_PATH = 'git'
 download_model_file_name = 'test.bin'
 

tests/hub/test_hub_repository.py

@@ -21,7 +21,6 @@ from modelscope.utils.test_utils import (TEST_ACCESS_TOKEN1,
                                          TEST_MODEL_ORG, delete_credential)
 
 logger = get_logger()
-logger.setLevel('DEBUG')
 DEFAULT_GIT_PATH = 'git'
 download_model_file_name = 'test.bin'
 

tests/hub/test_hub_revision.py

@@ -18,7 +18,6 @@ from modelscope.utils.test_utils import (TEST_ACCESS_TOKEN1,
                                          TEST_MODEL_ORG)
 
 logger = get_logger()
-logger.setLevel('DEBUG')
 download_model_file_name = 'test.bin'
 download_model_file_name2 = 'test2.bin'
 

tests/hub/test_hub_revision_release_mode.py

@@ -21,7 +21,6 @@ from modelscope.utils.test_utils import (TEST_ACCESS_TOKEN1,
                                          TEST_MODEL_ORG)
 
 logger = get_logger()
-logger.setLevel('DEBUG')
 download_model_file_name = 'test.bin'
 download_model_file_name2 = 'test2.bin'