Browse Source

fix format

master
jiangyu.xzy 3 years ago
parent
commit
76bb518d75
2 changed files with 4 additions and 6 deletions
  1. +3
    -5
      modelscope/hub/utils/utils.py
  2. +1
    -1
      modelscope/trainers/trainer.py

+ 3
- 5
modelscope/hub/utils/utils.py View File

@@ -2,10 +2,11 @@


import hashlib import hashlib
import os import os
import requests
from datetime import datetime from datetime import datetime
from typing import Optional from typing import Optional
import requests


from modelscope.hub.api import ModelScopeConfig
from modelscope.hub.constants import (DEFAULT_MODELSCOPE_DOMAIN, from modelscope.hub.constants import (DEFAULT_MODELSCOPE_DOMAIN,
DEFAULT_MODELSCOPE_GROUP, DEFAULT_MODELSCOPE_GROUP,
MODEL_ID_SEPARATOR, MODELSCOPE_SDK_DEBUG, MODEL_ID_SEPARATOR, MODELSCOPE_SDK_DEBUG,
@@ -13,7 +14,6 @@ from modelscope.hub.constants import (DEFAULT_MODELSCOPE_DOMAIN,
from modelscope.hub.errors import FileIntegrityError from modelscope.hub.errors import FileIntegrityError
from modelscope.utils.file_utils import get_default_cache_dir from modelscope.utils.file_utils import get_default_cache_dir
from modelscope.utils.logger import get_logger from modelscope.utils.logger import get_logger
from modelscope.hub.api import ModelScopeConfig


logger = get_logger() logger = get_logger()


@@ -89,9 +89,7 @@ def file_integrity_validation(file_path, expected_sha256):
raise FileIntegrityError(msg) raise FileIntegrityError(msg)




def create_library_statistics(method: str,
name: str,
cn_name: Optional[str]):
def create_library_statistics(method: str, name: str, cn_name: Optional[str]):
try: try:
path = f'{get_endpoint()}/api/v1/statistics/library' path = f'{get_endpoint()}/api/v1/statistics/library'
headers = {'user-agent': ModelScopeConfig.get_user_agent()} headers = {'user-agent': ModelScopeConfig.get_user_agent()}


+ 1
- 1
modelscope/trainers/trainer.py View File

@@ -14,6 +14,7 @@ from torch.utils.data import DataLoader, Dataset
from torch.utils.data.dataloader import default_collate from torch.utils.data.dataloader import default_collate
from torch.utils.data.distributed import DistributedSampler from torch.utils.data.distributed import DistributedSampler


from modelscope.hub.utils.utils import create_library_statistics
from modelscope.hub.snapshot_download import snapshot_download from modelscope.hub.snapshot_download import snapshot_download
from modelscope.metainfo import Trainers from modelscope.metainfo import Trainers
from modelscope.metrics import build_metric, task_default_metrics from modelscope.metrics import build_metric, task_default_metrics
@@ -39,7 +40,6 @@ from modelscope.utils.logger import get_logger
from modelscope.utils.registry import build_from_cfg from modelscope.utils.registry import build_from_cfg
from modelscope.utils.torch_utils import (get_dist_info, get_local_rank, from modelscope.utils.torch_utils import (get_dist_info, get_local_rank,
init_dist, set_random_seed) init_dist, set_random_seed)
from modelscope.hub.utils.utils import create_library_statistics
from .base import BaseTrainer from .base import BaseTrainer
from .builder import TRAINERS from .builder import TRAINERS
from .default_config import merge_cfg from .default_config import merge_cfg


Loading…
Cancel
Save