Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull request/1065 #1068

Merged
merged 9 commits into from
Sep 21, 2023
Merged

Pull request/1065 #1068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
625f111
Remove hugectr inference and try other test runners
EmmaQiaoCh Sep 18, 2023
64765ca
Add hps_torch installation in merlin-pytorch
EmmaQiaoCh Sep 18, 2023
dc697db
Remove the uncompatable gmock and gtest installed by triton
EmmaQiaoCh Sep 18, 2023
59390d5
Merge branch 'main' into emma/update_for_inference
jperez999 Sep 19, 2023
1525a72
Merge branch 'main' into pull-request/1065
jperez999 Sep 19, 2023
d9a89a9
Merge branch 'main' into pull-request/1065
jperez999 Sep 20, 2023
21efb87
Merge branch 'main' into pull-request/1065
jperez999 Sep 20, 2023
4cf6cfb
Merge branch 'main' into pull-request/1065
jperez999 Sep 20, 2023
b8a1082
Merge branch 'main' into pull-request/1065
jperez999 Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions docker/dockerfile.ctr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,26 +78,6 @@ RUN if [[ "${HUGECTR_DEV_MODE}" == "false" ]]; then \
; fi

ENV PYTHONPATH=${PYTHONPATH}:${HUGECTR_HOME}/lib
ARG _HUGECTR_BACKEND_REPO="github.com/triton-inference-server/hugectr_backend.git"
ARG TRITON_VERSION
# Install Triton inference backend.
RUN if [ "${HUGECTR_DEV_MODE}" == "false" ]; then \
git clone --branch ${HUGECTR_BACKEND_VER} --depth 1 https://${_CI_JOB_TOKEN}${_HUGECTR_BACKEND_REPO} /repos/hugectr_triton_backend && \
mkdir /repos/hugectr_triton_backend/build && \
cd /repos/hugectr_triton_backend/build && \
cmake \
-DCMAKE_INSTALL_PREFIX:PATH=${HUGECTR_HOME} \
-DTRITON_COMMON_REPO_TAG="r${TRITON_VERSION}" \
-DTRITON_CORE_REPO_TAG="r${TRITON_VERSION}" \
-DTRITON_BACKEND_REPO_TAG="r${TRITON_VERSION}" .. && \
make -j$(nproc) && \
make install && \
cd ../.. && \
rm -rf hugectr_triton_backend && \
chmod +x ${HUGECTR_HOME}/lib/*.so ${HUGECTR_HOME}/backends/hugectr/*.so && \
rm -rf /repos \
; fi
RUN ln -s ${HUGECTR_HOME}/backends/hugectr /opt/tritonserver/backends/hugectr

# Clean up
RUN rm -rf /usr/local/share/jupyter/lab/staging/node_modules/marked
Expand Down
18 changes: 18 additions & 0 deletions docker/dockerfile.torch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,24 @@ COPY --chown=1000:1000 --from=dlfw /usr/local/lib/python${PYTHON_VERSION}/dist-p
COPY --chown=1000:1000 --from=dlfw /usr/local/lib/python${PYTHON_VERSION}/dist-packages/numpy-*.dist-info /usr/local/lib/python${PYTHON_VERSION}/dist-packages/numpy.dist-info/
COPY --chown=1000:1000 --from=dlfw /usr/local/lib/python${PYTHON_VERSION}/dist-packages/torch-*.egg-info /usr/local/lib/python${PYTHON_VERSION}/dist-packages/torch.egg-info/

# Argumeints "_XXXX" are only valid when $HUGECTR_DEV_MODE==false
# Install hps_torch in merlin-pytorch
ARG HUGECTR_DEV_MODE=false
ARG _HUGECTR_REPO="github.com/NVIDIA-Merlin/HugeCTR.git"
ARG _CI_JOB_TOKEN=""
ARG HUGECTR_VER=main

RUN if [ "$HUGECTR_DEV_MODE" == "false" ]; then \
export HUGECTR_HOME=/usr/local/hugectr && \
rm -rf ${HUGECTR_HOME}/lib/libgmock* ${HUGECTR_HOME}/lib/pkgconfig/gmock* ${HUGECTR_HOME}/include/gmock && \
rm -rf ${HUGECTR_HOME}/lib/libgtest* ${HUGECTR_HOME}/lib/pkgconfig/gtest* ${HUGECTR_HOME}/include/gtest && \
git clone --branch ${HUGECTR_VER} --depth 1 --recurse-submodules --shallow-submodules https://${_CI_JOB_TOKEN}${_HUGECTR_REPO} /hugectr && \
pushd /hugectr/hps_torch/ && \
pip --no-cache-dir install ninja && \
TORCH_CUDA_ARCH_LIST="7.0 7.5 8.0 9.0" python setup.py install && \
popd && \
rm -rf /hugectr \
; fi

# Add all torch libraries to /usr/local
RUN ln -s /opt/tritonserver/backends/pytorch/* /usr/local/lib/
Expand Down
Loading