yingda.chen 3 years ago
parent
commit
0d840d519c
8 changed files with 11 additions and 12 deletions
  1. +1
    -1
      docs/source/quick_start.md
  2. +2
    -2
      maas_lib/pipelines/base.py
  3. +0
    -0
      maas_lib/pydatasets/__init__.py
  4. +3
    -3
      maas_lib/pydatasets/py_dataset.py
  5. +1
    -1
      tests/pipelines/test_image_matting.py
  6. +1
    -3
      tests/pipelines/test_text_classification.py
  7. +0
    -0
      tests/pydatasets/__init__.py
  8. +3
    -2
      tests/pydatasets/test_py_dataset.py

+ 1
- 1
docs/source/quick_start.md View File

@@ -101,7 +101,7 @@ import cv2
import os.path as osp import os.path as osp
from maas_lib.pipelines import pipeline from maas_lib.pipelines import pipeline
from maas_lib.utils.constant import Tasks from maas_lib.utils.constant import Tasks
from pydatasets import PyDataset
from maas_lib.pydatasets import PyDataset


# 使用图像url构建PyDataset,此处也可通过 input_location = '/dir/to/images' 来使用本地文件夹 # 使用图像url构建PyDataset,此处也可通过 input_location = '/dir/to/images' 来使用本地文件夹
input_location = [ input_location = [


+ 2
- 2
maas_lib/pipelines/base.py View File

@@ -2,14 +2,14 @@


import os.path as osp import os.path as osp
from abc import ABC, abstractmethod from abc import ABC, abstractmethod
from typing import Any, Dict, Generator, List, Tuple, Union
from typing import Any, Dict, Generator, List, Union


from maas_hub.snapshot_download import snapshot_download from maas_hub.snapshot_download import snapshot_download
from pydatasets import PyDataset


from maas_lib.models import Model from maas_lib.models import Model
from maas_lib.pipelines import util from maas_lib.pipelines import util
from maas_lib.preprocessors import Preprocessor from maas_lib.preprocessors import Preprocessor
from maas_lib.pydatasets import PyDataset
from maas_lib.utils.config import Config from maas_lib.utils.config import Config
from .util import is_model_name from .util import is_model_name




pydatasets/__init__.py → maas_lib/pydatasets/__init__.py View File


pydatasets/py_dataset.py → maas_lib/pydatasets/py_dataset.py View File

@@ -11,7 +11,7 @@ logger = get_logger()


class PyDataset: class PyDataset:
_hf_ds = None # holds the underlying HuggingFace Dataset _hf_ds = None # holds the underlying HuggingFace Dataset
"""A PyDataset backed by hugging face datasets."""
"""A PyDataset backed by hugging face Dataset."""


def __init__(self, hf_ds: Dataset): def __init__(self, hf_ds: Dataset):
self._hf_ds = hf_ds self._hf_ds = hf_ds
@@ -52,7 +52,7 @@ class PyDataset:
Mapping[str, Union[str, Mapping[str, Union[str,
Sequence[str]]]]] = None Sequence[str]]]]] = None
) -> 'PyDataset': ) -> 'PyDataset':
"""Load a pydataset from the MaaS Hub, Hugging Face Hub, urls, or a local dataset.
"""Load a PyDataset from the MaaS Hub, Hugging Face Hub, urls, or a local dataset.
Args: Args:


path (str): Path or name of the dataset. path (str): Path or name of the dataset.
@@ -64,7 +64,7 @@ class PyDataset:
split (str, optional): Which split of the data to load. split (str, optional): Which split of the data to load.


Returns: Returns:
pydataset (obj:`PyDataset`): PyDataset object for a certain dataset.
PyDataset (obj:`PyDataset`): PyDataset object for a certain dataset.
""" """
if isinstance(path, str): if isinstance(path, str):
dataset = load_dataset( dataset = load_dataset(

+ 1
- 1
tests/pipelines/test_image_matting.py View File

@@ -5,10 +5,10 @@ import tempfile
import unittest import unittest


import cv2 import cv2
from pydatasets import PyDataset


from maas_lib.fileio import File from maas_lib.fileio import File
from maas_lib.pipelines import pipeline, util from maas_lib.pipelines import pipeline, util
from maas_lib.pydatasets import PyDataset
from maas_lib.utils.constant import Tasks from maas_lib.utils.constant import Tasks






+ 1
- 3
tests/pipelines/test_text_classification.py View File

@@ -1,17 +1,15 @@
# Copyright (c) Alibaba, Inc. and its affiliates. # Copyright (c) Alibaba, Inc. and its affiliates.
import os
import shutil import shutil
import unittest import unittest
import zipfile import zipfile
from pathlib import Path from pathlib import Path


from pydatasets import PyDataset

from maas_lib.fileio import File from maas_lib.fileio import File
from maas_lib.models import Model from maas_lib.models import Model
from maas_lib.models.nlp import BertForSequenceClassification from maas_lib.models.nlp import BertForSequenceClassification
from maas_lib.pipelines import SequenceClassificationPipeline, pipeline, util from maas_lib.pipelines import SequenceClassificationPipeline, pipeline, util
from maas_lib.preprocessors import SequenceClassificationPreprocessor from maas_lib.preprocessors import SequenceClassificationPreprocessor
from maas_lib.pydatasets import PyDataset
from maas_lib.utils.constant import Tasks from maas_lib.utils.constant import Tasks






tests/pydataset/__init__.py → tests/pydatasets/__init__.py View File


tests/pydataset/test_py_dataset.py → tests/pydatasets/test_py_dataset.py View File

@@ -1,13 +1,14 @@
import unittest import unittest


import datasets as hfdata import datasets as hfdata
from pydatasets import PyDataset

from maas_lib.pydatasets import PyDataset




class PyDatasetTest(unittest.TestCase): class PyDatasetTest(unittest.TestCase):


def setUp(self): def setUp(self):
# ds1 initiazed from in memory json
# ds1 initialized from in memory json
self.json_data = { self.json_data = {
'dummy': [{ 'dummy': [{
'a': i, 'a': i,

Loading…
Cancel
Save