Skip to content

Commit

Permalink
Merge pull request #113 from marieai/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
gregbugaj authored May 10, 2024
2 parents c6e871d + add035e commit c5c3947
Show file tree
Hide file tree
Showing 53 changed files with 3,737 additions and 802 deletions.
12 changes: 6 additions & 6 deletions Dockerfiles/gpu-310.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,11 @@ RUN python3 -m pip install git+https://github.com/facebookresearch/fvcore && \
RUN cd /tmp/ && \
python3 -m pip install --default-timeout=100 --compile --extra-index-url ${PIP_EXTRA_INDEX_URL} .


RUN git clone https://github.com/NVIDIA/apex && \
cd apex && git checkout 2386a912164b0c5cfcd8be7a2b890fbac5607c82 && \
sed -i '/check_cuda_torch_binary_vs_bare_metal(CUDA_HOME)/d' setup.py && \
python3 setup.py install --cpp_ext --cuda_ext
# No inference is being done currently
#RUN git clone https://github.com/NVIDIA/apex && \
# cd apex && git checkout 2386a912164b0c5cfcd8be7a2b890fbac5607c82 && \
# sed -i '/check_cuda_torch_binary_vs_bare_metal(CUDA_HOME)/d' setup.py && \
# python3 setup.py install --cpp_ext --cuda_ext

FROM nvcr.io/nvidia/cuda:${CUDA_VERSION}-cudnn8-devel-ubuntu22.04

Expand Down Expand Up @@ -196,4 +196,4 @@ RUN cd /marie && \

WORKDIR ${WORKDIR}
ENTRYPOINT ["marie"]
#ENTRYPOINT ["pip", "list"]
#ENTRYPOINT ["pip", "list"]
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ docker run --rm -it marieai/marie:3.0.19-cuda
## Run the server with custom entrypoint

```shell
docker run --rm -it --entrypoint /bin/bash marieai/marie:3.0.19-cuda
docker run --rm -it --entrypoint /bin/bash marieai/marie:3.0.30-cuda

marie server --start --uses sample.yml
```

## Telemetry
Expand Down
Loading

0 comments on commit c5c3947

Please sign in to comment.