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

Restrict ffmpeg to 4.2+.X versions to resolve linux conda build failures #8562

Merged
merged 6 commits into from
Jul 30, 2024
Merged

Restrict ffmpeg to 4.2+.X versions to resolve linux conda build failures #8562

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e771d55
Update meta.yaml
atalman Jul 30, 2024
3e77bce
Update meta.yaml
atalman Jul 30, 2024
6f84a61
Update meta.yaml
atalman Jul 30, 2024
8c031e5
Update build-conda-linux.yml
atalman Jul 30, 2024
8163bbf
Apply suggestions from code review
malfet Jul 30, 2024
0198c8f
Update build-conda-linux.yml
atalman Jul 30, 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
2 changes: 1 addition & 1 deletion .github/workflows/build-conda-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
smoke-test-script: test/smoke_test.py
package-name: torchvision
name: ${{ matrix.repository }}
uses: pytorch/test-infra/.github/workflows/build_conda_linux.yml@main
uses: pytorch/test-infra/.github/workflows/build_conda_linux.yml@atalman-conda-build
atalman marked this conversation as resolved.
Show resolved Hide resolved
with:
conda-package-directory: ${{ matrix.conda-package-directory }}
repository: ${{ matrix.repository }}
Expand Down
8 changes: 4 additions & 4 deletions packaging/torchvision/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ requirements:
- {{ compiler('c') }} # [win]
- libpng
- libjpeg-turbo
- ffmpeg >=4.2 # [linux]
- ffmpeg ==4.2.2 # [linux]
malfet marked this conversation as resolved.
Show resolved Hide resolved

host:
- python
- setuptools
- pytorch-mutex 1.0 {{ build_variant }} # [not osx ]
{{ environ.get('CONDA_PYTORCH_BUILD_CONSTRAINT') }}
{{ environ.get('CONDA_PYTORCH_BUILD_CONSTRAINT', 'pytorch') }}
{{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT', '') }}

run:
Expand All @@ -26,11 +26,11 @@ requirements:
- numpy >=1.23.5 # [py >= 311]
- requests
- libpng
- ffmpeg >=4.2 # [linux]
- ffmpeg ==4.2.2 # [linux]
malfet marked this conversation as resolved.
Show resolved Hide resolved
- libjpeg-turbo
- pillow >=5.3.0, !=8.3.*
- pytorch-mutex 1.0 {{ build_variant }} # [not osx ]
{{ environ.get('CONDA_PYTORCH_CONSTRAINT') }}
{{ environ.get('CONDA_PYTORCH_CONSTRAINT', 'pytorch') }}
{{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT', '') }}

{% if build_variant == 'cpu' %}
Expand Down
Loading