Skip to content

Commit

Permalink
Merge branch 'master' into issue_1498
Browse files Browse the repository at this point in the history
  • Loading branch information
@msaroufim
msaroufim authored Mar 17, 2022
2 parents a513eaf + 31cd1d0 commit 338913e
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion benchmarks/benchmark-ab.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ def resnet152_batch_docker():
execution_params['exec_env'] = 'docker'

def bert_batch():
execution_params['url'] = 'https://bert-mar-file.s3.us-west-2.amazonaws.com/BERTSeqClassification.mar'
execution_params['url'] = 'https://torchserve.pytorch.org/mar_files/BERTSeqClassification.mar'
execution_params['requests'] = 1000
execution_params['concurrency'] = 10
execution_params['batch_size'] = 4
Expand Down
10 changes: 4 additions & 6 deletions docker/Dockerfile.dev
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,6 @@ RUN --mount=type=cache,id=apt-dev,target=/var/cache/apt \
RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.8 1 \
&& update-alternatives --install /usr/local/bin/pip pip /usr/local/bin/pip3.8 1

RUN python3.8 -m venv /home/venv
ENV PATH="/home/venv/bin:$PATH"

RUN python -m pip install -U pip setuptools

# Build Dev Image
FROM compile-image AS dev-image
ARG MACHINE_TYPE=cpu
Expand All @@ -60,6 +55,8 @@ RUN if [ "$MACHINE_TYPE" = "gpu" ]; then export USE_CUDA=1; fi \
&& git clone https://github.com/pytorch/serve.git \
&& cd serve \
&& git checkout ${BRANCH_NAME} \
&& python3.8 -m venv /home/venv \
&& python -m pip install -U pip setuptools \
&& if [ -z "$CUDA_VERSION" ]; then python ts_scripts/install_dependencies.py --environment=dev; else python ts_scripts/install_dependencies.py --environment=dev --cuda $CUDA_VERSION; fi \
&& python ts_scripts/install_from_src.py \
&& useradd -m model-server \
Expand All @@ -68,7 +65,8 @@ RUN if [ "$MACHINE_TYPE" = "gpu" ]; then export USE_CUDA=1; fi \
&& chmod +x /usr/local/bin/dockerd-entrypoint.sh \
&& chown -R model-server /home/model-server \
&& cp docker/config.properties /home/model-server/config.properties \
&& mkdir /home/model-server/model-store && chown -R model-server /home/model-server/model-store
&& mkdir /home/model-server/model-store && chown -R model-server /home/model-server/model-store \
&& chown -R model-server /home/venv

EXPOSE 8080 8081 8082 7070 7071
USER model-server
Expand Down
7 changes: 7 additions & 0 deletions docs/model_zoo.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ To propose a model for inclusion, please submit a [pull request](https://github.
| Text classifier | Text Classification | AG_NEWS | 169 MB | [.mar](https://torchserve.pytorch.org/mar_files/my_text_classifier_v4.mar) | [sample_text.txt](https://github.com/pytorch/serve/blob/master/examples/text_classification/sample_text.txt) |Eager|
| FCN ResNet 101 | Image Segmentation | COCO | 193 MB | [.mar](https://torchserve.pytorch.org/mar_files/fcn_resnet_101.mar) | [persons.jpg](https://github.com/pytorch/serve/blob/master/examples/image_segmenter/persons.jpg?raw=true) |Eager|
| DeepLabV3 ResNet 101 | Image Segmentation | COCO | 217 MB | [.mar](https://torchserve.pytorch.org/mar_files/deeplabv3_resnet_101_eager.mar) | [persons.jpg](https://github.com/pytorch/serve/blob/master/examples/image_segmenter/persons.jpg) |Eager|
| BERT token classification | Token Classification | AG_NEWS | 384.7 MB | [.mar](https://torchserve.pytorch.org/mar_files/bert_token_classification_no_torchscript.mar) | [sample_text.txt](https://github.com/pytorch/serve/blob/master/examples/text_classification/sample_text.txt) |Eager|
| BERT sequence classification | Sequence Classification | AG_NEWS | 386.8 MB | [.mar](https://torchserve.pytorch.org/mar_files/bert_seqc_without_torchscript.mar) | [sample_text.txt](https://github.com/pytorch/serve/blob/master/examples/text_classification/sample_text.txt) |Eager|
| AlexNet Scripted | Image Classification | ImageNet | 216 MB | [.mar](https://torchserve.pytorch.org/mar_files/alexnet_scripted.mar) | [kitten.jpg](https://github.com/pytorch/serve/blob/master/examples/image_classifier/kitten.jpg?raw=true) |Torchscripted |
| Densenet161 Scripted| Image Classification | ImageNet | 105 MB | [.mar](https://torchserve.pytorch.org/mar_files/densenet161_scripted.mar) | [kitten.jpg](https://github.com/pytorch/serve/blob/master/examples/image_classifier/kitten.jpg?raw=true) |Torchscripted |
| Resnet18 Scripted| Image Classification | ImageNet | 42 MB | [.mar](https://torchserve.pytorch.org/mar_files/resnet-18_scripted.mar) | [kitten.jpg](https://github.com/pytorch/serve/blob/master/examples/image_classifier/kitten.jpg?raw=true) |Torchscripted |
Expand All @@ -30,5 +32,10 @@ To propose a model for inclusion, please submit a [pull request](https://github.
| Text classifier Scripted | Text Classification | AG_NEWS | 169 MB | [.mar](https://torchserve.pytorch.org/mar_files/my_text_classifier_scripted_v3.mar) | [sample_text.txt](https://github.com/pytorch/serve/blob/master/examples/text_classification/sample_text.txt) |Torchscripted |
| FCN ResNet 101 Scripted | Image Segmentation | COCO | 193 MB | [.mar](https://torchserve.pytorch.org/mar_files/fcn_resnet_101_scripted.mar) | [persons.jpg](https://github.com/pytorch/serve/blob/master/examples/image_segmenter/persons.jpg?raw=true) |Torchscripted |
| DeepLabV3 ResNet 101 Scripted | Image Segmentation | COCO | 217 MB | [.mar](https://torchserve.pytorch.org/mar_files/deeplabv3_resnet_101_scripted.mar) | [persons.jpg](https://github.com/pytorch/serve/blob/master/examples/image_segmenter/persons.jpg) |Torchscripted |
| MMF activity recognition | Activity Recognition | Charades | 549 MB | [.mar](https://torchserve.pytorch.org/mar_files/MMF_activity_recognition_v2.mar) | [372CC.mp4](https://mmfartifacts.s3-us-west-2.amazonaws.com/372CC.mp4) | Torchscripted |
| BERT sequence classification CPU | Sequence Classification | AG_NEWS | 386.9 MB | [.mar](https://torchserve.pytorch.org/mar_files/BERTSeqClassification_torchscript.mar) | [sample_text.txt](https://github.com/pytorch/serve/blob/master/examples/Huggingface_Transformers/Seq_classification_artifacts/sample_text.txt) |Torchscripted|
| BERT sequence classification mGPU | Sequence Classification | CAPTUM | 386.9 MB | [.mar](https://torchserve.pytorch.org/mar_files/BERTSeqClassification_mgpu.mar) | [sample_text_captum_input.txt](https://github.com/pytorch/serve/blob/master/examples/Huggingface_Transformers/Seq_classification_artifacts/sample_text_captum_input.txt) |Torchscripted|
| BERT sequence classification | Sequence Classification | AG_NEWS | 386.8 MB | [.mar](https://torchserve.pytorch.org/mar_files/BERTSeqClassification.mar) | [sample_text.txt](https://github.com/pytorch/serve/blob/master/examples/Huggingface_Transformers/Seq_classification_artifacts/sample_text.txt) |Torchscripted|
| dog breed classification | Image Classification | ImageNet | 1.1 KB | [.war](https://torchserve.s3.amazonaws.com/war_files/dog_breed_wf.war) | [kitten_small.jpg](https://raw.githubusercontent.com/pytorch/serve/master/docs/images/kitten_small.jpg) | Workflow |

Refer [example](https://github.com/pytorch/serve/tree/master/examples) for more details on above models.

0 comments on commit 338913e

Please sign in to comment.