Skip to content

Commit b43fadb

Browse files
authored
Remove mentions of 2.4 in docs and error messages (#361)
1 parent 2ddf90b commit b43fadb

File tree

4 files changed

+37
-59
lines changed

4 files changed

+37
-59
lines changed

README.md

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -94,29 +94,40 @@ ffmpeg -f lavfi -i \
9494

9595
## Installing TorchCodec
9696

97-
Note: if you're on MacOS, you'll need to [build from source](./CONTRIBUTING.md).
98-
The instructions below assume you're on Linux.
97+
1. Install the latest stable version of PyTorch following the
98+
[official instructions](https://pytorch.org/get-started/locally/). For other
99+
versions, refer to the table below for compatibility between versions of
100+
`torch` and `torchcodec`.
99101

100-
1. Install the latest stable version of PyTorch following the
101-
[official instructions](https://pytorch.org/get-started/locally/). TorchCodec
102-
requires [PyTorch 2.4](https://pytorch.org/docs/2.4/).
102+
2. Install FFmpeg, if it's not already installed. Linux distributions usually
103+
come with FFmpeg pre-installed. TorchCodec supports all major FFmpeg versions
104+
in [4, 7].
103105

104-
2. Install FFmpeg, if it's not already installed. Your Linux distribution probably
105-
comes with FFmpeg pre-installed. TorchCodec supports all major FFmpeg versions
106-
in [4, 7].
106+
If FFmpeg is not already installed, or you need a more recent version, an
107+
easy way to install it is to use `conda`:
107108

108-
If FFmpeg is not already installed, or you need a later version, install it with:
109+
```bash
110+
conda install ffmpeg
111+
# or
112+
conda install ffmpeg -c conda-forge
113+
```
109114

110-
```bash
111-
conda install ffmpeg
112-
# or
113-
conda install ffmpeg -c conda-forge
114-
```
115-
3. Install TorchCodec:
115+
3. Install TorchCodec:
116116

117-
```bash
118-
pip install torchcodec
119-
```
117+
```bash
118+
pip install torchcodec
119+
```
120+
121+
The following table indicates the compatibility between versions of
122+
`torchcodec`, `torch` and Python.
123+
124+
| `torchcodec` | `torch` | Python |
125+
| ------------------ | ------------------ | ------------------- |
126+
| `main` / `nightly` | `main` / `nightly` | `>=3.9`, `<=3.12` |
127+
| not yet supported | `2.5` | `>=3.9`, `<=3.12` |
128+
| `0.0.3` | `2.4` | `>=3.8`, `<=3.12` |
129+
130+
<details>
120131

121132
## Benchmark Results
122133

@@ -134,10 +145,6 @@ encoded with libx264 and yuv420p pixel format.
134145

135146
We are actively working on the following features:
136147

137-
- [Ship wheels for MacOS](https://github.com/pytorch/torchcodec/issues/111), so
138-
that MacOS users can `pip install torchcodec`. For now this is only supported
139-
on Linux, but MacOS users can [build from source](./CONTRIBUTING.md).
140-
- [GPU decoding](https://github.com/pytorch/torchcodec/pull/58)
141148
- [Audio decoding](https://github.com/pytorch/torchcodec/issues/85)
142149

143150
Let us know if you have any feature requests by [opening an

docs/source/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ We achieve these capabilities through:
2929
.. grid-item-card:: :octicon:`file-code;1em`
3030
Installation instructions
3131
:img-top: _static/img/card-background.svg
32-
:link: install_instructions.html
32+
:link: https://github.com/pytorch/torchcodec?tab=readme-ov-file#installing-torchcodec
3333
:link-type: url
3434

3535
How to install TorchCodec
@@ -71,7 +71,7 @@ We achieve these capabilities through:
7171
:caption: Examples and tutorials
7272
:hidden:
7373

74-
install_instructions
74+
Installation instructions <https://github.com/pytorch/torchcodec?tab=readme-ov-file#installing-torchcodec>
7575
generated_examples/index
7676

7777

docs/source/install_instructions.rst

Lines changed: 0 additions & 32 deletions
This file was deleted.

src/torchcodec/decoders/_core/video_decoder_ops.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,13 @@ def load_torchcodec_extension():
4242
+ "\n[end of libtorchcodec loading traceback]."
4343
)
4444
raise RuntimeError(
45-
"""Could not load libtorchcodec. Likely causes:
45+
f"""Could not load libtorchcodec. Likely causes:
4646
1. FFmpeg is not properly installed in your environment. We support
47-
verisons 4, 5, 6 and 7.
48-
2. PyTorch 2.4 is not properly installed in your environment.
47+
versions 4, 5, 6 and 7.
48+
2. The PyTorch version ({torch.__version__}) is not compatible with
49+
this version of TorchCodec. Refer to the version compatibility
50+
table:
51+
https://github.com/pytorch/torchcodec?tab=readme-ov-file#installing-torchcodec.
4952
3. Another runtime dependency; see exceptions below.
5053
The following exceptions were raised as we tried to load libtorchcodec:
5154
"""

0 commit comments

Comments
 (0)