diff --git a/.dev_scripts/build_docs.sh b/.dev_scripts/build_docs.sh index 9c8acdf1..dc76e6f4 100644 --- a/.dev_scripts/build_docs.sh +++ b/.dev_scripts/build_docs.sh @@ -4,5 +4,5 @@ rm -rf build # update api rst #rm -rf source/api/ -#sphinx-apidoc --module-first -o source/api/ ../maas_lib/ +#sphinx-apidoc --module-first -o source/api/ ../modelscope/ make html diff --git a/.dev_scripts/linter.sh b/.dev_scripts/linter.sh index fb8ab19d..6468e42b 100644 --- a/.dev_scripts/linter.sh +++ b/.dev_scripts/linter.sh @@ -1,3 +1,3 @@ -yapf -r -i maas_lib/ configs/ tests/ setup.py -isort -rc maas_lib/ configs/ tests/ setup.py -flake8 maas_lib/ configs/ tests/ setup.py +yapf -r -i modelscope/ configs/ tests/ setup.py +isort -rc modelscope/ configs/ tests/ setup.py +flake8 modelscope/ configs/ tests/ setup.py diff --git a/LICENSE b/LICENSE index 85ed3d3a..14cec7de 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright 2022-2023 Alibaba MaaS. All rights reserved. +Copyright 2022-2023 Alibaba ModelScope. All rights reserved. Apache License Version 2.0, January 2004 @@ -188,7 +188,7 @@ Copyright 2022-2023 Alibaba MaaS. All rights reserved. same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2020-2022 Alibaba MaaS. + Copyright 2020-2022 Alibaba ModelScope. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/MANIFEST.in b/MANIFEST.in index 0a153dba..665d7e90 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1 +1 @@ -recursive-include maas_lib/configs *.py +recursive-include modelscope/configs *.py diff --git a/README.md b/README.md index dabe8726..944c1f07 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Introduction -MaaS library is targeted to support training, evaluation and inference for the state of the art models provided by Mind and further support third-party models provided by users outside alibaba. +ModelScope library is targeted to support training, evaluation and inference for the state of the art models provided by Mind and further support third-party models provided by users outside alibaba. # Design doc diff --git a/configs/README.md b/configs/README.md index 94499da7..3c3b6963 100644 --- a/configs/README.md +++ b/configs/README.md @@ -1 +1 @@ -This folder will host example configs for each model supported by maas_lib. +This folder will host example configs for each model supported by modelscope. diff --git a/docs/source/api/maas_lib.fileio.format.rst b/docs/source/api/maas_lib.fileio.format.rst deleted file mode 100644 index 7c2c649d..00000000 --- a/docs/source/api/maas_lib.fileio.format.rst +++ /dev/null @@ -1,34 +0,0 @@ -maas\_lib.fileio.format package -=============================== - -.. automodule:: maas_lib.fileio.format - :members: - :undoc-members: - :show-inheritance: - -Submodules ----------- - -maas\_lib.fileio.format.base module ------------------------------------ - -.. automodule:: maas_lib.fileio.format.base - :members: - :undoc-members: - :show-inheritance: - -maas\_lib.fileio.format.json module ------------------------------------ - -.. automodule:: maas_lib.fileio.format.json - :members: - :undoc-members: - :show-inheritance: - -maas\_lib.fileio.format.yaml module ------------------------------------ - -.. automodule:: maas_lib.fileio.format.yaml - :members: - :undoc-members: - :show-inheritance: diff --git a/docs/source/api/maas_lib.fileio.rst b/docs/source/api/maas_lib.fileio.rst deleted file mode 100644 index e9540208..00000000 --- a/docs/source/api/maas_lib.fileio.rst +++ /dev/null @@ -1,34 +0,0 @@ -maas\_lib.fileio package -======================== - -.. automodule:: maas_lib.fileio - :members: - :undoc-members: - :show-inheritance: - -Subpackages ------------ - -.. toctree:: - :maxdepth: 4 - - maas_lib.fileio.format - -Submodules ----------- - -maas\_lib.fileio.file module ----------------------------- - -.. automodule:: maas_lib.fileio.file - :members: - :undoc-members: - :show-inheritance: - -maas\_lib.fileio.io module --------------------------- - -.. automodule:: maas_lib.fileio.io - :members: - :undoc-members: - :show-inheritance: diff --git a/docs/source/api/maas_lib.models.nlp.rst b/docs/source/api/maas_lib.models.nlp.rst deleted file mode 100644 index bd782ea8..00000000 --- a/docs/source/api/maas_lib.models.nlp.rst +++ /dev/null @@ -1,18 +0,0 @@ -maas\_lib.models.nlp package -============================ - -.. automodule:: maas_lib.models.nlp - :members: - :undoc-members: - :show-inheritance: - -Submodules ----------- - -maas\_lib.models.nlp.sequence\_classification\_model module ------------------------------------------------------------ - -.. automodule:: maas_lib.models.nlp.sequence_classification_model - :members: - :undoc-members: - :show-inheritance: diff --git a/docs/source/api/maas_lib.models.rst b/docs/source/api/maas_lib.models.rst deleted file mode 100644 index 9e1874a3..00000000 --- a/docs/source/api/maas_lib.models.rst +++ /dev/null @@ -1,34 +0,0 @@ -maas\_lib.models package -======================== - -.. automodule:: maas_lib.models - :members: - :undoc-members: - :show-inheritance: - -Subpackages ------------ - -.. toctree:: - :maxdepth: 4 - - maas_lib.models.nlp - -Submodules ----------- - -maas\_lib.models.base module ----------------------------- - -.. automodule:: maas_lib.models.base - :members: - :undoc-members: - :show-inheritance: - -maas\_lib.models.builder module -------------------------------- - -.. automodule:: maas_lib.models.builder - :members: - :undoc-members: - :show-inheritance: diff --git a/docs/source/api/maas_lib.pipelines.audio.rst b/docs/source/api/maas_lib.pipelines.audio.rst deleted file mode 100644 index 71e29b42..00000000 --- a/docs/source/api/maas_lib.pipelines.audio.rst +++ /dev/null @@ -1,7 +0,0 @@ -maas\_lib.pipelines.audio package -================================= - -.. automodule:: maas_lib.pipelines.audio - :members: - :undoc-members: - :show-inheritance: diff --git a/docs/source/api/maas_lib.pipelines.cv.rst b/docs/source/api/maas_lib.pipelines.cv.rst deleted file mode 100644 index 938ebb5a..00000000 --- a/docs/source/api/maas_lib.pipelines.cv.rst +++ /dev/null @@ -1,18 +0,0 @@ -maas\_lib.pipelines.cv package -============================== - -.. automodule:: maas_lib.pipelines.cv - :members: - :undoc-members: - :show-inheritance: - -Submodules ----------- - -maas\_lib.pipelines.cv.image\_matting module --------------------------------------------- - -.. automodule:: maas_lib.pipelines.cv.image_matting - :members: - :undoc-members: - :show-inheritance: diff --git a/docs/source/api/maas_lib.pipelines.multi_modal.rst b/docs/source/api/maas_lib.pipelines.multi_modal.rst deleted file mode 100644 index 74a7bf43..00000000 --- a/docs/source/api/maas_lib.pipelines.multi_modal.rst +++ /dev/null @@ -1,7 +0,0 @@ -maas\_lib.pipelines.multi\_modal package -======================================== - -.. automodule:: maas_lib.pipelines.multi_modal - :members: - :undoc-members: - :show-inheritance: diff --git a/docs/source/api/maas_lib.preprocessors.rst b/docs/source/api/maas_lib.preprocessors.rst deleted file mode 100644 index 5f70e808..00000000 --- a/docs/source/api/maas_lib.preprocessors.rst +++ /dev/null @@ -1,50 +0,0 @@ -maas\_lib.preprocessors package -=============================== - -.. automodule:: maas_lib.preprocessors - :members: - :undoc-members: - :show-inheritance: - -Submodules ----------- - -maas\_lib.preprocessors.base module ------------------------------------ - -.. automodule:: maas_lib.preprocessors.base - :members: - :undoc-members: - :show-inheritance: - -maas\_lib.preprocessors.builder module --------------------------------------- - -.. automodule:: maas_lib.preprocessors.builder - :members: - :undoc-members: - :show-inheritance: - -maas\_lib.preprocessors.common module -------------------------------------- - -.. automodule:: maas_lib.preprocessors.common - :members: - :undoc-members: - :show-inheritance: - -maas\_lib.preprocessors.image module ------------------------------------- - -.. automodule:: maas_lib.preprocessors.image - :members: - :undoc-members: - :show-inheritance: - -maas\_lib.preprocessors.nlp module ----------------------------------- - -.. automodule:: maas_lib.preprocessors.nlp - :members: - :undoc-members: - :show-inheritance: diff --git a/docs/source/api/maas_lib.rst b/docs/source/api/maas_lib.rst deleted file mode 100644 index 727b7986..00000000 --- a/docs/source/api/maas_lib.rst +++ /dev/null @@ -1,30 +0,0 @@ -maas\_lib package -================= - -.. automodule:: maas_lib - :members: - :undoc-members: - :show-inheritance: - -Subpackages ------------ - -.. toctree:: - :maxdepth: 4 - - maas_lib.fileio - maas_lib.models - maas_lib.pipelines - maas_lib.preprocessors - maas_lib.utils - -Submodules ----------- - -maas\_lib.version module ------------------------- - -.. automodule:: maas_lib.version - :members: - :undoc-members: - :show-inheritance: diff --git a/docs/source/api/maas_lib.trainers.nlp.rst b/docs/source/api/maas_lib.trainers.nlp.rst deleted file mode 100644 index 71f484ca..00000000 --- a/docs/source/api/maas_lib.trainers.nlp.rst +++ /dev/null @@ -1,18 +0,0 @@ -maas\_lib.trainers.nlp package -============================== - -.. automodule:: maas_lib.trainers.nlp - :members: - :undoc-members: - :show-inheritance: - -Submodules ----------- - -maas\_lib.trainers.nlp.sequence\_classification\_trainer module ---------------------------------------------------------------- - -.. automodule:: maas_lib.trainers.nlp.sequence_classification_trainer - :members: - :undoc-members: - :show-inheritance: diff --git a/docs/source/api/maas_lib.trainers.rst b/docs/source/api/maas_lib.trainers.rst deleted file mode 100644 index eb90ee4f..00000000 --- a/docs/source/api/maas_lib.trainers.rst +++ /dev/null @@ -1,34 +0,0 @@ -maas\_lib.trainers package -========================== - -.. automodule:: maas_lib.trainers - :members: - :undoc-members: - :show-inheritance: - -Subpackages ------------ - -.. toctree:: - :maxdepth: 4 - - maas_lib.trainers.nlp - -Submodules ----------- - -maas\_lib.trainers.base module ------------------------------- - -.. automodule:: maas_lib.trainers.base - :members: - :undoc-members: - :show-inheritance: - -maas\_lib.trainers.builder module ---------------------------------- - -.. automodule:: maas_lib.trainers.builder - :members: - :undoc-members: - :show-inheritance: diff --git a/docs/source/api/maas_lib.utils.rst b/docs/source/api/maas_lib.utils.rst deleted file mode 100644 index 17ead3eb..00000000 --- a/docs/source/api/maas_lib.utils.rst +++ /dev/null @@ -1,58 +0,0 @@ -maas\_lib.utils package -======================= - -.. automodule:: maas_lib.utils - :members: - :undoc-members: - :show-inheritance: - -Submodules ----------- - -maas\_lib.utils.config module ------------------------------ - -.. automodule:: maas_lib.utils.config - :members: - :undoc-members: - :show-inheritance: - -maas\_lib.utils.constant module -------------------------------- - -.. automodule:: maas_lib.utils.constant - :members: - :undoc-members: - :show-inheritance: - -maas\_lib.utils.logger module ------------------------------ - -.. automodule:: maas_lib.utils.logger - :members: - :undoc-members: - :show-inheritance: - -maas\_lib.utils.pymod module ----------------------------- - -.. automodule:: maas_lib.utils.pymod - :members: - :undoc-members: - :show-inheritance: - -maas\_lib.utils.registry module -------------------------------- - -.. automodule:: maas_lib.utils.registry - :members: - :undoc-members: - :show-inheritance: - -maas\_lib.utils.type\_assert module ------------------------------------ - -.. automodule:: maas_lib.utils.type_assert - :members: - :undoc-members: - :show-inheritance: diff --git a/docs/source/api/modelscope.fileio.format.rst b/docs/source/api/modelscope.fileio.format.rst new file mode 100644 index 00000000..2c7b11de --- /dev/null +++ b/docs/source/api/modelscope.fileio.format.rst @@ -0,0 +1,34 @@ +modelscope.fileio.format package +================================ + +.. automodule:: modelscope.fileio.format + :members: + :undoc-members: + :show-inheritance: + +Submodules +---------- + +modelscope.fileio.format.base module +------------------------------------ + +.. automodule:: modelscope.fileio.format.base + :members: + :undoc-members: + :show-inheritance: + +modelscope.fileio.format.json module +------------------------------------ + +.. automodule:: modelscope.fileio.format.json + :members: + :undoc-members: + :show-inheritance: + +modelscope.fileio.format.yaml module +------------------------------------ + +.. automodule:: modelscope.fileio.format.yaml + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/api/modelscope.fileio.rst b/docs/source/api/modelscope.fileio.rst new file mode 100644 index 00000000..3f4ae1ca --- /dev/null +++ b/docs/source/api/modelscope.fileio.rst @@ -0,0 +1,34 @@ +modelscope.fileio package +========================= + +.. automodule:: modelscope.fileio + :members: + :undoc-members: + :show-inheritance: + +Subpackages +----------- + +.. toctree:: + :maxdepth: 4 + + modelscope.fileio.format + +Submodules +---------- + +modelscope.fileio.file module +----------------------------- + +.. automodule:: modelscope.fileio.file + :members: + :undoc-members: + :show-inheritance: + +modelscope.fileio.io module +--------------------------- + +.. automodule:: modelscope.fileio.io + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/api/modelscope.models.cv.cartoon.facelib.LK.rst b/docs/source/api/modelscope.models.cv.cartoon.facelib.LK.rst new file mode 100644 index 00000000..848c7d67 --- /dev/null +++ b/docs/source/api/modelscope.models.cv.cartoon.facelib.LK.rst @@ -0,0 +1,18 @@ +modelscope.models.cv.cartoon.facelib.LK package +=============================================== + +.. automodule:: modelscope.models.cv.cartoon.facelib.LK + :members: + :undoc-members: + :show-inheritance: + +Submodules +---------- + +modelscope.models.cv.cartoon.facelib.LK.lk module +------------------------------------------------- + +.. automodule:: modelscope.models.cv.cartoon.facelib.LK.lk + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/api/modelscope.models.cv.cartoon.facelib.rst b/docs/source/api/modelscope.models.cv.cartoon.facelib.rst new file mode 100644 index 00000000..a81536b0 --- /dev/null +++ b/docs/source/api/modelscope.models.cv.cartoon.facelib.rst @@ -0,0 +1,50 @@ +modelscope.models.cv.cartoon.facelib package +============================================ + +.. automodule:: modelscope.models.cv.cartoon.facelib + :members: + :undoc-members: + :show-inheritance: + +Subpackages +----------- + +.. toctree:: + :maxdepth: 4 + + modelscope.models.cv.cartoon.facelib.LK + +Submodules +---------- + +modelscope.models.cv.cartoon.facelib.config module +-------------------------------------------------- + +.. automodule:: modelscope.models.cv.cartoon.facelib.config + :members: + :undoc-members: + :show-inheritance: + +modelscope.models.cv.cartoon.facelib.face\_detector module +---------------------------------------------------------- + +.. automodule:: modelscope.models.cv.cartoon.facelib.face_detector + :members: + :undoc-members: + :show-inheritance: + +modelscope.models.cv.cartoon.facelib.face\_landmark module +---------------------------------------------------------- + +.. automodule:: modelscope.models.cv.cartoon.facelib.face_landmark + :members: + :undoc-members: + :show-inheritance: + +modelscope.models.cv.cartoon.facelib.facer module +------------------------------------------------- + +.. automodule:: modelscope.models.cv.cartoon.facelib.facer + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/api/modelscope.models.cv.cartoon.mtcnn_pytorch.rst b/docs/source/api/modelscope.models.cv.cartoon.mtcnn_pytorch.rst new file mode 100644 index 00000000..b5845af7 --- /dev/null +++ b/docs/source/api/modelscope.models.cv.cartoon.mtcnn_pytorch.rst @@ -0,0 +1,15 @@ +modelscope.models.cv.cartoon.mtcnn\_pytorch package +=================================================== + +.. automodule:: modelscope.models.cv.cartoon.mtcnn_pytorch + :members: + :undoc-members: + :show-inheritance: + +Subpackages +----------- + +.. toctree:: + :maxdepth: 4 + + modelscope.models.cv.cartoon.mtcnn_pytorch.src diff --git a/docs/source/api/modelscope.models.cv.cartoon.mtcnn_pytorch.src.rst b/docs/source/api/modelscope.models.cv.cartoon.mtcnn_pytorch.src.rst new file mode 100644 index 00000000..715cc292 --- /dev/null +++ b/docs/source/api/modelscope.models.cv.cartoon.mtcnn_pytorch.src.rst @@ -0,0 +1,26 @@ +modelscope.models.cv.cartoon.mtcnn\_pytorch.src package +======================================================= + +.. automodule:: modelscope.models.cv.cartoon.mtcnn_pytorch.src + :members: + :undoc-members: + :show-inheritance: + +Submodules +---------- + +modelscope.models.cv.cartoon.mtcnn\_pytorch.src.align\_trans module +------------------------------------------------------------------- + +.. automodule:: modelscope.models.cv.cartoon.mtcnn_pytorch.src.align_trans + :members: + :undoc-members: + :show-inheritance: + +modelscope.models.cv.cartoon.mtcnn\_pytorch.src.matlab\_cp2tform module +----------------------------------------------------------------------- + +.. automodule:: modelscope.models.cv.cartoon.mtcnn_pytorch.src.matlab_cp2tform + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/api/modelscope.models.cv.cartoon.rst b/docs/source/api/modelscope.models.cv.cartoon.rst new file mode 100644 index 00000000..5a262e03 --- /dev/null +++ b/docs/source/api/modelscope.models.cv.cartoon.rst @@ -0,0 +1,27 @@ +modelscope.models.cv.cartoon package +==================================== + +.. automodule:: modelscope.models.cv.cartoon + :members: + :undoc-members: + :show-inheritance: + +Subpackages +----------- + +.. toctree:: + :maxdepth: 4 + + modelscope.models.cv.cartoon.facelib + modelscope.models.cv.cartoon.mtcnn_pytorch + +Submodules +---------- + +modelscope.models.cv.cartoon.utils module +----------------------------------------- + +.. automodule:: modelscope.models.cv.cartoon.utils + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/api/modelscope.models.cv.rst b/docs/source/api/modelscope.models.cv.rst new file mode 100644 index 00000000..47ce3916 --- /dev/null +++ b/docs/source/api/modelscope.models.cv.rst @@ -0,0 +1,15 @@ +modelscope.models.cv package +============================ + +.. automodule:: modelscope.models.cv + :members: + :undoc-members: + :show-inheritance: + +Subpackages +----------- + +.. toctree:: + :maxdepth: 4 + + modelscope.models.cv.cartoon diff --git a/docs/source/api/modelscope.models.nlp.rst b/docs/source/api/modelscope.models.nlp.rst new file mode 100644 index 00000000..f332aca8 --- /dev/null +++ b/docs/source/api/modelscope.models.nlp.rst @@ -0,0 +1,26 @@ +modelscope.models.nlp package +============================= + +.. automodule:: modelscope.models.nlp + :members: + :undoc-members: + :show-inheritance: + +Submodules +---------- + +modelscope.models.nlp.sequence\_classification\_model module +------------------------------------------------------------ + +.. automodule:: modelscope.models.nlp.sequence_classification_model + :members: + :undoc-members: + :show-inheritance: + +modelscope.models.nlp.text\_generation\_model module +---------------------------------------------------- + +.. automodule:: modelscope.models.nlp.text_generation_model + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/api/modelscope.models.rst b/docs/source/api/modelscope.models.rst new file mode 100644 index 00000000..8f2870b3 --- /dev/null +++ b/docs/source/api/modelscope.models.rst @@ -0,0 +1,35 @@ +modelscope.models package +========================= + +.. automodule:: modelscope.models + :members: + :undoc-members: + :show-inheritance: + +Subpackages +----------- + +.. toctree:: + :maxdepth: 4 + + modelscope.models.cv + modelscope.models.nlp + +Submodules +---------- + +modelscope.models.base module +----------------------------- + +.. automodule:: modelscope.models.base + :members: + :undoc-members: + :show-inheritance: + +modelscope.models.builder module +-------------------------------- + +.. automodule:: modelscope.models.builder + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/api/modelscope.pipelines.audio.rst b/docs/source/api/modelscope.pipelines.audio.rst new file mode 100644 index 00000000..f162893f --- /dev/null +++ b/docs/source/api/modelscope.pipelines.audio.rst @@ -0,0 +1,7 @@ +modelscope.pipelines.audio package +================================== + +.. automodule:: modelscope.pipelines.audio + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/api/modelscope.pipelines.cv.rst b/docs/source/api/modelscope.pipelines.cv.rst new file mode 100644 index 00000000..3f2da3f4 --- /dev/null +++ b/docs/source/api/modelscope.pipelines.cv.rst @@ -0,0 +1,26 @@ +modelscope.pipelines.cv package +=============================== + +.. automodule:: modelscope.pipelines.cv + :members: + :undoc-members: + :show-inheritance: + +Submodules +---------- + +modelscope.pipelines.cv.image\_cartoon\_pipeline module +------------------------------------------------------- + +.. automodule:: modelscope.pipelines.cv.image_cartoon_pipeline + :members: + :undoc-members: + :show-inheritance: + +modelscope.pipelines.cv.image\_matting\_pipeline module +------------------------------------------------------- + +.. automodule:: modelscope.pipelines.cv.image_matting_pipeline + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/api/modelscope.pipelines.multi_modal.rst b/docs/source/api/modelscope.pipelines.multi_modal.rst new file mode 100644 index 00000000..36df1c7c --- /dev/null +++ b/docs/source/api/modelscope.pipelines.multi_modal.rst @@ -0,0 +1,18 @@ +modelscope.pipelines.multi\_modal package +========================================= + +.. automodule:: modelscope.pipelines.multi_modal + :members: + :undoc-members: + :show-inheritance: + +Submodules +---------- + +modelscope.pipelines.multi\_modal.image\_captioning module +---------------------------------------------------------- + +.. automodule:: modelscope.pipelines.multi_modal.image_captioning + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/api/modelscope.pipelines.nlp.rst b/docs/source/api/modelscope.pipelines.nlp.rst new file mode 100644 index 00000000..836d914f --- /dev/null +++ b/docs/source/api/modelscope.pipelines.nlp.rst @@ -0,0 +1,26 @@ +modelscope.pipelines.nlp package +================================ + +.. automodule:: modelscope.pipelines.nlp + :members: + :undoc-members: + :show-inheritance: + +Submodules +---------- + +modelscope.pipelines.nlp.sequence\_classification\_pipeline module +------------------------------------------------------------------ + +.. automodule:: modelscope.pipelines.nlp.sequence_classification_pipeline + :members: + :undoc-members: + :show-inheritance: + +modelscope.pipelines.nlp.text\_generation\_pipeline module +---------------------------------------------------------- + +.. automodule:: modelscope.pipelines.nlp.text_generation_pipeline + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/api/modelscope.pipelines.rst b/docs/source/api/modelscope.pipelines.rst new file mode 100644 index 00000000..167b5cd3 --- /dev/null +++ b/docs/source/api/modelscope.pipelines.rst @@ -0,0 +1,53 @@ +modelscope.pipelines package +============================ + +.. automodule:: modelscope.pipelines + :members: + :undoc-members: + :show-inheritance: + +Subpackages +----------- + +.. toctree:: + :maxdepth: 4 + + modelscope.pipelines.audio + modelscope.pipelines.cv + modelscope.pipelines.multi_modal + modelscope.pipelines.nlp + +Submodules +---------- + +modelscope.pipelines.base module +-------------------------------- + +.. automodule:: modelscope.pipelines.base + :members: + :undoc-members: + :show-inheritance: + +modelscope.pipelines.builder module +----------------------------------- + +.. automodule:: modelscope.pipelines.builder + :members: + :undoc-members: + :show-inheritance: + +modelscope.pipelines.default module +----------------------------------- + +.. automodule:: modelscope.pipelines.default + :members: + :undoc-members: + :show-inheritance: + +modelscope.pipelines.util module +-------------------------------- + +.. automodule:: modelscope.pipelines.util + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/api/modelscope.preprocessors.rst b/docs/source/api/modelscope.preprocessors.rst new file mode 100644 index 00000000..b555198d --- /dev/null +++ b/docs/source/api/modelscope.preprocessors.rst @@ -0,0 +1,50 @@ +modelscope.preprocessors package +================================ + +.. automodule:: modelscope.preprocessors + :members: + :undoc-members: + :show-inheritance: + +Submodules +---------- + +modelscope.preprocessors.base module +------------------------------------ + +.. automodule:: modelscope.preprocessors.base + :members: + :undoc-members: + :show-inheritance: + +modelscope.preprocessors.builder module +--------------------------------------- + +.. automodule:: modelscope.preprocessors.builder + :members: + :undoc-members: + :show-inheritance: + +modelscope.preprocessors.common module +-------------------------------------- + +.. automodule:: modelscope.preprocessors.common + :members: + :undoc-members: + :show-inheritance: + +modelscope.preprocessors.image module +------------------------------------- + +.. automodule:: modelscope.preprocessors.image + :members: + :undoc-members: + :show-inheritance: + +modelscope.preprocessors.nlp module +----------------------------------- + +.. automodule:: modelscope.preprocessors.nlp + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/api/modelscope.pydatasets.rst b/docs/source/api/modelscope.pydatasets.rst new file mode 100644 index 00000000..2508a91f --- /dev/null +++ b/docs/source/api/modelscope.pydatasets.rst @@ -0,0 +1,18 @@ +modelscope.pydatasets package +============================= + +.. automodule:: modelscope.pydatasets + :members: + :undoc-members: + :show-inheritance: + +Submodules +---------- + +modelscope.pydatasets.py\_dataset module +---------------------------------------- + +.. automodule:: modelscope.pydatasets.py_dataset + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/api/modelscope.rst b/docs/source/api/modelscope.rst new file mode 100644 index 00000000..efab568b --- /dev/null +++ b/docs/source/api/modelscope.rst @@ -0,0 +1,32 @@ +modelscope package +================== + +.. automodule:: modelscope + :members: + :undoc-members: + :show-inheritance: + +Subpackages +----------- + +.. toctree:: + :maxdepth: 4 + + modelscope.fileio + modelscope.models + modelscope.pipelines + modelscope.preprocessors + modelscope.pydatasets + modelscope.trainers + modelscope.utils + +Submodules +---------- + +modelscope.version module +------------------------- + +.. automodule:: modelscope.version + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/api/maas_lib.pipelines.nlp.rst b/docs/source/api/modelscope.trainers.nlp.rst similarity index 52% rename from docs/source/api/maas_lib.pipelines.nlp.rst rename to docs/source/api/modelscope.trainers.nlp.rst index d41c09ad..4bc2f875 100644 --- a/docs/source/api/maas_lib.pipelines.nlp.rst +++ b/docs/source/api/modelscope.trainers.nlp.rst @@ -1,7 +1,7 @@ -maas\_lib.pipelines.nlp package +modelscope.trainers.nlp package =============================== -.. automodule:: maas_lib.pipelines.nlp +.. automodule:: modelscope.trainers.nlp :members: :undoc-members: :show-inheritance: @@ -9,10 +9,10 @@ maas\_lib.pipelines.nlp package Submodules ---------- -maas\_lib.pipelines.nlp.sequence\_classification\_pipeline module ------------------------------------------------------------------ +modelscope.trainers.nlp.sequence\_classification\_trainer module +---------------------------------------------------------------- -.. automodule:: maas_lib.pipelines.nlp.sequence_classification_pipeline +.. automodule:: modelscope.trainers.nlp.sequence_classification_trainer :members: :undoc-members: :show-inheritance: diff --git a/docs/source/api/maas_lib.pipelines.rst b/docs/source/api/modelscope.trainers.rst similarity index 53% rename from docs/source/api/maas_lib.pipelines.rst rename to docs/source/api/modelscope.trainers.rst index 40b82adc..aac4fb99 100644 --- a/docs/source/api/maas_lib.pipelines.rst +++ b/docs/source/api/modelscope.trainers.rst @@ -1,7 +1,7 @@ -maas\_lib.pipelines package +modelscope.trainers package =========================== -.. automodule:: maas_lib.pipelines +.. automodule:: modelscope.trainers :members: :undoc-members: :show-inheritance: @@ -12,25 +12,23 @@ Subpackages .. toctree:: :maxdepth: 4 - maas_lib.pipelines.cv - maas_lib.pipelines.multi_modal - maas_lib.pipelines.nlp + modelscope.trainers.nlp Submodules ---------- -maas\_lib.pipelines.base module +modelscope.trainers.base module ------------------------------- -.. automodule:: maas_lib.pipelines.base +.. automodule:: modelscope.trainers.base :members: :undoc-members: :show-inheritance: -maas\_lib.pipelines.builder module +modelscope.trainers.builder module ---------------------------------- -.. automodule:: maas_lib.pipelines.builder +.. automodule:: modelscope.trainers.builder :members: :undoc-members: :show-inheritance: diff --git a/docs/source/api/modelscope.utils.rst b/docs/source/api/modelscope.utils.rst new file mode 100644 index 00000000..0a78d4f4 --- /dev/null +++ b/docs/source/api/modelscope.utils.rst @@ -0,0 +1,66 @@ +modelscope.utils package +======================== + +.. automodule:: modelscope.utils + :members: + :undoc-members: + :show-inheritance: + +Submodules +---------- + +modelscope.utils.config module +------------------------------ + +.. automodule:: modelscope.utils.config + :members: + :undoc-members: + :show-inheritance: + +modelscope.utils.constant module +-------------------------------- + +.. automodule:: modelscope.utils.constant + :members: + :undoc-members: + :show-inheritance: + +modelscope.utils.hub module +--------------------------- + +.. automodule:: modelscope.utils.hub + :members: + :undoc-members: + :show-inheritance: + +modelscope.utils.logger module +------------------------------ + +.. automodule:: modelscope.utils.logger + :members: + :undoc-members: + :show-inheritance: + +modelscope.utils.pymod module +----------------------------- + +.. automodule:: modelscope.utils.pymod + :members: + :undoc-members: + :show-inheritance: + +modelscope.utils.registry module +-------------------------------- + +.. automodule:: modelscope.utils.registry + :members: + :undoc-members: + :show-inheritance: + +modelscope.utils.type\_assert module +------------------------------------ + +.. automodule:: modelscope.utils.type_assert + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/api/modules.rst b/docs/source/api/modules.rst index 84eecc70..0f83e90c 100644 --- a/docs/source/api/modules.rst +++ b/docs/source/api/modules.rst @@ -1,7 +1,7 @@ -maas_lib -======== +modelscope +========== .. toctree:: :maxdepth: 4 - maas_lib + modelscope diff --git a/docs/source/conf.py b/docs/source/conf.py index 4cdcd956..2c2a0017 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -18,10 +18,10 @@ import sphinx_rtd_theme sys.path.insert(0, os.path.abspath('../../')) # -- Project information ----------------------------------------------------- -project = 'maas_lib' -copyright = '2022-2023, Alibaba MaaS' -author = 'maas_lib Authors' -version_file = '../../maas_lib/version.py' +project = 'modelscope' +copyright = '2022-2023, Alibaba ModelScope' +author = 'modelscope Authors' +version_file = '../../modelscope/version.py' def get_version(): @@ -88,7 +88,7 @@ html_static_path = ['_static'] # -- Options for HTMLHelp output --------------------------------------------- # Output file base name for HTML help builder. -htmlhelp_basename = 'maas_lib_doc' +htmlhelp_basename = 'modelscope_doc' # -- Extension configuration ------------------------------------------------- # Ignore >>> when copying code diff --git a/docs/source/index.rst b/docs/source/index.rst index 0ca63b41..3b223531 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -1,11 +1,11 @@ -.. maas_lib documentation file, +.. modelscope documentation file, You can adapt this file completely to your liking, but it should at least contain the root `toctree` directive. -MaasLib DOCUMENTATION +ModelScope DOCUMENTATION ======================================= -MaasLib doc +ModelScope doc .. toctree:: :maxdepth: 2 @@ -30,11 +30,11 @@ MaasLib doc :maxdepth: 10 :caption: API Doc - api/maas_lib.preprocessors - api/maas_lib.models - api/maas_lib.pipelines - api/maas_lib.fileio - api/maas_lib.utils + api/modelscope.preprocessors + api/modelscope.models + api/modelscope.pipelines + api/modelscope.fileio + api/modelscope.utils Indices and tables diff --git a/docs/source/quick_start.md b/docs/source/quick_start.md index 4d145e79..0f4cbbc3 100644 --- a/docs/source/quick_start.md +++ b/docs/source/quick_start.md @@ -5,39 +5,39 @@ 安装完成后，执行如下命令为maas library创建对应的python环境。 ```shell -conda create -n maas python=3.6 -conda activate maas +conda create -n modelscope python=3.6 +conda activate modelscope ``` 检查python和pip命令是否切换到conda环境下。 ```shell which python -# ~/workspace/anaconda3/envs/maas/bin/python +# ~/workspace/anaconda3/envs/modelscope/bin/python which pip -# ~/workspace/anaconda3/envs/maas/bin/pip +# ~/workspace/anaconda3/envs/modelscope/bin/pip ``` 注： 本项目只支持`python3`环境，请勿使用python2环境。 ## 第三方依赖安装 -MaaS Library目前支持tensorflow，pytorch两大深度学习框架进行模型训练、推理， 在Python 3.6+, Pytorch 1.8+, Tensorflow 2.6上测试可运行，用户可以根据所选模型对应的计算框架进行安装，可以参考如下链接进行安装所需框架: +ModelScope Library目前支持tensorflow，pytorch两大深度学习框架进行模型训练、推理， 在Python 3.6+, Pytorch 1.8+, Tensorflow 2.6上测试可运行，用户可以根据所选模型对应的计算框架进行安装，可以参考如下链接进行安装所需框架: * [Pytorch安装指导](https://pytorch.org/get-started/locally/) * [Tensorflow安装指导](https://www.tensorflow.org/install/pip) -## MaaS library 安装 +## ModelScope library 安装 注： 如果在安装过程中遇到错误，请前往[常见问题](faq.md)查找解决方案。 ### pip安装 ```shell -pip install -r http://pai-vision-data-hz.oss-cn-zhangjiakou.aliyuncs.com/release/maas/maas.txt +pip install -r http://pai-vision-data-hz.oss-cn-zhangjiakou.aliyuncs.com/release/maas/modelscope.txt ``` 安装成功后，可以执行如下命令进行验证安装是否正确 ```shell -python -c "from maas_lib.pipelines import pipeline;print(pipeline('image-matting',model='damo/image-matting-person')('http://pai-vision-data-hz.oss-cn-zhangjiakou.aliyuncs.com/data/test/maas/image_matting/test.png'))" +python -c "from modelscope.pipelines import pipeline;print(pipeline('image-matting',model='damo/image-matting-person')('http://pai-vision-data-hz.oss-cn-zhangjiakou.aliyuncs.com/data/test/maas/image_matting/test.png'))" ``` @@ -45,11 +45,11 @@ python -c "from maas_lib.pipelines import pipeline;print(pipeline('image-matting 适合本地开发调试使用，修改源码后可以直接执行 ```shell -git clone git@gitlab.alibaba-inc.com:Ali-MaaS/MaaS-lib.git maaslib +git clone git@gitlab.alibaba-inc.com:Ali-MaaS/MaaS-lib.git modelscope git fetch origin master git checkout master -cd maaslib +cd modelscope #安装依赖 pip install -r requirements.txt @@ -60,7 +60,7 @@ export PYTHONPATH=`pwd` 安装成功后，可以执行如下命令进行验证安装是否正确 ```shell -python -c "from maas_lib.pipelines import pipeline;print(pipeline('image-matting',model='damo/image-matting-person')('http://pai-vision-data-hz.oss-cn-zhangjiakou.aliyuncs.com/data/test/maas/image_matting/test.png'))" +python -c "from modelscope.pipelines import pipeline;print(pipeline('image-matting',model='damo/image-matting-person')('http://pai-vision-data-hz.oss-cn-zhangjiakou.aliyuncs.com/data/test/maas/image_matting/test.png'))" ``` @@ -79,8 +79,8 @@ pipeline函数提供了简洁的推理接口，示例如下， 更多pipeline介 ```python import cv2 import os.path as osp -from maas_lib.pipelines import pipeline -from maas_lib.utils.constant import Tasks +from modelscope.pipelines import pipeline +from modelscope.utils.constant import Tasks # 根据任务名创建pipeline img_matting = pipeline(Tasks.image_matting, model='damo/image-matting-person') @@ -99,9 +99,9 @@ print(f'Output written to {osp.abspath("result.png")}') ```python import cv2 import os.path as osp -from maas_lib.pipelines import pipeline -from maas_lib.utils.constant import Tasks -from maas_lib.pydatasets import PyDataset +from modelscope.pipelines import pipeline +from modelscope.utils.constant import Tasks +from modelscope.pydatasets import PyDataset # 使用图像url构建PyDataset，此处也可通过 input_location = '/dir/to/images' 来使用本地文件夹 input_location = [ diff --git a/docs/source/tutorials/pipeline.md b/docs/source/tutorials/pipeline.md index 512e64ee..cc851278 100644 --- a/docs/source/tutorials/pipeline.md +++ b/docs/source/tutorials/pipeline.md @@ -19,7 +19,7 @@ 1. pipeline函数支持指定特定任务名称，加载任务默认模型，创建对应Pipeline对象 执行如下python代码 ```python - >>> from maas_lib.pipelines import pipeline + >>> from modelscope.pipelines import pipeline >>> img_matting = pipeline(task='image-matting', model='damo/image-matting-person') ``` @@ -65,8 +65,8 @@ wget https://atp-modelzoo-sh.oss-cn-shanghai.aliyuncs.com/release/easynlp_modelz 创建tokenizer和模型 ```python ->>> from maas_lib.models import Model ->>> from maas_lib.preprocessors import SequenceClassificationPreprocessor +>>> from modelscope.models import Model +>>> from modelscope.preprocessors import SequenceClassificationPreprocessor >>> model = Model.from_pretrained('damo/bert-base-sst2') >>> tokenizer = SequenceClassificationPreprocessor( model.model_dir, first_sequence='sentence', second_sequence=None) @@ -74,7 +74,7 @@ wget https://atp-modelzoo-sh.oss-cn-shanghai.aliyuncs.com/release/easynlp_modelz 使用tokenizer和模型对象创建pipeline ```python ->>> from maas_lib.pipelines import pipeline +>>> from modelscope.pipelines import pipeline >>> semantic_cls = pipeline('text-classification', model=model, preprocessor=tokenizer) >>> semantic_cls("Hello world!") ``` diff --git a/maas_lib/pipelines/default.py b/maas_lib/pipelines/default.py deleted file mode 100644 index 5d364288..00000000 --- a/maas_lib/pipelines/default.py +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright (c) Alibaba, Inc. and its affiliates. - -from maas_lib.utils.constant import Tasks - -DEFAULT_MODEL_FOR_PIPELINE = { - # TaskName: (pipeline_module_name, model_repo) - Tasks.image_matting: ('image-matting', 'damo/image-matting-person'), - Tasks.text_classification: - ('bert-sentiment-analysis', 'damo/bert-base-sst2'), - Tasks.text_generation: ('palm', 'damo/nlp_palm_text-generation_chinese'), - Tasks.image_captioning: ('ofa', None), -} - - -def add_default_pipeline_info(task: str, - model_name: str, - modelhub_name: str = None, - overwrite: bool = False): - """ Add default model for a task. - - Args: - task (str): task name. - model_name (str): model_name. - modelhub_name (str): name for default modelhub. - overwrite (bool): overwrite default info. - """ - if not overwrite: - assert task not in DEFAULT_MODEL_FOR_PIPELINE, \ - f'task {task} already has default model.' - - DEFAULT_MODEL_FOR_PIPELINE[task] = (model_name, modelhub_name) - - -def get_default_pipeline_info(task): - """ Get default info for certain task. - - Args: - task (str): task name. - - Return: - A tuple: first element is pipeline name(model_name), second element - is modelhub name. - """ - assert task in DEFAULT_MODEL_FOR_PIPELINE, \ - f'No default pipeline is registered for Task {task}' - - pipeline_name, default_model = DEFAULT_MODEL_FOR_PIPELINE[task] - return pipeline_name, default_model diff --git a/maas_lib/__init__.py b/modelscope/__init__.py similarity index 100% rename from maas_lib/__init__.py rename to modelscope/__init__.py diff --git a/maas_lib/fileio/__init__.py b/modelscope/fileio/__init__.py similarity index 100% rename from maas_lib/fileio/__init__.py rename to modelscope/fileio/__init__.py diff --git a/maas_lib/fileio/file.py b/modelscope/fileio/file.py similarity index 100% rename from maas_lib/fileio/file.py rename to modelscope/fileio/file.py diff --git a/maas_lib/fileio/format/__init__.py b/modelscope/fileio/format/__init__.py similarity index 100% rename from maas_lib/fileio/format/__init__.py rename to modelscope/fileio/format/__init__.py diff --git a/maas_lib/fileio/format/base.py b/modelscope/fileio/format/base.py similarity index 100% rename from maas_lib/fileio/format/base.py rename to modelscope/fileio/format/base.py diff --git a/maas_lib/fileio/format/json.py b/modelscope/fileio/format/json.py similarity index 100% rename from maas_lib/fileio/format/json.py rename to modelscope/fileio/format/json.py diff --git a/maas_lib/fileio/format/yaml.py b/modelscope/fileio/format/yaml.py similarity index 100% rename from maas_lib/fileio/format/yaml.py rename to modelscope/fileio/format/yaml.py diff --git a/maas_lib/fileio/io.py b/modelscope/fileio/io.py similarity index 100% rename from maas_lib/fileio/io.py rename to modelscope/fileio/io.py diff --git a/maas_lib/models/__init__.py b/modelscope/models/__init__.py similarity index 100% rename from maas_lib/models/__init__.py rename to modelscope/models/__init__.py diff --git a/maas_lib/models/base.py b/modelscope/models/base.py similarity index 91% rename from maas_lib/models/base.py rename to modelscope/models/base.py index efda1b3e..e641236d 100644 --- a/maas_lib/models/base.py +++ b/modelscope/models/base.py @@ -7,10 +7,10 @@ from typing import Dict, List, Tuple, Union from maas_hub.file_download import model_file_download from maas_hub.snapshot_download import snapshot_download -from maas_lib.models.builder import build_model -from maas_lib.utils.config import Config -from maas_lib.utils.constant import CONFIGFILE -from maas_lib.utils.hub import get_model_cache_dir +from modelscope.models.builder import build_model +from modelscope.utils.config import Config +from modelscope.utils.constant import CONFIGFILE +from modelscope.utils.hub import get_model_cache_dir Tensor = Union['torch.Tensor', 'tf.Tensor'] diff --git a/maas_lib/models/builder.py b/modelscope/models/builder.py similarity index 84% rename from maas_lib/models/builder.py rename to modelscope/models/builder.py index 1e52d271..b6df8c90 100644 --- a/maas_lib/models/builder.py +++ b/modelscope/models/builder.py @@ -1,7 +1,7 @@ # Copyright (c) Alibaba, Inc. and its affiliates. -from maas_lib.utils.config import ConfigDict -from maas_lib.utils.registry import Registry, build_from_cfg +from modelscope.utils.config import ConfigDict +from modelscope.utils.registry import Registry, build_from_cfg MODELS = Registry('models') diff --git a/maas_lib/models/cv/__init__.py b/modelscope/models/cv/__init__.py similarity index 100% rename from maas_lib/models/cv/__init__.py rename to modelscope/models/cv/__init__.py diff --git a/maas_lib/models/cv/cartoon/__init__.py b/modelscope/models/cv/cartoon/__init__.py similarity index 100% rename from maas_lib/models/cv/cartoon/__init__.py rename to modelscope/models/cv/cartoon/__init__.py diff --git a/maas_lib/models/cv/cartoon/facelib/LICENSE b/modelscope/models/cv/cartoon/facelib/LICENSE similarity index 100% rename from maas_lib/models/cv/cartoon/facelib/LICENSE rename to modelscope/models/cv/cartoon/facelib/LICENSE diff --git a/maas_lib/models/cv/cartoon/facelib/LK/__init__.py b/modelscope/models/cv/cartoon/facelib/LK/__init__.py similarity index 100% rename from maas_lib/models/cv/cartoon/facelib/LK/__init__.py rename to modelscope/models/cv/cartoon/facelib/LK/__init__.py diff --git a/maas_lib/models/cv/cartoon/facelib/LK/lk.py b/modelscope/models/cv/cartoon/facelib/LK/lk.py similarity index 100% rename from maas_lib/models/cv/cartoon/facelib/LK/lk.py rename to modelscope/models/cv/cartoon/facelib/LK/lk.py diff --git a/maas_lib/models/cv/cartoon/facelib/__init__.py b/modelscope/models/cv/cartoon/facelib/__init__.py similarity index 100% rename from maas_lib/models/cv/cartoon/facelib/__init__.py rename to modelscope/models/cv/cartoon/facelib/__init__.py diff --git a/maas_lib/models/cv/cartoon/facelib/config.py b/modelscope/models/cv/cartoon/facelib/config.py similarity index 100% rename from maas_lib/models/cv/cartoon/facelib/config.py rename to modelscope/models/cv/cartoon/facelib/config.py diff --git a/maas_lib/models/cv/cartoon/facelib/face_detector.py b/modelscope/models/cv/cartoon/facelib/face_detector.py similarity index 100% rename from maas_lib/models/cv/cartoon/facelib/face_detector.py rename to modelscope/models/cv/cartoon/facelib/face_detector.py diff --git a/maas_lib/models/cv/cartoon/facelib/face_landmark.py b/modelscope/models/cv/cartoon/facelib/face_landmark.py similarity index 100% rename from maas_lib/models/cv/cartoon/facelib/face_landmark.py rename to modelscope/models/cv/cartoon/facelib/face_landmark.py diff --git a/maas_lib/models/cv/cartoon/facelib/facer.py b/modelscope/models/cv/cartoon/facelib/facer.py similarity index 100% rename from maas_lib/models/cv/cartoon/facelib/facer.py rename to modelscope/models/cv/cartoon/facelib/facer.py diff --git a/maas_lib/models/cv/cartoon/mtcnn_pytorch/LICENSE b/modelscope/models/cv/cartoon/mtcnn_pytorch/LICENSE similarity index 100% rename from maas_lib/models/cv/cartoon/mtcnn_pytorch/LICENSE rename to modelscope/models/cv/cartoon/mtcnn_pytorch/LICENSE diff --git a/maas_lib/models/cv/cartoon/mtcnn_pytorch/README.md b/modelscope/models/cv/cartoon/mtcnn_pytorch/README.md similarity index 100% rename from maas_lib/models/cv/cartoon/mtcnn_pytorch/README.md rename to modelscope/models/cv/cartoon/mtcnn_pytorch/README.md diff --git a/maas_lib/models/cv/cartoon/mtcnn_pytorch/__init__.py b/modelscope/models/cv/cartoon/mtcnn_pytorch/__init__.py similarity index 100% rename from maas_lib/models/cv/cartoon/mtcnn_pytorch/__init__.py rename to modelscope/models/cv/cartoon/mtcnn_pytorch/__init__.py diff --git a/maas_lib/models/cv/cartoon/mtcnn_pytorch/src/__init__.py b/modelscope/models/cv/cartoon/mtcnn_pytorch/src/__init__.py similarity index 100% rename from maas_lib/models/cv/cartoon/mtcnn_pytorch/src/__init__.py rename to modelscope/models/cv/cartoon/mtcnn_pytorch/src/__init__.py diff --git a/maas_lib/models/cv/cartoon/mtcnn_pytorch/src/align_trans.py b/modelscope/models/cv/cartoon/mtcnn_pytorch/src/align_trans.py similarity index 100% rename from maas_lib/models/cv/cartoon/mtcnn_pytorch/src/align_trans.py rename to modelscope/models/cv/cartoon/mtcnn_pytorch/src/align_trans.py diff --git a/maas_lib/models/cv/cartoon/mtcnn_pytorch/src/matlab_cp2tform.py b/modelscope/models/cv/cartoon/mtcnn_pytorch/src/matlab_cp2tform.py similarity index 100% rename from maas_lib/models/cv/cartoon/mtcnn_pytorch/src/matlab_cp2tform.py rename to modelscope/models/cv/cartoon/mtcnn_pytorch/src/matlab_cp2tform.py diff --git a/maas_lib/models/cv/cartoon/utils.py b/modelscope/models/cv/cartoon/utils.py similarity index 100% rename from maas_lib/models/cv/cartoon/utils.py rename to modelscope/models/cv/cartoon/utils.py diff --git a/maas_lib/models/nlp/__init__.py b/modelscope/models/nlp/__init__.py similarity index 100% rename from maas_lib/models/nlp/__init__.py rename to modelscope/models/nlp/__init__.py diff --git a/maas_lib/models/nlp/sequence_classification_model.py b/modelscope/models/nlp/sequence_classification_model.py similarity index 97% rename from maas_lib/models/nlp/sequence_classification_model.py rename to modelscope/models/nlp/sequence_classification_model.py index 0afdf26e..6ced7a4e 100644 --- a/maas_lib/models/nlp/sequence_classification_model.py +++ b/modelscope/models/nlp/sequence_classification_model.py @@ -2,7 +2,7 @@ from typing import Any, Dict import numpy as np -from maas_lib.utils.constant import Tasks +from modelscope.utils.constant import Tasks from ..base import Model from ..builder import MODELS diff --git a/maas_lib/models/nlp/text_generation_model.py b/modelscope/models/nlp/text_generation_model.py similarity index 97% rename from maas_lib/models/nlp/text_generation_model.py rename to modelscope/models/nlp/text_generation_model.py index 04345d22..ebefc8d1 100644 --- a/maas_lib/models/nlp/text_generation_model.py +++ b/modelscope/models/nlp/text_generation_model.py @@ -1,6 +1,6 @@ from typing import Any, Dict -from maas_lib.utils.constant import Tasks +from modelscope.utils.constant import Tasks from ..base import Model, Tensor from ..builder import MODELS diff --git a/maas_lib/pipelines/__init__.py b/modelscope/pipelines/__init__.py similarity index 100% rename from maas_lib/pipelines/__init__.py rename to modelscope/pipelines/__init__.py diff --git a/maas_lib/pipelines/audio/__init__.py b/modelscope/pipelines/audio/__init__.py similarity index 100% rename from maas_lib/pipelines/audio/__init__.py rename to modelscope/pipelines/audio/__init__.py diff --git a/maas_lib/pipelines/base.py b/modelscope/pipelines/base.py similarity index 93% rename from maas_lib/pipelines/base.py rename to modelscope/pipelines/base.py index 1ba8c36a..2e88801a 100644 --- a/maas_lib/pipelines/base.py +++ b/modelscope/pipelines/base.py @@ -6,11 +6,11 @@ from typing import Any, Dict, Generator, List, Union from maas_hub.snapshot_download import snapshot_download -from maas_lib.models.base import Model -from maas_lib.preprocessors import Preprocessor -from maas_lib.pydatasets import PyDataset -from maas_lib.utils.config import Config -from maas_lib.utils.hub import get_model_cache_dir +from modelscope.models.base import Model +from modelscope.preprocessors import Preprocessor +from modelscope.pydatasets import PyDataset +from modelscope.utils.config import Config +from modelscope.utils.hub import get_model_cache_dir from .util import is_model_name Tensor = Union['torch.Tensor', 'tf.Tensor'] @@ -75,7 +75,7 @@ class Pipeline(ABC): def __call__(self, input: Union[Input, List[Input]], *args, **post_kwargs) -> Union[Dict[str, Any], Generator]: # model provider should leave it as it is - # maas library developer will handle this function + # modelscope library developer will handle this function # simple showcase, need to support iterator type for both tensorflow and pytorch # input_dict = self._handle_input(input) diff --git a/maas_lib/pipelines/builder.py b/modelscope/pipelines/builder.py similarity index 58% rename from maas_lib/pipelines/builder.py rename to modelscope/pipelines/builder.py index cd1eb32f..06e614e6 100644 --- a/maas_lib/pipelines/builder.py +++ b/modelscope/pipelines/builder.py @@ -6,16 +6,26 @@ from typing import Union import json from maas_hub.file_download import model_file_download -from maas_lib.models.base import Model -from maas_lib.utils.config import Config, ConfigDict -from maas_lib.utils.constant import CONFIGFILE, Tasks -from maas_lib.utils.registry import Registry, build_from_cfg +from modelscope.models.base import Model +from modelscope.utils.config import Config, ConfigDict +from modelscope.utils.constant import CONFIGFILE, Tasks +from modelscope.utils.registry import Registry, build_from_cfg from .base import Pipeline -from .default import DEFAULT_MODEL_FOR_PIPELINE, get_default_pipeline_info from .util import is_model_name PIPELINES = Registry('pipelines') +DEFAULT_MODEL_FOR_PIPELINE = { + # TaskName: (pipeline_module_name, model_repo) + Tasks.image_matting: ('image-matting', 'damo/image-matting-person'), + Tasks.text_classification: + ('bert-sentiment-analysis', 'damo/bert-base-sst2'), + Tasks.text_generation: ('palm', 'damo/nlp_palm_text-generation_chinese'), + Tasks.image_captioning: ('ofa', None), + Tasks.image_generation: + ('cv_unet_person-image-cartoon', 'damo/cv_unet_image-matting_damo'), +} + def build_pipeline(cfg: ConfigDict, task_name: str = None, @@ -84,3 +94,42 @@ def pipeline(task: str = None, cfg.preprocessor = preprocessor return build_pipeline(cfg, task_name=task) + + +def add_default_pipeline_info(task: str, + model_name: str, + modelhub_name: str = None, + overwrite: bool = False): + """ Add default model for a task. + + Args: + task (str): task name. + model_name (str): model_name. + modelhub_name (str): name for default modelhub. + overwrite (bool): overwrite default info. + """ + if not overwrite: + assert task not in DEFAULT_MODEL_FOR_PIPELINE, \ + f'task {task} already has default model.' + + DEFAULT_MODEL_FOR_PIPELINE[task] = (model_name, modelhub_name) + + +def get_default_pipeline_info(task): + """ Get default info for certain task. + + Args: + task (str): task name. + + Return: + A tuple: first element is pipeline name(model_name), second element + is modelhub name. + """ + + if task not in DEFAULT_MODEL_FOR_PIPELINE: + # support pipeline which does not register default model + pipeline_name = list(PIPELINES.modules[task].keys())[0] + default_model = None + else: + pipeline_name, default_model = DEFAULT_MODEL_FOR_PIPELINE[task] + return pipeline_name, default_model diff --git a/maas_lib/pipelines/cv/__init__.py b/modelscope/pipelines/cv/__init__.py similarity index 100% rename from maas_lib/pipelines/cv/__init__.py rename to modelscope/pipelines/cv/__init__.py diff --git a/maas_lib/pipelines/cv/image_cartoon_pipeline.py b/modelscope/pipelines/cv/image_cartoon_pipeline.py similarity index 92% rename from maas_lib/pipelines/cv/image_cartoon_pipeline.py rename to modelscope/pipelines/cv/image_cartoon_pipeline.py index 88c2eb15..6a6c10e0 100644 --- a/maas_lib/pipelines/cv/image_cartoon_pipeline.py +++ b/modelscope/pipelines/cv/image_cartoon_pipeline.py @@ -6,14 +6,14 @@ import numpy as np import PIL import tensorflow as tf -from maas_lib.models.cv.cartoon.facelib.facer import FaceAna -from maas_lib.models.cv.cartoon.mtcnn_pytorch.src.align_trans import ( +from modelscope.models.cv.cartoon.facelib.facer import FaceAna +from modelscope.models.cv.cartoon.mtcnn_pytorch.src.align_trans import ( get_reference_facial_points, warp_and_crop_face) -from maas_lib.models.cv.cartoon.utils import get_f5p, padTo16x, resize_size -from maas_lib.pipelines.base import Input -from maas_lib.preprocessors import load_image -from maas_lib.utils.constant import Tasks -from maas_lib.utils.logger import get_logger +from modelscope.models.cv.cartoon.utils import get_f5p, padTo16x, resize_size +from modelscope.pipelines.base import Input +from modelscope.preprocessors import load_image +from modelscope.utils.constant import Tasks +from modelscope.utils.logger import get_logger from ..base import Pipeline from ..builder import PIPELINES diff --git a/maas_lib/pipelines/cv/image_matting_pipeline.py b/modelscope/pipelines/cv/image_matting_pipeline.py similarity index 92% rename from maas_lib/pipelines/cv/image_matting_pipeline.py rename to modelscope/pipelines/cv/image_matting_pipeline.py index 0317b4bd..6f3ff5f5 100644 --- a/maas_lib/pipelines/cv/image_matting_pipeline.py +++ b/modelscope/pipelines/cv/image_matting_pipeline.py @@ -5,10 +5,10 @@ import cv2 import numpy as np import PIL -from maas_lib.pipelines.base import Input -from maas_lib.preprocessors import load_image -from maas_lib.utils.constant import Tasks -from maas_lib.utils.logger import get_logger +from modelscope.pipelines.base import Input +from modelscope.preprocessors import load_image +from modelscope.utils.constant import Tasks +from modelscope.utils.logger import get_logger from ..base import Pipeline from ..builder import PIPELINES diff --git a/maas_lib/pipelines/multi_modal/__init__.py b/modelscope/pipelines/multi_modal/__init__.py similarity index 100% rename from maas_lib/pipelines/multi_modal/__init__.py rename to modelscope/pipelines/multi_modal/__init__.py diff --git a/maas_lib/pipelines/multi_modal/image_captioning.py b/modelscope/pipelines/multi_modal/image_captioning.py similarity index 95% rename from maas_lib/pipelines/multi_modal/image_captioning.py rename to modelscope/pipelines/multi_modal/image_captioning.py index 2d8cc618..91180e23 100644 --- a/maas_lib/pipelines/multi_modal/image_captioning.py +++ b/modelscope/pipelines/multi_modal/image_captioning.py @@ -4,10 +4,10 @@ import numpy as np import torch from PIL import Image -from maas_lib.pipelines.base import Input -from maas_lib.preprocessors import load_image -from maas_lib.utils.constant import Tasks -from maas_lib.utils.logger import get_logger +from modelscope.pipelines.base import Input +from modelscope.preprocessors import load_image +from modelscope.utils.constant import Tasks +from modelscope.utils.logger import get_logger from ..base import Pipeline from ..builder import PIPELINES diff --git a/maas_lib/pipelines/nlp/__init__.py b/modelscope/pipelines/nlp/__init__.py similarity index 100% rename from maas_lib/pipelines/nlp/__init__.py rename to modelscope/pipelines/nlp/__init__.py diff --git a/maas_lib/pipelines/nlp/sequence_classification_pipeline.py b/modelscope/pipelines/nlp/sequence_classification_pipeline.py similarity index 94% rename from maas_lib/pipelines/nlp/sequence_classification_pipeline.py rename to modelscope/pipelines/nlp/sequence_classification_pipeline.py index 014eb4a3..5a14f136 100644 --- a/maas_lib/pipelines/nlp/sequence_classification_pipeline.py +++ b/modelscope/pipelines/nlp/sequence_classification_pipeline.py @@ -5,9 +5,9 @@ from typing import Any, Dict, Union import json import numpy as np -from maas_lib.models.nlp import BertForSequenceClassification -from maas_lib.preprocessors import SequenceClassificationPreprocessor -from maas_lib.utils.constant import Tasks +from modelscope.models.nlp import BertForSequenceClassification +from modelscope.preprocessors import SequenceClassificationPreprocessor +from modelscope.utils.constant import Tasks from ...models import Model from ..base import Input, Pipeline from ..builder import PIPELINES diff --git a/maas_lib/pipelines/nlp/text_generation_pipeline.py b/modelscope/pipelines/nlp/text_generation_pipeline.py similarity index 91% rename from maas_lib/pipelines/nlp/text_generation_pipeline.py rename to modelscope/pipelines/nlp/text_generation_pipeline.py index 865557b5..7ad2b67f 100644 --- a/maas_lib/pipelines/nlp/text_generation_pipeline.py +++ b/modelscope/pipelines/nlp/text_generation_pipeline.py @@ -1,9 +1,9 @@ from typing import Dict, Optional, Union -from maas_lib.models import Model -from maas_lib.models.nlp import PalmForTextGenerationModel -from maas_lib.preprocessors import TextGenerationPreprocessor -from maas_lib.utils.constant import Tasks +from modelscope.models import Model +from modelscope.models.nlp import PalmForTextGenerationModel +from modelscope.preprocessors import TextGenerationPreprocessor +from modelscope.utils.constant import Tasks from ..base import Pipeline, Tensor from ..builder import PIPELINES diff --git a/maas_lib/pipelines/util.py b/modelscope/pipelines/util.py similarity index 94% rename from maas_lib/pipelines/util.py rename to modelscope/pipelines/util.py index 771e0d2b..92ad6af4 100644 --- a/maas_lib/pipelines/util.py +++ b/modelscope/pipelines/util.py @@ -5,7 +5,7 @@ import os.path as osp import json from maas_hub.file_download import model_file_download -from maas_lib.utils.constant import CONFIGFILE +from modelscope.utils.constant import CONFIGFILE def is_model_name(model): diff --git a/maas_lib/preprocessors/__init__.py b/modelscope/preprocessors/__init__.py similarity index 100% rename from maas_lib/preprocessors/__init__.py rename to modelscope/preprocessors/__init__.py diff --git a/maas_lib/preprocessors/base.py b/modelscope/preprocessors/base.py similarity index 100% rename from maas_lib/preprocessors/base.py rename to modelscope/preprocessors/base.py diff --git a/maas_lib/preprocessors/builder.py b/modelscope/preprocessors/builder.py similarity index 80% rename from maas_lib/preprocessors/builder.py rename to modelscope/preprocessors/builder.py index 69421b5f..918f8d17 100644 --- a/maas_lib/preprocessors/builder.py +++ b/modelscope/preprocessors/builder.py @@ -1,8 +1,8 @@ # Copyright (c) Alibaba, Inc. and its affiliates. -from maas_lib.utils.config import ConfigDict -from maas_lib.utils.constant import Fields -from maas_lib.utils.registry import Registry, build_from_cfg +from modelscope.utils.config import ConfigDict +from modelscope.utils.constant import Fields +from modelscope.utils.registry import Registry, build_from_cfg PREPROCESSORS = Registry('preprocessors') diff --git a/maas_lib/preprocessors/common.py b/modelscope/preprocessors/common.py similarity index 100% rename from maas_lib/preprocessors/common.py rename to modelscope/preprocessors/common.py diff --git a/maas_lib/preprocessors/image.py b/modelscope/preprocessors/image.py similarity index 96% rename from maas_lib/preprocessors/image.py rename to modelscope/preprocessors/image.py index 8db9f5bb..142f9484 100644 --- a/maas_lib/preprocessors/image.py +++ b/modelscope/preprocessors/image.py @@ -4,8 +4,8 @@ from typing import Dict, Union from PIL import Image, ImageOps -from maas_lib.fileio import File -from maas_lib.utils.constant import Fields +from modelscope.fileio import File +from modelscope.utils.constant import Fields from .builder import PREPROCESSORS diff --git a/maas_lib/preprocessors/nlp.py b/modelscope/preprocessors/nlp.py similarity index 97% rename from maas_lib/preprocessors/nlp.py rename to modelscope/preprocessors/nlp.py index 176322d4..0de41bfc 100644 --- a/maas_lib/preprocessors/nlp.py +++ b/modelscope/preprocessors/nlp.py @@ -5,8 +5,8 @@ from typing import Any, Dict, Union from transformers import AutoTokenizer -from maas_lib.utils.constant import Fields, InputFields -from maas_lib.utils.type_assert import type_assert +from modelscope.utils.constant import Fields, InputFields +from modelscope.utils.type_assert import type_assert from .base import Preprocessor from .builder import PREPROCESSORS diff --git a/maas_lib/pydatasets/__init__.py b/modelscope/pydatasets/__init__.py similarity index 100% rename from maas_lib/pydatasets/__init__.py rename to modelscope/pydatasets/__init__.py diff --git a/maas_lib/pydatasets/py_dataset.py b/modelscope/pydatasets/py_dataset.py similarity index 96% rename from maas_lib/pydatasets/py_dataset.py rename to modelscope/pydatasets/py_dataset.py index 58f83830..7d0edadb 100644 --- a/maas_lib/pydatasets/py_dataset.py +++ b/modelscope/pydatasets/py_dataset.py @@ -4,7 +4,7 @@ from typing import (Any, Callable, Dict, List, Mapping, Optional, Sequence, from datasets import Dataset, load_dataset -from maas_lib.utils.logger import get_logger +from modelscope.utils.logger import get_logger logger = get_logger() @@ -52,7 +52,7 @@ class PyDataset: Mapping[str, Union[str, Sequence[str]]]]] = None ) -> 'PyDataset': - """Load a PyDataset from the MaaS Hub, Hugging Face Hub, urls, or a local dataset. + """Load a PyDataset from the ModelScope Hub, Hugging Face Hub, urls, or a local dataset. Args: path (str): Path or name of the dataset. diff --git a/maas_lib/tools/eval.py b/modelscope/tools/eval.py similarity index 94% rename from maas_lib/tools/eval.py rename to modelscope/tools/eval.py index 95bf7054..ca39932d 100644 --- a/maas_lib/tools/eval.py +++ b/modelscope/tools/eval.py @@ -2,7 +2,7 @@ import argparse -from maas_lib.trainers import build_trainer +from modelscope.trainers import build_trainer def parse_args(): diff --git a/maas_lib/tools/train.py b/modelscope/tools/train.py similarity index 92% rename from maas_lib/tools/train.py rename to modelscope/tools/train.py index f7c2b54b..c6f1ef5f 100644 --- a/maas_lib/tools/train.py +++ b/modelscope/tools/train.py @@ -2,7 +2,7 @@ import argparse -from maas_lib.trainers import build_trainer +from modelscope.trainers import build_trainer def parse_args(): diff --git a/maas_lib/trainers/__init__.py b/modelscope/trainers/__init__.py similarity index 100% rename from maas_lib/trainers/__init__.py rename to modelscope/trainers/__init__.py diff --git a/maas_lib/trainers/base.py b/modelscope/trainers/base.py similarity index 96% rename from maas_lib/trainers/base.py rename to modelscope/trainers/base.py index 2c11779e..372938b4 100644 --- a/maas_lib/trainers/base.py +++ b/modelscope/trainers/base.py @@ -3,8 +3,8 @@ from abc import ABC, abstractmethod from typing import Callable, Dict, List, Optional, Tuple, Union -from maas_lib.trainers.builder import TRAINERS -from maas_lib.utils.config import Config +from modelscope.trainers.builder import TRAINERS +from modelscope.utils.config import Config class BaseTrainer(ABC): diff --git a/maas_lib/trainers/builder.py b/modelscope/trainers/builder.py similarity index 77% rename from maas_lib/trainers/builder.py rename to modelscope/trainers/builder.py index 2165fe58..2192d46c 100644 --- a/maas_lib/trainers/builder.py +++ b/modelscope/trainers/builder.py @@ -1,8 +1,8 @@ # Copyright (c) Alibaba, Inc. and its affiliates. -from maas_lib.utils.config import ConfigDict -from maas_lib.utils.constant import Tasks -from maas_lib.utils.registry import Registry, build_from_cfg +from modelscope.utils.config import ConfigDict +from modelscope.utils.constant import Tasks +from modelscope.utils.registry import Registry, build_from_cfg TRAINERS = Registry('trainers') diff --git a/maas_lib/trainers/nlp/__init__.py b/modelscope/trainers/nlp/__init__.py similarity index 100% rename from maas_lib/trainers/nlp/__init__.py rename to modelscope/trainers/nlp/__init__.py diff --git a/maas_lib/trainers/nlp/sequence_classification_trainer.py b/modelscope/trainers/nlp/sequence_classification_trainer.py similarity index 98% rename from maas_lib/trainers/nlp/sequence_classification_trainer.py rename to modelscope/trainers/nlp/sequence_classification_trainer.py index f2264c0d..b2b759fa 100644 --- a/maas_lib/trainers/nlp/sequence_classification_trainer.py +++ b/modelscope/trainers/nlp/sequence_classification_trainer.py @@ -3,8 +3,8 @@ from typing import Callable, Dict, List, Optional, Tuple, Union import numpy as np -from maas_lib.utils.constant import Tasks -from maas_lib.utils.logger import get_logger +from modelscope.utils.constant import Tasks +from modelscope.utils.logger import get_logger from ..base import BaseTrainer from ..builder import TRAINERS diff --git a/maas_lib/utils/__init__.py b/modelscope/utils/__init__.py similarity index 100% rename from maas_lib/utils/__init__.py rename to modelscope/utils/__init__.py diff --git a/maas_lib/utils/config.py b/modelscope/utils/config.py similarity index 98% rename from maas_lib/utils/config.py rename to modelscope/utils/config.py index 7d67d248..d0f3f657 100644 --- a/maas_lib/utils/config.py +++ b/modelscope/utils/config.py @@ -17,9 +17,9 @@ from typing import Dict import addict from yapf.yapflib.yapf_api import FormatCode -from maas_lib.utils.logger import get_logger -from maas_lib.utils.pymod import (import_modules, import_modules_from_file, - validate_py_syntax) +from modelscope.utils.logger import get_logger +from modelscope.utils.pymod import (import_modules, import_modules_from_file, + validate_py_syntax) if platform.system() == 'Windows': import regex as re # type: ignore @@ -117,7 +117,7 @@ class Config: # delete imported module del sys.modules[module_nanme] elif filename.endswith(('.yml', '.yaml', '.json')): - from maas_lib.fileio import load + from modelscope.fileio import load cfg_dict = load(tmp_cfg_file.name) # close temp file tmp_cfg_file.close() @@ -364,7 +364,7 @@ class Config: file (str, optional): Path of the output file where the config will be dumped. Defaults to None. """ - from maas_lib.fileio import dump + from modelscope.fileio import dump cfg_dict = super(Config, self).__getattribute__('_cfg_dict').to_dict() if file is None: if self.filename is None or self.filename.endswith('.py'): diff --git a/maas_lib/utils/constant.py b/modelscope/utils/constant.py similarity index 97% rename from maas_lib/utils/constant.py rename to modelscope/utils/constant.py index 8f808a6f..eae719a3 100644 --- a/maas_lib/utils/constant.py +++ b/modelscope/utils/constant.py @@ -13,7 +13,7 @@ class Fields(object): class Tasks(object): - """ Names for tasks supported by maas lib. + """ Names for tasks supported by modelscope. Holds the standard task name to use for identifying different tasks. This should be used to register models, pipelines, trainers. diff --git a/maas_lib/utils/hub.py b/modelscope/utils/hub.py similarity index 100% rename from maas_lib/utils/hub.py rename to modelscope/utils/hub.py diff --git a/maas_lib/utils/logger.py b/modelscope/utils/logger.py similarity index 100% rename from maas_lib/utils/logger.py rename to modelscope/utils/logger.py diff --git a/maas_lib/utils/pymod.py b/modelscope/utils/pymod.py similarity index 98% rename from maas_lib/utils/pymod.py rename to modelscope/utils/pymod.py index 4f717480..6db6798d 100644 --- a/maas_lib/utils/pymod.py +++ b/modelscope/utils/pymod.py @@ -7,7 +7,7 @@ import sys import types from importlib import import_module -from maas_lib.utils.logger import get_logger +from modelscope.utils.logger import get_logger logger = get_logger() diff --git a/maas_lib/utils/registry.py b/modelscope/utils/registry.py similarity index 98% rename from maas_lib/utils/registry.py rename to modelscope/utils/registry.py index bac3d616..73a938ea 100644 --- a/maas_lib/utils/registry.py +++ b/modelscope/utils/registry.py @@ -3,7 +3,7 @@ import inspect from email.policy import default -from maas_lib.utils.logger import get_logger +from modelscope.utils.logger import get_logger default_group = 'default' logger = get_logger() @@ -174,7 +174,7 @@ def build_from_cfg(cfg, '`cfg` or `default_args` must contain the key "type", ' f'but got {cfg}\n{default_args}') if not isinstance(registry, Registry): - raise TypeError('registry must be an maas_lib.Registry object, ' + raise TypeError('registry must be an modelscope.Registry object, ' f'but got {type(registry)}') if not (isinstance(default_args, dict) or default_args is None): raise TypeError('default_args must be a dict or None, ' diff --git a/maas_lib/utils/type_assert.py b/modelscope/utils/type_assert.py similarity index 100% rename from maas_lib/utils/type_assert.py rename to modelscope/utils/type_assert.py diff --git a/maas_lib/version.py b/modelscope/version.py similarity index 100% rename from maas_lib/version.py rename to modelscope/version.py diff --git a/requirements/maas.txt b/requirements/maas.txt deleted file mode 100644 index 3b64c375..00000000 --- a/requirements/maas.txt +++ /dev/null @@ -1,2 +0,0 @@ -http://pai-vision-data-hz.oss-cn-zhangjiakou.aliyuncs.com/release/maas/maas_lib-0.1.1-py3-none-any.whl -https://maashub.oss-cn-hangzhou.aliyuncs.com/releases/maas_hub-0.1.0.dev0-py2.py3-none-any.whl diff --git a/requirements/runtime.txt b/requirements/runtime.txt index b57358fc..47a11cbc 100644 --- a/requirements/runtime.txt +++ b/requirements/runtime.txt @@ -1,5 +1,6 @@ addict datasets +easydict https://maashub.oss-cn-hangzhou.aliyuncs.com/releases/maas_hub-0.1.0.dev0-py2.py3-none-any.whl numpy opencv-python-headless diff --git a/setup.cfg b/setup.cfg index 8feaa182..0b929b04 100644 --- a/setup.cfg +++ b/setup.cfg @@ -2,7 +2,7 @@ line_length = 79 multi_line_output = 0 known_standard_library = setuptools -known_first_party = maas_lib +known_first_party = modelscope known_third_party = json,yaml no_lines_before = STDLIB,LOCALFOLDER default_section = THIRDPARTY diff --git a/setup.py b/setup.py index b9044bff..b027c4cb 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ def readme(): return content -version_file = 'maas_lib/version.py' +version_file = 'modelscope/version.py' def get_git_hash(): @@ -155,8 +155,8 @@ def pack_resource(): shutil.rmtree(root_dir) os.makedirs(root_dir) - proj_dir = root_dir + 'maas_lib/' - shutil.copytree('./maas_lib', proj_dir) + proj_dir = root_dir + 'modelscope/' + shutil.copytree('./modelscope', proj_dir) shutil.copytree('./configs', proj_dir + 'configs') shutil.copytree('./requirements', 'package/requirements') shutil.copy('./requirements.txt', 'package/requirements.txt') @@ -170,13 +170,13 @@ if __name__ == '__main__': os.chdir('package') install_requires, deps_link = parse_requirements('requirements.txt') setup( - name='maas-lib', + name='model-scope', version=get_version(), description='', long_description=readme(), long_description_content_type='text/markdown', - author='Alibaba MaaS team', - author_email='maas_lib@list.alibaba-inc.com', + author='Alibaba ModelScope team', + author_email='modelscope@list.alibaba-inc.com', keywords='', url='TBD', packages=find_packages(exclude=('configs', 'tools', 'demo')), diff --git a/tests/fileio/test_file.py b/tests/fileio/test_file.py index 9f83f02c..0be41b42 100644 --- a/tests/fileio/test_file.py +++ b/tests/fileio/test_file.py @@ -5,7 +5,7 @@ import unittest from requests import HTTPError -from maas_lib.fileio.file import File, HTTPStorage, LocalStorage +from modelscope.fileio.file import File, HTTPStorage, LocalStorage class FileTest(unittest.TestCase): diff --git a/tests/fileio/test_io.py b/tests/fileio/test_io.py index 1e202e5b..0a80d3f7 100644 --- a/tests/fileio/test_io.py +++ b/tests/fileio/test_io.py @@ -2,7 +2,7 @@ import tempfile import unittest -from maas_lib.fileio.io import dump, dumps, load +from modelscope.fileio.io import dump, dumps, load class FileIOTest(unittest.TestCase): diff --git a/tests/pipelines/test_base.py b/tests/pipelines/test_base.py index 5994ddde..14f646a9 100644 --- a/tests/pipelines/test_base.py +++ b/tests/pipelines/test_base.py @@ -6,12 +6,11 @@ from typing import Any, Dict, List, Tuple, Union import numpy as np import PIL -from maas_lib.pipelines import Pipeline, pipeline -from maas_lib.pipelines.builder import PIPELINES -from maas_lib.pipelines.default import add_default_pipeline_info -from maas_lib.utils.constant import Tasks -from maas_lib.utils.logger import get_logger -from maas_lib.utils.registry import default_group +from modelscope.pipelines import Pipeline, pipeline +from modelscope.pipelines.builder import PIPELINES, add_default_pipeline_info +from modelscope.utils.constant import Tasks +from modelscope.utils.logger import get_logger +from modelscope.utils.registry import default_group logger = get_logger() @@ -54,7 +53,7 @@ class CustomPipelineTest(unittest.TestCase): """ if not isinstance(input, PIL.Image.Image): - from maas_lib.preprocessors import load_image + from modelscope.preprocessors import load_image data_dict = {'img': load_image(input), 'url': input} else: data_dict = {'img': input} diff --git a/tests/pipelines/test_image_captioning.py b/tests/pipelines/test_image_captioning.py index afcab01d..5584d0e2 100644 --- a/tests/pipelines/test_image_captioning.py +++ b/tests/pipelines/test_image_captioning.py @@ -4,9 +4,9 @@ import os import tempfile import unittest -from maas_lib.fileio import File -from maas_lib.pipelines import pipeline -from maas_lib.utils.constant import Tasks +from modelscope.fileio import File +from modelscope.pipelines import pipeline +from modelscope.utils.constant import Tasks class ImageCaptionTest(unittest.TestCase): diff --git a/tests/pipelines/test_image_matting.py b/tests/pipelines/test_image_matting.py index 25f19102..53006317 100644 --- a/tests/pipelines/test_image_matting.py +++ b/tests/pipelines/test_image_matting.py @@ -6,11 +6,11 @@ import unittest import cv2 -from maas_lib.fileio import File -from maas_lib.pipelines import pipeline -from maas_lib.pydatasets import PyDataset -from maas_lib.utils.constant import Tasks -from maas_lib.utils.hub import get_model_cache_dir +from modelscope.fileio import File +from modelscope.pipelines import pipeline +from modelscope.pydatasets import PyDataset +from modelscope.utils.constant import Tasks +from modelscope.utils.hub import get_model_cache_dir class ImageMattingTest(unittest.TestCase): diff --git a/tests/pipelines/test_person_image_cartoon.py b/tests/pipelines/test_person_image_cartoon.py index dae853d7..817593f1 100644 --- a/tests/pipelines/test_person_image_cartoon.py +++ b/tests/pipelines/test_person_image_cartoon.py @@ -4,8 +4,8 @@ import unittest import cv2 -from maas_lib.pipelines import pipeline -from maas_lib.utils.constant import Tasks +from modelscope.pipelines import pipeline +from modelscope.utils.constant import Tasks def all_file(file_dir): diff --git a/tests/pipelines/test_text_classification.py b/tests/pipelines/test_text_classification.py index 36285f80..3e3faa1d 100644 --- a/tests/pipelines/test_text_classification.py +++ b/tests/pipelines/test_text_classification.py @@ -4,14 +4,14 @@ import unittest import zipfile from pathlib import Path -from maas_lib.fileio import File -from maas_lib.models import Model -from maas_lib.models.nlp import BertForSequenceClassification -from maas_lib.pipelines import SequenceClassificationPipeline, pipeline -from maas_lib.preprocessors import SequenceClassificationPreprocessor -from maas_lib.pydatasets import PyDataset -from maas_lib.utils.constant import Tasks -from maas_lib.utils.hub import get_model_cache_dir +from modelscope.fileio import File +from modelscope.models import Model +from modelscope.models.nlp import BertForSequenceClassification +from modelscope.pipelines import SequenceClassificationPipeline, pipeline +from modelscope.preprocessors import SequenceClassificationPreprocessor +from modelscope.pydatasets import PyDataset +from modelscope.utils.constant import Tasks +from modelscope.utils.hub import get_model_cache_dir class SequenceClassificationTest(unittest.TestCase): diff --git a/tests/pipelines/test_text_generation.py b/tests/pipelines/test_text_generation.py index 235279c2..d8f1b495 100644 --- a/tests/pipelines/test_text_generation.py +++ b/tests/pipelines/test_text_generation.py @@ -3,11 +3,11 @@ import unittest from maas_hub.snapshot_download import snapshot_download -from maas_lib.models import Model -from maas_lib.models.nlp import PalmForTextGenerationModel -from maas_lib.pipelines import TextGenerationPipeline, pipeline -from maas_lib.preprocessors import TextGenerationPreprocessor -from maas_lib.utils.constant import Tasks +from modelscope.models import Model +from modelscope.models.nlp import PalmForTextGenerationModel +from modelscope.pipelines import TextGenerationPipeline, pipeline +from modelscope.preprocessors import TextGenerationPreprocessor +from modelscope.utils.constant import Tasks class TextGenerationTest(unittest.TestCase): diff --git a/tests/preprocessors/test_common.py b/tests/preprocessors/test_common.py index d9b0f74f..1ee13589 100644 --- a/tests/preprocessors/test_common.py +++ b/tests/preprocessors/test_common.py @@ -2,7 +2,7 @@ import unittest -from maas_lib.preprocessors import PREPROCESSORS, Compose, Preprocessor +from modelscope.preprocessors import PREPROCESSORS, Compose, Preprocessor class ComposeTest(unittest.TestCase): diff --git a/tests/preprocessors/test_nlp.py b/tests/preprocessors/test_nlp.py index 740bf938..fca01597 100644 --- a/tests/preprocessors/test_nlp.py +++ b/tests/preprocessors/test_nlp.py @@ -2,9 +2,9 @@ import unittest -from maas_lib.preprocessors import build_preprocessor -from maas_lib.utils.constant import Fields, InputFields -from maas_lib.utils.logger import get_logger +from modelscope.preprocessors import build_preprocessor +from modelscope.utils.constant import Fields, InputFields +from modelscope.utils.logger import get_logger logger = get_logger() diff --git a/tests/pydatasets/test_py_dataset.py b/tests/pydatasets/test_py_dataset.py index a32dcb0e..7accd814 100644 --- a/tests/pydatasets/test_py_dataset.py +++ b/tests/pydatasets/test_py_dataset.py @@ -2,7 +2,7 @@ import unittest import datasets as hfdata -from maas_lib.pydatasets import PyDataset +from modelscope.pydatasets import PyDataset class PyDatasetTest(unittest.TestCase): diff --git a/tests/trainers/test_sequence_classification_trainer.py b/tests/trainers/test_sequence_classification_trainer.py index 9846db4f..c0b2d109 100644 --- a/tests/trainers/test_sequence_classification_trainer.py +++ b/tests/trainers/test_sequence_classification_trainer.py @@ -2,9 +2,9 @@ import unittest import zipfile from pathlib import Path -from maas_lib.fileio import File -from maas_lib.trainers import build_trainer -from maas_lib.utils.logger import get_logger +from modelscope.fileio import File +from modelscope.trainers import build_trainer +from modelscope.utils.logger import get_logger logger = get_logger() diff --git a/tests/trainers/test_trainer_base.py b/tests/trainers/test_trainer_base.py index e764d6c9..c5fc1303 100644 --- a/tests/trainers/test_trainer_base.py +++ b/tests/trainers/test_trainer_base.py @@ -2,7 +2,7 @@ import unittest -from maas_lib.trainers import build_trainer +from modelscope.trainers import build_trainer class DummyTrainerTest(unittest.TestCase): diff --git a/tests/utils/test_config.py b/tests/utils/test_config.py index 31d51311..48f1d4a8 100644 --- a/tests/utils/test_config.py +++ b/tests/utils/test_config.py @@ -5,8 +5,8 @@ import tempfile import unittest from pathlib import Path -from maas_lib.fileio import dump, load -from maas_lib.utils.config import Config +from modelscope.fileio import dump, load +from modelscope.utils.config import Config obj = {'a': 1, 'b': {'c': [1, 2, 3], 'd': 'dd'}} diff --git a/tests/utils/test_registry.py b/tests/utils/test_registry.py index 982b9f21..67e44f4e 100644 --- a/tests/utils/test_registry.py +++ b/tests/utils/test_registry.py @@ -1,8 +1,8 @@ # Copyright (c) Alibaba, Inc. and its affiliates. import unittest -from maas_lib.utils.constant import Tasks -from maas_lib.utils.registry import Registry, build_from_cfg, default_group +from modelscope.utils.constant import Tasks +from modelscope.utils.registry import Registry, build_from_cfg, default_group class RegistryTest(unittest.TestCase): diff --git a/tests/utils/test_type_assert.py b/tests/utils/test_type_assert.py index 4ec9f2e5..5b62a269 100644 --- a/tests/utils/test_type_assert.py +++ b/tests/utils/test_type_assert.py @@ -3,7 +3,7 @@ import unittest from typing import List, Union -from maas_lib.utils.type_assert import type_assert +from modelscope.utils.type_assert import type_assert class type_assertTest(unittest.TestCase):