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

Jump to bottom

conda's environment.yml: install pytorch gpu by pegging cudatoolkit to <= v11.5 #540

Closed
wants to merge 43 commits into from
Closed

conda's environment.yml: install pytorch gpu by pegging cudatoolkit to <= v11.5 #540

wants to merge 43 commits into from

Conversation

remtav
Copy link
Contributor

@remtav remtav commented May 25, 2022

Fixes #529

@remtav remtav changed the title conda's environment.yml: peg cudatoolkit to <= v11.5 conda's environment.yml: install pytorch gpu by pegging cudatoolkit to <= v11.5 May 25, 2022
@ashnair1
Copy link
Collaborator

The docs issue was solved by a755bb6. Could you try rebasing from main?

@adamjstewart
Copy link
Collaborator

This hack will need to be updated with every new cudatoolkit release. Does switching from pytorch to pytorch-gpu also solve the issue?

@ashnair1
Copy link
Collaborator

ashnair1 commented May 25, 2022 •
edited

Switching to pytorch-gpu will get us back to #293. macOS and windows won't be supported.

@ashnair1
Copy link
Collaborator

Also this isn't really required for every cudatoolkit release. Just the latest cudatoolkit that pytorch is compiled with. Hence why 11.5 is used instead of 11.7

adamjstewart and others added 24 commits May 26, 2022 08:50
@adamjstewart @remtav
Remove type ignores for PyTorch (microsoft#460)
8a05ab1 
* Remove type ignores for PyTorch

* Mypy fixes for pytest MonkeyPatch

* Black

* Ignore Identity

* Generic fixes

* Remove unused Generator import

* More fixes

* Fix remaining mypy errors

* More typing cleanups

* typing.OrderedDict isn't available until Python 3.7.2+

* Need Python 3.9 to build docs for fancy OrderedDict

* Fix Python 3.8 and earlier support

* Fix BigEarthNet tests

* Fix bug in ETCI 2021 tests

* Remove unused flake8 ignore

* More robust and well-documented trainer steps

* Many functions don't actually use batch_idx

* Store cast hparams in trainers
@ashnair1 @remtav
Update hook (microsoft#464)
728a7a1
@ashnair1 @remtav
SpaceNet2 update (microsoft#469)
88848ad
@adamjstewart @remtav
VectorDataset: fix issue with empty query (microsoft#467)
ad85c85 
* VectorDataset: fix issue with empty query

* isort
@adamjstewart @remtav
Fix integration tests on macOS/Windows (microsoft#468)
8c41555
@adamjstewart @remtav
gitattributes: allow diff of test data (microsoft#470)
ccddefb 
* gitattributes: allow diff of data.py files

* Allow diffs of all text files, not just data.py
@adamjstewart @remtav
dos2unix: zuericrop data.py
3389489
@adamjstewart @remtav
Update train.py integration tests (microsoft#472)
944aed7
@adamjstewart @remtav
Chesapeake: skip all tests if zipfile_deflate64 missing (microsoft#471)
17d9b4a
@adamjstewart @remtav
Revert "Fix PyTorch + setuptools bug (microsoft#357)" (microsoft#473)
fa2767a 
This reverts commit ff28a3b.
@adamjstewart @remtav
setup.cfg: no longer need hack for pre-release black (microsoft#474)
ff52c84
@adamjstewart @remtav
CI: h5py now provides Windows wheels (microsoft#475)
2064311
@nilsleh @calebrob6
@adamjstewart @remtav
Add own plot method and data.py to CBF (microsoft#410)
c8dac17 
* add own plot method and data.py

* clean up data.py

* version changed instead of added

* Update cbf.py

* Any instead of Tensor

* Fix VectorDataset tests

* Plot method in base class no longer needed/tested

* Removing unused imports

* Remove type ignore from openbuildings

* Fix tests

* Black formatting

Co-authored-by: Caleb Robinson <calebrob6@gmail.com>
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
@ashnair1 @remtav
Add SpaceNet3 (microsoft#480)
9039aa8 
* Add SpaceNet3

* Fixes

* Replace itertools.product with zip

* Update docstring

* Remove unused options
@adamjstewart @remtav
Drop Python 3.6 support (microsoft#482)
27393da 
* Drop Python 3.6 support

* pandas 0.23.2+ required for Python 3.7+ support

* Update environment.yml too
@adamjstewart @remtav
Fix PyTorch Lightning 1.6 type hints (microsoft#487)
4ea3415
@ashnair1 @remtav
Update hooks (microsoft#489)
3d4f42c
@adamjstewart @remtav
Upgrade all files to Python 3.7+ syntax (microsoft#486)
f72f4fe 
* Upgrade all files to Python 3.7+ syntax

* Update contributing guide

* Move pyupgrade to correct section
@adamjstewart @remtav
RasterDataset: remove plot method (microsoft#476)
42f044d 
* RasterDataset: remove plot method

* Remove RasterDataset plot tests

* Remove plotting tests for landsat/naip
@ashnair1 @remtav
Correct tag for pyupgrade hook (microsoft#490)
1d212c3
@nilsleh @remtav
remove random (microsoft#491)
55cd318
@nilsleh @remtav
Add Swedish Forest Damage dataset (microsoft#461)
67c7f37 
* add dataset

* md5

* added tests and data

* test

* remove type

* fix docs

* fix docs

* requested changes

* fix documentation and pyupgrade

* remove random

* missing license header
@isaaccorley @remtav
default fcsiam models to random init for tests (microsoft#497)
752644f
@adamjstewart @remtav
Indices tutorial: better normalization for true color plot (microsoft…
fa38b2d 
…#493)

* Indices tutorial: better normalization for true color plot

* Brighten Sentinel-2 image plots
adamjstewart and others added 16 commits May 26, 2022 08:50
@adamjstewart @calebrob6 @remtav
RandomGeoSampler: several bug fixes (microsoft#477)
e83f0f5 
* RandomGeoSampler: prevent area bias

* Use builtin PyTorch random

Co-authored-by: Caleb Robinson <calebrob6@gmail.com>
@nilsleh @remtav
Fix case of missing label in Forest Damage dataset (microsoft#499)
50f676f 
* fix case of missing label

* mypy fix
@nilsleh @remtav
Add plot method and data.py to NAIP (microsoft#407)
61247db 
* add plot method and data.py

* add version

* file typo

* forgot data.py

* add version change and larger image size

* requested changes

* test with print

* test geo

* change data to match chesapeake

* fix crs test
@khdlr @remtav
Cast uint16 tensors to int32, leave float32 tensors as they are (micr…
a67f1de 
…osoft#502)
@adamjstewart @remtav
Don't subtract microsecond from mint (microsoft#506)
bf19ac8
@adamjstewart @remtav
Type hints: PEP 561 compliance (microsoft#508)
0770307
@adamjstewart @remtav
Landsat: add support for all Level-1 and Level-2 products (microsoft#504
ab66ed9 
)

* Landsat: allow use of non-SR bands

* Fix citation

* The more citation the better
@gaetanbahl @remtav
Fix error when using other than 4 channel images with BYOL task (micr…
ea3729c 
…osoft#522)

Co-authored-by: BAHL Gaetan <gaetan.bahl@inria.fr>
@remtav
add channels to prevent conda's ResolvePackageError on Windows (micro…
a93d54b 
…soft#528)

* add channels to prevent conda's ResolvePackageError on Windows

* add open3d-admin channel for open3d dependency
@adamjstewart @remtav
Add GBIF dataset (microsoft#507)
aa23a60 
* Add GBIF dataset

* Typo fix

* Add tests

* Style fixes

* Don't ignore CSV files

* Testing...

* Fix coverage bug

* Add note about required dep
@adamjstewart @remtav
Test on Python 3.10 (microsoft#457)
94505f6 
* Test on Python 3.10

* Install pre-release versions of rasterio for 3.10 wheels

* Only use pre-release for rasterio

* Open3D does not yet have 3.10 wheels
@adamjstewart @remtav
Tutorials: fix NAIP downloads (microsoft#531)
1dd37d1
@adamjstewart @remtav
Add iNaturalist dataset (microsoft#532)
960081b
@adamjstewart @remtav
Add EDDMapS dataset (microsoft#533)
9151a95 
* Add EDDMapS dataset

* Mypy hack

* Test fix
@ashnair1 @remtav
Use stable docs (microsoft#539)
4855c8f
@ashnair1 @remtav
Add Inria datamodule (microsoft#498)
eeac9f7 
* Add Inria Datamodule

* Fix up

* Add predict.py

* Integrate kornia fns for extracting & combining

Requires kornia/kornia#1558 to be merged

* transform creates problem when calculating metrics

* Update

* Use dict.get

* Add tests & update test data

* Add Inria datamodule to docs

* Reduce test data size

* Datamodules always have predict_dataloader

* Remove comments

* Update predict.py

* Add PredictDataset

* Fix tests

* Update inria.yaml

* Clarify predict_on doc

* Refactor

* Update min kornia

* Update inria.yaml

* Remove predict utilities

* Trainer fix

* Use kornia's compute_padding

* kornia docfix

* Use stable docs

* Fixes
@github-actions github-actions bot added datamodules PyTorch Lightning datamodules datasets Geospatial or benchmark datasets documentation Improvements or additions to documentation losses Geospatial loss functions models Models and pretrained weights samplers Samplers for indexing datasets testing Continuous integration testing trainers PyTorch Lightning trainers transforms Data augmentation transforms labels May 26, 2022
@adamjstewart
Copy link
Collaborator

Looks like a bad rebase.

@remtav
Copy link
Contributor Author

remtav commented May 26, 2022

Messed up my rebase. I'm not a pro with git. I'll reopen a PR from a fresh branch.

@remtav remtav closed this May 26, 2022
@remtav remtav deleted the 529-conda-pytorch-cpu branch May 26, 2022 21:02
@remtav remtav mentioned this pull request May 26, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
datamodules PyTorch Lightning datamodules datasets Geospatial or benchmark datasets documentation Improvements or additions to documentation losses Geospatial loss functions models Models and pretrained weights samplers Samplers for indexing datasets testing Continuous integration testing trainers PyTorch Lightning trainers transforms Data augmentation transforms
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Conda installs a cpu version of pytorch and torchvision
7 participants
@remtav @ashnair1 @adamjstewart @nilsleh @isaaccorley @khdlr @gaetanbahl