Skip to content

Commit

Permalink
resolving conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
fischcheng committed Sep 29, 2021
2 parents 6d4c066 + 0fea75c commit 8ecb3b6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions runtime/environment-cpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: condaenv
channels:
- fastai
- conda-forge
- conda-forge/label/broken # required imagecodecs is marked broken
dependencies:
- albumentations=1.0.3
- fastai=2.5.0
Expand Down
1 change: 1 addition & 0 deletions runtime/environment-gpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ channels:
- fastai
- nvidia
- conda-forge
- conda-forge/label/broken # required imagecodecs is marked broken
dependencies:
- albumentations=1.0.3
- cudatoolkit=11.1.74=h6bb024c_0
Expand Down

0 comments on commit 8ecb3b6

Please sign in to comment.