Commit Graph

86 Commits

Author SHA1 Message Date
Johannes M Dieterich
4b78ce1ba4 Clean cmake infrastructure up (#23527)
Summary:
Only check for cmake dependencies we directly depend on (e.g., hipsparse but not rocsparse)

Use cmake targets for ROCm where possible.

While there, update the docker CI build infrastructure to only pull in packages by name we directly depend on (anticipating the demise of, e.g., miopengemm). I do not anticipate a docker rebuild to be necessary at this stage as the changes are somewhat cosmetic.
Pull Request resolved: https://github.com/pytorch/pytorch/pull/23527

Differential Revision: D16561010

Pulled By: ezyang

fbshipit-source-id: 87cd9d8a15a74caf9baca85a3e840e9d19ad5d9f
2019-07-30 07:26:48 -07:00
Hong Xu
4dbeb87e52 PyTorch Dockerfile should update submodules recursively.
Summary: Pull Request resolved: https://github.com/pytorch/pytorch/pull/21216

Differential Revision: D15584114

Pulled By: bddppq

fbshipit-source-id: dbe0c3a54024a90fcd2c6689f8b9689ed0cd639b
2019-05-31 14:56:57 -07:00
Roman Dzhabarov
a640c81536 Add llvm8 installation step. (#20879)
Summary:
Add ability to build docker container with llvm8.

ezyang
Pull Request resolved: https://github.com/pytorch/pytorch/pull/20879

Differential Revision: D15497037

Pulled By: rdzhabarov

fbshipit-source-id: d673d1ddd4156c95516e61223b397c2f9bce1214
2019-05-24 10:51:53 -07:00
Hong Xu
4109ec1278 In Dockerfile, do not install unecessary packages, use conda to install ninja (saving one layer), and use "." to refer to WORKDIR to reduce redundancy. (#20881)
Summary:
- Do not install unecessary packages in the Docker image.
- In the Docker image, use conda to install ninja (saving one layer)
- When workdir is set, use "." to refer to it to reduce redundancy.
Pull Request resolved: https://github.com/pytorch/pytorch/pull/20881

Differential Revision: D15495769

Pulled By: ezyang

fbshipit-source-id: dab7df71ac107c85fb1447697e25978daffc7e0b
2019-05-24 09:32:40 -07:00
Junjie Bai
8c3a7bb57f Move librosa and psutil installation from CI script to docker images build script (#20299)
Summary:
pip install librosa randomly coredump, causes CI flakiness
Pull Request resolved: https://github.com/pytorch/pytorch/pull/20299

Differential Revision: D15276270

Pulled By: bddppq

fbshipit-source-id: 9105106f41aaacf620751290b016359ef7d665b3
2019-05-09 13:48:29 -07:00
Junjie Bai
cd72be20e0 Update ROCm 2.4 (#20253)
Summary:
xw285cornell
Pull Request resolved: https://github.com/pytorch/pytorch/pull/20253

Reviewed By: ezyang

Differential Revision: D15256826

Pulled By: bddppq

fbshipit-source-id: 405c21fc727d8145c4d3ca4fe8d84804569ebe53
2019-05-08 09:35:40 -07:00
Junjie Bai
f0d493d290 Add devtoolset 8 (gcc 8) + glibc 2.26 + centos 7.5 rocm docker image (#19767)
Summary:
xw285cornell

Will add py3.6-devtoolset8-glibc2.26-rocmrpm-centos7.5
Pull Request resolved: https://github.com/pytorch/pytorch/pull/19767

Differential Revision: D15094446

Pulled By: bddppq

fbshipit-source-id: 01a932d893cf4559f98612888308b3ad6900a038
2019-04-25 22:13:20 -07:00
Jiakai Liu
4afc067fed add Android NDK param to CI docker build script (#18782)
Summary:
Pull Request resolved: https://github.com/pytorch/pytorch/pull/18782
ghimport-source-id: 6c4bde7dc835b59209c1d5f7b243f00c9fe99de2

Stack from [ghstack](https://github.com/ezyang/ghstack):
* **#18782 [pytorch] add Android NDK param to CI docker build script**

Inspired by discussion: https://github.com/pytorch/pytorch/pull/16242

Reviewed By: dreiss

Differential Revision: D14739471

fbshipit-source-id: 0a081045186cbf359eb3cdadee722741cd8cd62f
2019-04-03 12:47:20 -07:00
Xiaodong Wang
48c5d0ae8c Install Thrust package and stop patching (#16911)
Summary:
Pull Request resolved: https://github.com/pytorch/pytorch/pull/16911

I think the Thrust package has want we want for /opt/rocm/include/thrust. We probably can stop patching it now.

Reviewed By: bddppq

Differential Revision: D14015177

fbshipit-source-id: 8d9128783a790c39083a1b8b4771c2c18bd67d46
2019-02-11 09:47:39 -08:00
Johannes M Dieterich
bca358ad02 Update CI to recently released ROCm 2.1 release (#16808)
Summary:
* we do not need EAP packages any longer as the antistatic feature is now in the release
* consistently install the rccl package
* Skip one unit test that has regressed with 2.1
* Follow-up PRs will use 2.1 features once deployed on CI
Pull Request resolved: https://github.com/pytorch/pytorch/pull/16808

Differential Revision: D13992645

Pulled By: bddppq

fbshipit-source-id: 37ca9a1f104bb140bd2b56d403e32f04c4fbf4f0
2019-02-07 15:12:18 -08:00
Natalia Gimelshein
aff0964ee7 update pytorch docker to cuda 10
Summary: Pull Request resolved: https://github.com/pytorch/pytorch/pull/16082

Differential Revision: D13699081

Pulled By: soumith

fbshipit-source-id: 86942e2c5595931384cf87dd1ef75936a4d74a57
2019-01-16 13:37:37 -08:00
Johannes M Dieterich
75a2d8e2de Upgrade CI to ROCm 1.9.2 (#14216)
Summary:
Drop custom hcc/hip as the 1.9.2 release should contain the relevant patches therein.

Most notable feature in 1.9.2 is mixed precision support in rocBLAS and MIOpen. These features will be enabled by subsequent PRs.

bddppq ezyang
Pull Request resolved: https://github.com/pytorch/pytorch/pull/14216

Differential Revision: D13354294

Pulled By: bddppq

fbshipit-source-id: 2541d4a196af21c9432c1aff7f6e65b572628028
2018-12-06 10:13:39 -08:00
Johannes M Dieterich
53a3c46950 Switch to packaged Thrust on Ubuntu, enable CentOS 7.5 as a CI target (#12899)
Summary:
1) Use the hip-thrust version of Thrust as opposed to the GH master. (ROCm 267)

2) CentOS 7.5 docker (ROCm 279)

* Always install the libraries at docker creation for ubuntu.
* Add Dockerfile for CentOS ROCm
* Enable the centos build
* Source devtoolset in bashrc
* Set locales correctly depending on whether we are on Ubuntu or CentOS
* Install a newer cmake for CentOS
* Checkout thrust as there is no package for CentOS yet.

PyTorch/Caffe2 on ROCm passed tests: https://github.com/ROCmSoftwarePlatform/pytorch/pull/280

For attention: bddppq ezyang

Docker rebuild for Ubuntu not urgent (getting rid of Thrust checkout and package install is mainly cosmetic). If docker for CentOS 7.5 is wanted, build is necessary. Build of PyTorch tested by me in CentOS docker. PyTorch unit tests work mostly, however, a test in test_jit causes a python recursion error that seems to be due to the python2 on CentOS as we haven't ever seen this on Ubuntu - hence please do not enable unit tests.
Pull Request resolved: https://github.com/pytorch/pytorch/pull/12899

Differential Revision: D13029424

Pulled By: bddppq

fbshipit-source-id: 1ca8f4337ec6a603f2742fc81046d5b8f8717c76
2018-11-12 14:39:54 -08:00
Johannes M Dieterich
957142a4fe switch ROCm CI targets to white rabbit release (#12577)
Summary:
* switches docker files over to white rabbit release - removed custom package installs
* skips five tests that regressed in that release
* fixes some case-sensitivity issues in ROCm supplied cmake files by sed'ing them in the docker
* includes first changes to the infrastructure to support upcoming hip-clang compiler
* prints ROCm library versions as part of the build (as discussed w/ ezyang )
* explicitly searches for miopengemm
* installs the new hip-thrust package to be able to remove the explicit Thrust checkout in a future revision
Pull Request resolved: https://github.com/pytorch/pytorch/pull/12577

Differential Revision: D10350165

Pulled By: bddppq

fbshipit-source-id: 60f9c9caf04a48cfa90f4c37e242d944a175ab31
2018-10-11 18:03:11 -07:00
Junjie Bai
5973312abc Add clang 6 docker images
Summary: Pull Request resolved: https://github.com/pytorch/pytorch/pull/12581

Differential Revision: D10349785

Pulled By: bddppq

fbshipit-source-id: 638641d369be0898dd6232737ebaa9d9a8c2e557
2018-10-11 16:48:13 -07:00
Junjie Bai
1b59cf8b51 Add support to use llvm 7 in CI
Summary: Pull Request resolved: https://github.com/pytorch/pytorch/pull/12182

Differential Revision: D10129630

Pulled By: bddppq

fbshipit-source-id: f0217336474b807f03f84a4b8052ce92a6e3564b
2018-10-01 13:39:50 -07:00
Edward Yang
b663b7ce7e Update ROCm Docker image with latest AMD debians (#11507)
Summary:
Building at https://ci.pytorch.org/jenkins/job/caffe2-docker-trigger/194/

Signed-off-by: Edward Z. Yang <ezyang@fb.com>
Pull Request resolved: https://github.com/pytorch/pytorch/pull/11507

Differential Revision: D9772474

Pulled By: ezyang

fbshipit-source-id: ab00f05744547dc7ec9f97511e2c8495ac282fac
2018-09-12 15:29:21 -07:00
iotamudelta
9de2085806 Use custom hcc/HIP, purge hcSPARSE (#11198)
Summary:
* purge hcSPARSE now that rocSPARSE is available
* integrate a custom hcc and HIP
* hcc brings two important compiler fixes (fixes hundreds of unit tests)
* HIP brings a smart dispatcher that allows us to avoid a lot of static_casts (we haven't yet removed the automatic static_casts but this catches some occurrences the script did not catch)
* mark 5 unit tests skipping that have regressed w/ the new hcc (we don't know yet what is at fault)
* optimize bitonic sort - the comparator is always an empty struct - therefore passing it by value saves at least 3 bytes. It also removes an ambiguity around passing references to `__global__` functions
Pull Request resolved: https://github.com/pytorch/pytorch/pull/11198

Differential Revision: D9652340

Pulled By: ezyang

fbshipit-source-id: f5af1d891189da820e3d13b7bed91a7a43154690
2018-09-06 19:38:07 -07:00
iotamudelta
33c7cc13ca improve docker packages, fix bugs, enable tests, enable FFT (#10893)
Summary:
* improve docker packages (install OpenBLAS to have at-compile-time LAPACK functionality w/ optimizations for both Intel and AMD CPUs)
* integrate rocFFT (i.e., enable Fourier functionality)
* fix bugs in ROCm caused by wrong warp size
* enable more test sets, skip the tests that don't work on ROCm yet
* don't disable asserts any longer in hipification
* small improvements
Pull Request resolved: https://github.com/pytorch/pytorch/pull/10893

Differential Revision: D9615053

Pulled By: ezyang

fbshipit-source-id: 864b4d27bf089421f7dfd8065e5017f9ea2f7b3b
2018-09-02 08:54:42 -07:00
Jorghi12
b0b5139149 Set the BUILD_ENVIRONMENT variable before installing sccache. (#10640)
Summary:
Set the build environment before installing sccache in order to make sure the docker images have the links set up.
Pull Request resolved: https://github.com/pytorch/pytorch/pull/10640

Reviewed By: yf225

Differential Revision: D9399593

Pulled By: Jorghi12

fbshipit-source-id: a062fed8b7e83460fe9d50a7a27c0f20bcd766c4
2018-08-21 09:40:41 -07:00
iotamudelta
75651d5b58 improve use of ROCm libraries, enable more tests, small fixes (#10406)
Summary:
* some small leftovers from the last PR review
* enable more unit test sets for CI
* replace use of hcRNG w/ rocRAND (docker image was already updated w/ newer rocRAND)
* use rocBLAS instead of hipBLAS to allow convergence w/ Caffe2
* use strided_batched gemm interface also from the batched internal interface
* re-enable Dropout.cu as we now have philox w/ rocRAND
Pull Request resolved: https://github.com/pytorch/pytorch/pull/10406

Reviewed By: Jorghi12

Differential Revision: D9277093

Pulled By: ezyang

fbshipit-source-id: 7ef2f6fe4ead77e501ed7aea5c3743afe2466ca2
2018-08-13 11:39:43 -07:00
Thiago Crepaldi
7d6d7bef6a Enable docker image build for PyTorch using specific python version (#10317)
Summary:
Current Dockerfile builds pytorch using default python within miniconda, which happens to be Python 3.6

This patch allows users to specify which python should be installed in the default miniconda environment used by the pytorch dockerfile. I have tested the build for python 2.7, 3.5, 3.6 and 3.7. Python 2.7 required typing and cython
Pull Request resolved: https://github.com/pytorch/pytorch/pull/10317

Differential Revision: D9204401

Pulled By: ezyang

fbshipit-source-id: 11355cab3bf448bbe8369a2ed1de0d409c9a2d6e
2018-08-07 16:13:33 -07:00
Jorghi12
20a549b101 Start using a newer version of rocRand that's PyTorch compatible.
Summary: Pull Request resolved: https://github.com/pytorch/pytorch/pull/10280

Differential Revision: D9196349

Pulled By: Jorghi12

fbshipit-source-id: 4147f2e6e3fdd641b026f3761d684437591405be
2018-08-07 11:09:59 -07:00
iotamudelta
cfa05706ef ROCm contributions week 29 (#9653)
Summary:
In this changeset:
* improvements to `hipify-python.py`
* marking unit tests broken for ROCm
* reducing the number of jobs for the built to avoid out of memory issues
* switch to Thrust/cub-hip master for the CI
Pull Request resolved: https://github.com/pytorch/pytorch/pull/9653

Differential Revision: D9117791

Pulled By: ezyang

fbshipit-source-id: a6c3c7b81f2bda9825974bf9bf89a97767244352
2018-08-02 09:09:00 -07:00
Edward Yang
b84b78a69d Fix the ROCM build, and enable sccache for it
Summary: Pull Request resolved: https://github.com/pytorch/pytorch/pull/9841

Differential Revision: D9008030

Pulled By: ezyang

fbshipit-source-id: 51cac3c75fc52658b22a10a6bf8a479bcf803fb2
2018-07-25 17:55:47 -07:00
Edward Yang
4b0098f3ae Add --allow-change-held-packages to make nccl2 install in docker work (#9828)
Summary:
This was used to build Caffe2 Docker version 170.

Signed-off-by: Edward Z. Yang <ezyang@fb.com>
Pull Request resolved: https://github.com/pytorch/pytorch/pull/9828

Differential Revision: D8997808

Pulled By: ezyang

fbshipit-source-id: f48938b2b71bc86578c9d9b46c281ed05478724e
2018-07-25 11:56:40 -07:00
Jesse Hellemn
374fee4804 Minor cleanup to scripts
Summary: Pull Request resolved: https://github.com/pytorch/pytorch/pull/9354

Reviewed By: orionr

Differential Revision: D8810415

Pulled By: pjh5

fbshipit-source-id: 792b0dc6f6a4fabde38e2ad4475963526204914c
2018-07-12 10:54:44 -07:00
Edward Z. Yang
117b77e574
Install vim by default on all Caffe2 docker images. (#8731)
Signed-off-by: Edward Z. Yang <ezyang@fb.com>
2018-06-21 11:10:32 -04:00
Paul Jesse Hellemn
c457fc994d
Adding pyyaml to Ubuntu and Centos docker images (#8490) 2018-06-15 13:55:48 -07:00
Edward Z. Yang
829bcf3e9b
Don't apply PR 12 to Thrust anymore. (#8542)
Signed-off-by: Edward Z. Yang <ezyang@fb.com>
2018-06-14 21:39:21 -04:00
Edward Z. Yang
09896d1e77
Allow nccl downgrades (#8429)
* Revert "Stop pinning nccl version. (#8421)"

This reverts commit 3cb45bafc8.

* Allow downgrades from libnccl2 install.

Signed-off-by: Edward Z. Yang <ezyang@fb.com>
2018-06-13 13:56:34 -04:00
Edward Z. Yang
3cb45bafc8 Stop pinning nccl version. (#8421)
Signed-off-by: Edward Z. Yang <ezyang@fb.com>
2018-06-13 10:53:56 -04:00
Jorghi12
81b92f7515 Get ROCm building again on master (#8343)
Billing of changes:

- New Jenkins script for building on rocm. For now it is a bit hacked together, but we can improve it once CI is running
- New ROCM docker image for nightly HIP, and also some legacy packages that we need temporarily
- New enabled config py2-clang3.8-rocmnightly-ubuntu16.04-build based off of the existing Caffe2 image (not built yet)
- A big pile of cmake fixes, mostly to turn bits on/off when ROCM build is involved
- Switch from hiprng to hcrng
- Apply some patches directly in code, eliminating the patches
- Use __hdiv instead of hdiv, it's more portable
- THCNumerics<T>::gt doesn't work in HIP, so simulate it with sub
- Add a few more overloads HIP needs
- Turn off use of hcc to link (we plan to turn this back on to get tests running)
- Search for hiprand, hiprng, hipblas, hipsparse
- Better Python 2 portability
2018-06-12 23:05:21 -04:00
Guo Tang
bae82f726d fix caffe2 docker build (#7411) 2018-06-05 22:51:43 -04:00
bddppq
8f6f43f5cf
Fix rocm docker images environment variables round 2 (#7626) 2018-05-16 14:40:07 -07:00
bddppq
ed458fd311
Fix environment variables in rocm docker images (#7598)
* Fix environment variables in rocm docker images

* Add to .bashrc as well
2018-05-15 21:51:02 -07:00
Will Feng
4af63916cd
Set up Caffe2 CUDA builds to use sccache (#7547)
* Set up Caffe2 CUDA builds to use sccache

* comment fix
2018-05-14 11:15:58 -07:00
Soumith Chintala
ac52f1186a [minor] change dockerfile to point to pytorch channel (#6960) 2018-05-12 23:43:09 -04:00
Paul Jesse Hellemn
78c3d8c164
Adding yaml to docker images for Aten builds (#7430)
* Adding yaml to docker images for Aten builds

* Removing pip install of yaml due to permissions
2018-05-10 09:07:21 -07:00
bddppq
f598ef9102
Add CI docker image for rocm builds (#7349) 2018-05-08 13:41:27 -07:00
Paul Jesse Hellemn
1ea3f79569
Location of pip package changed (#7100)
* Location of pip package changed

* They moved setuptools two days ago too
2018-04-30 14:35:17 -07:00
Yinghai Lu
1110dd1f8f
Add mock to conda (#6460) 2018-04-09 23:29:22 -07:00
Yinghai Lu
73a23b492c
Add mock python module for testing (#6387) 2018-04-09 09:12:10 -07:00
Paul Jesse Hellemn
38b995a13b
Fixing conda test builds (#6261)
* Moving conda test package installs into docker image

* Small nits

* Onnx setup.py still needs PROTOBUF_INCDIR passed in
2018-04-05 13:27:43 -07:00
Sebastian Meßmer
92e7f627cd Add typing dependency to caffe2 CI (#6195)
This is needed to run mypy on CI
2018-04-04 15:48:02 -04:00
Edward Z. Yang
90afedb6e2 Merge caffe2 with pytorch. 2018-03-30 10:29:50 -07:00
Orion Reblitz-Richardson
368f96acde Remove tutorials from main repository.
* They now live at https://github.com/caffe2/tutorials
* Updating caffe2.ai website to match in a separate commit.
2018-03-29 09:31:09 -07:00
Edward Z. Yang
3c577fccf3 Move Caffe2 Dockerfiles to docker/caffe2 (#2430)
Signed-off-by: Edward Z. Yang <ezyang@fb.com>
2018-03-27 15:51:50 -07:00
Edward Z. Yang
64e94f02b7 Move Dockerfile to docker/pytorch (#6009)
Signed-off-by: Edward Z. Yang <ezyang@fb.com>
2018-03-26 17:26:34 -04:00
Paul Jesse Hellemn
3f667176cc Fixing the conda-gcc-cuda builds (#2305)
* Fixing mistakes in earlier PR

* Allowing cuda builds of different gccs
2018-03-19 09:32:32 -07:00