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

Rm pip e #300

Merged
merged 8 commits into from
May 10, 2022
Merged

Rm pip e #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cb2341a
add entrypoint to all containers
jperez999 May 2, 2022
e217d5d
Merge branch 'main' of https://github.com/NVIDIA-Merlin/Merlin
jperez999 May 3, 2022
59fa46e
Merge branch 'main' of https://github.com/NVIDIA-Merlin/Merlin
jperez999 May 3, 2022
41bfd49
Merge branch 'main' of https://github.com/NVIDIA-Merlin/Merlin
jperez999 May 4, 2022
fa45e64
remove -e for pip installs
jperez999 May 5, 2022
f972188
Merge branch 'main' of https://github.com/NVIDIA-Merlin/Merlin
jperez999 May 5, 2022
e09c1d0
Merge branch 'main' of https://github.com/NVIDIA-Merlin/Merlin
jperez999 May 9, 2022
a2237e6
remove all -e pip installs
jperez999 May 10, 2022
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
2 changes: 1 addition & 1 deletion docker/inference/dockerfile.ctr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ ENV PYTHONPATH=$PYTHONPATH:/core

# Install Merlin Systems
RUN git clone https://github.com/NVIDIA-Merlin/systems.git /systems/ && \
cd /systems/ && git checkout ${SYSTEMS_VER} && pip install --no-deps -e .
cd /systems/ && git checkout ${SYSTEMS_VER} && pip install --no-deps .
ENV PYTHONPATH=$PYTHONPATH:/systems

# Install NVTabular
Expand Down
2 changes: 1 addition & 1 deletion docker/inference/dockerfile.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ ENV PYTHONPATH=$PYTHONPATH:/core

# Install Merlin Systems
RUN git clone https://github.com/NVIDIA-Merlin/systems.git /systems/ && \
cd /systems/ && git checkout ${SYSTEMS_VER} && pip install --no-deps -e .
cd /systems/ && git checkout ${SYSTEMS_VER} && pip install --no-deps .
ENV PYTHONPATH=$PYTHONPATH:/systems

# Install NVTabular
Expand Down
2 changes: 1 addition & 1 deletion docker/inference/dockerfile.torch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ ENV PYTHONPATH=$PYTHONPATH:/core

# Install Merlin Systems
RUN git clone https://github.com/NVIDIA-Merlin/systems.git /systems/ && \
cd /systems/ && git checkout ${SYSTEMS_VER} && pip install --no-deps -e .
cd /systems/ && git checkout ${SYSTEMS_VER} && pip install --no-deps .
ENV PYTHONPATH=$PYTHONPATH:/systems

# Install NVTabular
Expand Down
4 changes: 2 additions & 2 deletions docker/training/dockerfile.ctr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,12 @@ RUN pip install git+https://github.com/rapidsai/asvdb.git@main

# Install Merlin Core
RUN git clone https://github.com/NVIDIA-Merlin/core.git /core/ && \
cd /core/ && git checkout ${CORE_VER} && pip install --no-deps -e .
cd /core/ && git checkout ${CORE_VER} && pip install --no-deps .
ENV PYTHONPATH=$PYTHONPATH:/core

# Install Merlin Systems
RUN git clone https://github.com/NVIDIA-Merlin/systems.git /systems/ && \
cd /systems/ && git checkout ${SYSTEMS_VER} && pip install --no-deps -e .
cd /systems/ && git checkout ${SYSTEMS_VER} && pip install --no-deps .
ENV PYTHONPATH=$PYTHONPATH:/systems

# Install NVTabular
Expand Down
6 changes: 3 additions & 3 deletions docker/training/dockerfile.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,20 @@ RUN pip install git+https://github.com/rapidsai/asvdb.git@main

# Install Merlin Core
RUN git clone https://github.com/NVIDIA-Merlin/core.git /core/ && \
cd /core/ && git checkout ${CORE_VER} && pip install --no-deps -e .
cd /core/ && git checkout ${CORE_VER} && pip install --no-deps .
ENV PYTHONPATH=$PYTHONPATH:/core

# Install Merlin Systems
RUN git clone https://github.com/NVIDIA-Merlin/systems.git /systems/ && \
cd /systems/ && git checkout ${SYSTEMS_VER} && pip install --no-deps -e .
cd /systems/ && git checkout ${SYSTEMS_VER} && pip install --no-deps .
ENV PYTHONPATH=$PYTHONPATH:/systems

ARG INSTALL_NVT=true
# Install NVTabular
ENV PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION='python'
RUN if [ "$INSTALL_NVT" == "true" ]; then \
git clone https://github.com/NVIDIA-Merlin/NVTabular.git /nvtabular/ && \
cd /nvtabular/ && git checkout ${NVTAB_VER} && pip install --no-deps -e .; \
cd /nvtabular/ && git checkout ${NVTAB_VER} && pip install --no-deps .; \
fi
ENV PYTHONPATH=$PYTHONPATH:/nvtabular

Expand Down
2 changes: 1 addition & 1 deletion docker/training/dockerfile.torch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ ENV PYTHONPATH=$PYTHONPATH:/core

# Install Merlin Systems
RUN git clone https://github.com/NVIDIA-Merlin/systems.git /systems/ && \
cd /systems/ && git checkout ${SYSTEMS_VER} && pip install --no-deps -e .
cd /systems/ && git checkout ${SYSTEMS_VER} && pip install --no-deps .
ENV PYTHONPATH=$PYTHONPATH:/systems

# Install NVTabular
Expand Down