Skip to content

Conda build #38796

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

Closed
wants to merge 16 commits into from
Closed

Conda build #38796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
8a57fc4
add a pytorch-linux-bionic-py3.7-conda image for conda compilers
mattip May 20, 2020
4c7188d
trigger docker build
ezyang Jul 19, 2020
83f69af
Revert "trigger docker build"
ezyang Jul 19, 2020
e007d83
Update to new tag
ezyang Jul 19, 2020
4b4d9b1
fixup
ezyang Jul 19, 2020
14b8f86
since image is built, add build and test runs
mattip Jul 20, 2020
755bffe
Revert "Revert "trigger docker build""
ezyang Jul 20, 2020
8fbab19
Pin matplotlib, and increase verbosity
ezyang Jul 20, 2020
e581ccc
Revert "Revert "Revert "trigger docker build"""
mattip Jul 20, 2020
585bd42
update tag to '8bdba785b1eac4d297d5f5930f979518012a56e0'
mattip Jul 20, 2020
74d1fd2
Revert "update tag to '8bdba785b1eac4d297d5f5930f979518012a56e0'"
ezyang Jul 20, 2020
0c60ecf
update tag
ezyang Jul 20, 2020
f53e8e3
Revert "update tag"
ezyang Jul 22, 2020
8e6931c
Revert "Revert "update tag to '8bdba785b1eac4d297d5f5930f979518012a56…
ezyang Jul 22, 2020
2903552
Merge remote-tracking branch 'origin/master' into conda-build
ezyang Jul 22, 2020
e7a6aa3
regen
ezyang Jul 22, 2020
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
3 changes: 3 additions & 0 deletions .circleci/cimodel/data/pytorch_build_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@
("gcc", [
("9", [XImportant("3.8")]),
]),
("conda", [
("", [XImportant("3.7")]),
]),
]),
]

Expand Down
1 change: 1 addition & 0 deletions .circleci/cimodel/data/simple/docker_definitions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"pytorch-linux-xenial-py3.6-gcc7",
"pytorch-linux-xenial-rocm3.3-py3.6",
"pytorch-linux-xenial-rocm3.5.1-py3.6",
"pytorch-linux-bionic-py3.7-conda",
]


Expand Down
2 changes: 1 addition & 1 deletion .circleci/cimodel/data/simple/util/docker_constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# ARE YOU EDITING THIS NUMBER? MAKE SURE YOU READ THE GUIDANCE AT THE
# TOP OF .circleci/config.yml
DOCKER_IMAGE_TAG = "ab1632df-fa59-40e6-8c23-98e004f61148"
DOCKER_IMAGE_TAG = "8bdba785b1eac4d297d5f5930f979518012a56e0"


def gen_docker_image_path(container_type, container_tag=DOCKER_IMAGE_TAG):
Expand Down
146 changes: 80 additions & 66 deletions .circleci/config.yml
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions .circleci/docker/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,14 @@ case "$image" in
VISION=yes
ROCM_VERSION=3.5.1
;;
pytorch-linux-bionic-py3.7-conda)
ANACONDA_PYTHON_VERSION=3.7
PROTOBUF=yes
DB=yes
CONDA_COMPILER=yes
CUDA_VERSION=10.2
;;

esac

# Set Jenkins UID and GID if running Jenkins
Expand Down
10 changes: 9 additions & 1 deletion .circleci/docker/common/install_conda.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,13 @@ if [ -n "$ANACONDA_PYTHON_VERSION" ]; then
conda_install magma-cuda102 -c pytorch
fi

if [[ "$CONDA_COMPILER" != "" ]]; then
if [[ "$CUDA_VERSION" != "" ]]; then
nvcc="nvcc_linux-64=${CUDA_VERSION}"
fi
conda_install compilers ${nvcc}
fi

# TODO: This isn't working atm
conda_install nnpack -c killeent

Expand All @@ -90,7 +97,8 @@ if [ -n "$ANACONDA_PYTHON_VERSION" ]; then
# scikit-learn is pinned because of
# https://github.com/scikit-learn/scikit-learn/issues/14485 (affects gcc 5.5
# only)
as_jenkins pip install --progress-bar off pytest scipy==1.1.0 scikit-learn==0.20.3 scikit-image librosa>=0.6.2 psutil numba==0.46.0 llvmlite==0.30.0
# matplotlib is pinned because of https://github.com/pytorch/pytorch/issues/41680
as_jenkins pip install -v --progress-bar off pytest scipy==1.1.0 scikit-learn==0.20.3 scikit-image librosa>=0.6.2 psutil numba==0.46.0 llvmlite==0.30.0 matplotlib==3.2.2

popd
fi
12 changes: 6 additions & 6 deletions .circleci/verbatim-sources/job-specs/job-specs-custom.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
environment:
BUILD_ENVIRONMENT: pytorch-python-doc-push
# TODO: stop hardcoding this
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3.6-gcc5.4:ab1632df-fa59-40e6-8c23-98e004f61148"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3.6-gcc5.4:8bdba785b1eac4d297d5f5930f979518012a56e0"
resource_class: large
machine:
image: ubuntu-1604:201903-01
Expand Down Expand Up @@ -52,7 +52,7 @@
pytorch_cpp_doc_push:
environment:
BUILD_ENVIRONMENT: pytorch-cpp-doc-push
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3.6-gcc5.4:ab1632df-fa59-40e6-8c23-98e004f61148"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3.6-gcc5.4:8bdba785b1eac4d297d5f5930f979518012a56e0"
resource_class: large
machine:
image: ubuntu-1604:201903-01
Expand Down Expand Up @@ -152,7 +152,7 @@
pytorch_android_gradle_build:
environment:
BUILD_ENVIRONMENT: pytorch-linux-xenial-py3-clang5-android-ndk-r19c-gradle-build
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-android-ndk-r19c:ab1632df-fa59-40e6-8c23-98e004f61148"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-android-ndk-r19c:8bdba785b1eac4d297d5f5930f979518012a56e0"
PYTHON_VERSION: "3.6"
resource_class: large
machine:
Expand Down Expand Up @@ -240,7 +240,7 @@
pytorch_android_publish_snapshot:
environment:
BUILD_ENVIRONMENT: pytorch-linux-xenial-py3-clang5-android-ndk-r19c-gradle-publish-snapshot
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-android-ndk-r19c:ab1632df-fa59-40e6-8c23-98e004f61148"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-android-ndk-r19c:8bdba785b1eac4d297d5f5930f979518012a56e0"
PYTHON_VERSION: "3.6"
resource_class: large
machine:
Expand Down Expand Up @@ -276,7 +276,7 @@
pytorch_android_gradle_build-x86_32:
environment:
BUILD_ENVIRONMENT: pytorch-linux-xenial-py3-clang5-android-ndk-r19c-gradle-build-only-x86_32
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-android-ndk-r19c:ab1632df-fa59-40e6-8c23-98e004f61148"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3-clang5-android-ndk-r19c:8bdba785b1eac4d297d5f5930f979518012a56e0"
PYTHON_VERSION: "3.6"
resource_class: large
machine:
Expand Down Expand Up @@ -554,7 +554,7 @@
environment:
BUILD_ENVIRONMENT: pytorch-doc-test
# TODO: stop hardcoding this
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3.6-gcc5.4:ab1632df-fa59-40e6-8c23-98e004f61148"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/pytorch/pytorch-linux-xenial-py3.6-gcc5.4:8bdba785b1eac4d297d5f5930f979518012a56e0"
resource_class: medium
machine:
image: ubuntu-1604:201903-01
Expand Down
2 changes: 1 addition & 1 deletion .circleci/verbatim-sources/workflows/workflows-ecr-gc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
- ecr_gc_job:
name: ecr_gc_job_for_pytorch
project: pytorch
tags_to_keep: "271,262,256,278,282,291,300,323,327,347,389,401,402,403,405,a8006f9a-272d-4478-b137-d121c6f05c83,6e7b11da-a919-49e5-b2ba-da66e3d4bb0a,f990c76a-a798-42bb-852f-5be5006f8026,e43973a9-9d5a-4138-9181-a08a0fc55e2f,8fcf46ef-4a34-480b-a8ee-b0a30a4d3e59,9a3986fa-7ce7-4a36-a001-3c9bef9892e2,1bc00f11-e0f3-4e5c-859f-15937dd938cd,209062ef-ab58-422a-b295-36c4eed6e906,be76e8fd-44e2-484d-b090-07e0cc3a56f0,fff7795428560442086f7b2bb6004b65245dc11a,ab1632df-fa59-40e6-8c23-98e004f61148"
tags_to_keep: "271,262,256,278,282,291,300,323,327,347,389,401,402,403,405,a8006f9a-272d-4478-b137-d121c6f05c83,6e7b11da-a919-49e5-b2ba-da66e3d4bb0a,f990c76a-a798-42bb-852f-5be5006f8026,e43973a9-9d5a-4138-9181-a08a0fc55e2f,8fcf46ef-4a34-480b-a8ee-b0a30a4d3e59,9a3986fa-7ce7-4a36-a001-3c9bef9892e2,1bc00f11-e0f3-4e5c-859f-15937dd938cd,209062ef-ab58-422a-b295-36c4eed6e906,be76e8fd-44e2-484d-b090-07e0cc3a56f0,fff7795428560442086f7b2bb6004b65245dc11a,ab1632df-fa59-40e6-8c23-98e004f61148,c966facd-bcb3-4b37-ba7d-f9b995ad78d9,8bdba785b1eac4d297d5f5930f979518012a56e0"
requires:
- docker_for_ecr_gc_build_job
- ecr_gc_job:
Expand Down