Skip to content

Removed temporary hack and install PyTorch 1.7.1 directly #1638

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

Merged
merged 1 commit into from
Feb 14, 2021
Merged

Removed temporary hack and install PyTorch 1.7.1 directly #1638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ parameters:
pytorch_stable_image:
type: string
# https://hub.docker.com/r/pytorch/pytorch/tags
default: "pytorch/pytorch:1.7.0-cuda11.0-cudnn8-runtime"
default: "pytorch/pytorch:1.7.1-cuda11.0-cudnn8-runtime"
pytorch_stable_image_devel:
type: string
# https://hub.docker.com/r/pytorch/pytorch/tags
default: "pytorch/pytorch:1.7.0-cuda11.0-cudnn8-devel"
default: "pytorch/pytorch:1.7.1-cuda11.0-cudnn8-devel"
workingdir:
type: string
default: "/tmp/ignite"
Expand All @@ -20,7 +20,7 @@ parameters:
default: false
build_docker_image_pytorch_version:
type: string
default: "1.7.0-cuda11.0-cudnn8"
default: "1.7.1-cuda11.0-cudnn8"
build_docker_image_hvd_version:
type: string
default: "v0.21.0"
Expand Down Expand Up @@ -195,7 +195,7 @@ jobs:
name: Install dependencies
command: |
conda --version
conda install -y pytorch torchvision cudatoolkit=10.1 -c pytorch
conda install -y pytorch torchvision cudatoolkit=11.0 -c pytorch
pip install -r requirements-dev.txt
pip install .

Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/trigger_circle_ci.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@ def assert_workflows_successful(pipeline_id, headers):

print(f"- should_publish_docker_images: {should_publish_docker_images}")
print(f"- Branch: {branch}")
if branch.startswith("refs/pull") and branch.endswith("/merge"):
branch = branch.replace("/merge", "/head")
print(f"Replaced /merge -> /head : {branch}")

headers = {"authorization": "Basic", "content-type": "application/json", "Circle-Token": os.environ["CIRCLE_TOKEN"]}

Expand Down
8 changes: 1 addition & 7 deletions docker/hvd/Dockerfile.hvd-apex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ ARG PTH_VERSION
# 1/Building apex with pytorch:*-devel
FROM pytorch/pytorch:${PTH_VERSION}-devel AS apex-hvd-builder

# Temporary hack to install pth 1.7.1
RUN conda install -y pytorch torchvision cudatoolkit=11.0 -c pytorch

ARG ARG_TORCH_CUDA_ARCH_LIST="6.0;6.1;6.2;7.0;7.5"
ARG ARG_TORCH_CUDA_ARCH_LIST="3.5 5.2 6.0 6.1 7.0+PTX 8.0"
ENV TORCH_CUDA_ARCH_LIST=$ARG_TORCH_CUDA_ARCH_LIST

# Install git
Expand Down Expand Up @@ -37,9 +34,6 @@ RUN apt-get update && apt-get install -y git && \
# Build runtime image
FROM pytorch/pytorch:${PTH_VERSION}-runtime

# Temporary hack to install pth 1.7.1
RUN conda install -y pytorch torchvision cudatoolkit=11.0 -c pytorch

# Apex
COPY --from=apex-hvd-builder /tmp/apex/apex-*.whl /tmp/apex/
RUN pip install --no-cache-dir /tmp/apex/apex-*.whl && \
Expand Down
6 changes: 0 additions & 6 deletions docker/hvd/Dockerfile.hvd-base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ ARG PTH_VERSION

FROM pytorch/pytorch:${PTH_VERSION}-devel as builder

# Temporary hack to install pth 1.7.1
RUN conda install -y pytorch torchvision cudatoolkit=11.0 -c pytorch

ARG HVD_VERSION

# Build Horovod
Expand All @@ -21,9 +18,6 @@ RUN apt-get update && apt-get install -y git && \
# Build runtime image
FROM pytorch/pytorch:${PTH_VERSION}-runtime

# Temporary hack to install pth 1.7.1
RUN conda install -y pytorch torchvision cudatoolkit=11.0 -c pytorch

# Install tzdata / git
RUN apt-get update && \
ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime && \
Expand Down
8 changes: 1 addition & 7 deletions docker/main/Dockerfile.apex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ ARG PTH_VERSION
# 1/Building apex with pytorch:*-devel
FROM pytorch/pytorch:${PTH_VERSION}-devel AS apex-builder

# Temporary hack to install pth 1.7.1
RUN conda install -y pytorch torchvision cudatoolkit=11.0 -c pytorch

ARG ARG_TORCH_CUDA_ARCH_LIST="6.0;6.1;6.2;7.0;7.5"
ARG ARG_TORCH_CUDA_ARCH_LIST="3.5 5.2 6.0 6.1 7.0+PTX 8.0"
ENV TORCH_CUDA_ARCH_LIST=$ARG_TORCH_CUDA_ARCH_LIST

# Install git
Expand All @@ -27,9 +24,6 @@ RUN echo "Setup NVIDIA Apex" && \
# 2/ Build the runtime image
FROM pytorch/pytorch:${PTH_VERSION}-runtime

# Temporary hack to install pth 1.7.1
RUN conda install -y pytorch torchvision cudatoolkit=11.0 -c pytorch

COPY --from=apex-builder /tmp/apex/apex-*.whl /tmp/apex/
RUN pip install --no-cache-dir /tmp/apex/apex-*.whl && \
rm -fr /tmp/apex
Expand Down
3 changes: 0 additions & 3 deletions docker/main/Dockerfile.base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ ARG PTH_VERSION

FROM pytorch/pytorch:${PTH_VERSION}-runtime

# Temporary hack to install pth 1.7.1
RUN conda install -y pytorch torchvision cudatoolkit=11.0 -c pytorch

# Install tzdata / git
RUN apt-get update && \
ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime && \
Expand Down
5 changes: 1 addition & 4 deletions docker/msdp/Dockerfile.msdp-apex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ ARG PTH_VERSION
# 1/Building apex with pytorch:*-devel
FROM pytorch/pytorch:${PTH_VERSION}-devel AS apex-msdp-builder

# Temporary hack to install pth 1.7.1
RUN conda install -y pytorch torchvision cudatoolkit=11.0 -c pytorch

ARG ARG_TORCH_CUDA_ARCH_LIST="6.0;6.1;6.2;7.0;7.5"
ARG ARG_TORCH_CUDA_ARCH_LIST="3.5 5.2 6.0 6.1 7.0+PTX 8.0"
ENV TORCH_CUDA_ARCH_LIST=$ARG_TORCH_CUDA_ARCH_LIST

# Install git
Expand Down