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

add libjpeg-turbo dependency for torchvision #20437

Closed
wants to merge 3 commits into from
Closed

add libjpeg-turbo dependency for torchvision #20437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f826e35
add libjpeg-turbo dependency for torchvision
Apr 29, 2024
265b199
also fix v0.14.1 and v0.16.0
May 7, 2024
952db89
add libjpeg-turbo dep
May 7, 2024
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 easybuild/easyconfigs/t/torchvision/torchvision-0.13.1-foss-2022a-CUDA-11.7.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ dependencies = [
('CUDA', '11.7.0', '', SYSTEM),
('Python', '3.10.4'),
('Pillow-SIMD', '9.2.0'),
('libjpeg-turbo', '2.1.3'),
('PyTorch', '1.12.0', '-CUDA-%(cudaver)s'),
]

preinstallopts = 'WITH_CUDA=1 TORCHVISION_INCLUDE="$EBROOTLIBJPEGMINTURBO/include:$TORCHVISION_INCLUDE"'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we're going forward with easybuilders/easybuild-easyblocks#3322 (which makes sense), we should clean this up accordingly...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think we can just close this PR, as libjpeg-turbo is already a dep of Pillow-SIMD?
once the easyblock is merged i'll remove the TORCHVISION_INCLUDE from the easyconfigs that have it set


moduleclass = 'vis'
3 changes: 3 additions & 0 deletions easybuild/easyconfigs/t/torchvision/torchvision-0.13.1-foss-2022a.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ builddependencies = [('CMake', '3.23.1')]
dependencies = [
('Python', '3.10.4'),
('Pillow-SIMD', '9.2.0'),
('libjpeg-turbo', '2.1.3'),
('PyTorch', '1.12.0'),
]

preinstallopts = 'TORCHVISION_INCLUDE="$EBROOTLIBJPEGMINTURBO/include:$TORCHVISION_INCLUDE"'

moduleclass = 'vis'
3 changes: 3 additions & 0 deletions easybuild/easyconfigs/t/torchvision/torchvision-0.14.1-foss-2022b.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ builddependencies = [('CMake', '3.24.3')]
dependencies = [
('Python', '3.10.8'),
('Pillow-SIMD', '9.5.0'),
('libjpeg-turbo', '2.1.4'),
('PyTorch', '1.13.1'),
]

preinstallopts = 'TORCHVISION_INCLUDE="$EBROOTLIBJPEGMINTURBO/include:$TORCHVISION_INCLUDE"'

moduleclass = 'vis'
3 changes: 3 additions & 0 deletions easybuild/easyconfigs/t/torchvision/torchvision-0.16.0-foss-2023a.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@ dependencies = [
('Python', '3.11.3'),
('FFmpeg', '6.0'),
('Pillow-SIMD', '9.5.0'),
('libjpeg-turbo', '2.1.5.1'),
('PyTorch', '2.1.2'),
]

preinstallopts = 'TORCHVISION_INCLUDE="$EBROOTLIBJPEGMINTURBO/include:$TORCHVISION_INCLUDE"'

moduleclass = 'vis'
Loading