From 3efe957f40b1b5be6b0659a378ac8f72468a43c5 Mon Sep 17 00:00:00 2001
From: Zaida Zhou <58739961+zhouzaida@users.noreply.github.com>
Date: Fri, 11 Nov 2022 15:40:50 +0800
Subject: [PATCH] Update supported pytorch versions (#2382)
* Update supported pytorch versions
* update
* fix
---
README.md | 10 +-
README_zh-CN.md | 8 +-
docs/en/_static/version.json | 170 +++++++++++++++++++++++++
docs/en/get_started/installation.md | 14 +-
docs/zh_cn/_static/version.json | 170 +++++++++++++++++++++++++
docs/zh_cn/get_started/installation.md | 14 +-
6 files changed, 367 insertions(+), 19 deletions(-)
diff --git a/README.md b/README.md
index 7e9c02bc4..458ce7340 100644
--- a/README.md
+++ b/README.md
@@ -22,8 +22,8 @@
[](https://mmcv.readthedocs.io/en/latest/)
[](https://mmcv.readthedocs.io/en/latest/get_started/installation.html)
[](https://pypi.org/project/mmcv/)
-[](https://pytorch.org/get-started/previous-versions/)
-[](https://developer.nvidia.com/cuda-downloads)
+[](https://pytorch.org/get-started/previous-versions/)
+[](https://developer.nvidia.com/cuda-downloads)
[](https://pypi.org/project/mmcv)
[](https://github.com/open-mmlab/mmcv/actions)
[](https://codecov.io/gh/open-mmlab/mmcv)
@@ -76,17 +76,17 @@ There are two versions of MMCV:
Before installing mmcv-full, make sure that PyTorch has been successfully installed following the [PyTorch official installation guide](https://github.com/pytorch/pytorch#installation).
-The command to install mmcv-full on Linux or Windows platforms is as follows (if your system is macOS, please refer to [build mmcv-full from source](https://mmcv.readthedocs.io/en/latest/get_started/build.html#macos-mmcv-full))
+The command to install mmcv-full:
```bash
pip install -U openmim
mim install mmcv-full
```
-If you need to specify the version of mmcv-full, you can use the following command
+If you need to specify the version of mmcv-full, you can use the following command:
```bash
-mim install mmcv-full==1.5.0
+mim install mmcv-full==1.7.0
```
If you find that the above installation command does not use a pre-built package ending with `.whl` but a source package ending with `.tar.gz`, you may not have a pre-build package corresponding to the PyTorch or CUDA or mmcv-full version, in which case you can [build mmcv-full from source](https://mmcv.readthedocs.io/en/latest/get_started/build.html).
diff --git a/README_zh-CN.md b/README_zh-CN.md
index d63940655..affa154a5 100644
--- a/README_zh-CN.md
+++ b/README_zh-CN.md
@@ -22,8 +22,8 @@
[](https://mmcv.readthedocs.io/zh_CN/latest/)
[](https://mmcv.readthedocs.io/zh_CN/latest/get_started/installation.html)
[](https://pypi.org/project/mmcv/)
-[](https://pytorch.org/get-started/previous-versions/)
-[](https://developer.nvidia.com/cuda-downloads)
+[](https://pytorch.org/get-started/previous-versions/)
+[](https://developer.nvidia.com/cuda-downloads)
[](https://pypi.org/project/mmcv)
[](https://github.com/open-mmlab/mmcv/actions)
[](https://codecov.io/gh/open-mmlab/mmcv)
@@ -74,7 +74,7 @@ MMCV 有两个版本：
在安装 mmcv-full 之前，请确保 PyTorch 已经成功安装在环境中，可以参考 [PyTorch 官方安装文档](https://github.com/pytorch/pytorch#installation)。
-在 Linux 和 Windows 平台安装 mmcv-full 的命令如下（如果你的系统是 macOS，请参考[源码安装 mmcv-full](https://mmcv.readthedocs.io/zh_CN/latest/get_started/build.html#macos-mmcv-full)）
+安装 mmcv-full 的命令如下：
```bash
pip install -U openmim
@@ -84,7 +84,7 @@ mim install mmcv-full
如果需要指定 mmcv-full 的版本，可以使用以下命令
```bash
-mim install mmcv-full==1.5.0
+mim install mmcv-full==1.7.0
```
如果发现上述的安装命令没有使用预编译包（以 `.whl` 结尾）而是使用源码包（以 `.tar.gz` 结尾）安装，则有可能是我们没有提供和当前环境的 PyTorch 版本、CUDA 版本相匹配的 mmcv-full 预编译包，此时，你可以[源码安装 mmcv-full](https://mmcv.readthedocs.io/zh_CN/latest/get_started/build.html)。
diff --git a/docs/en/_static/version.json b/docs/en/_static/version.json
index a1643eedb..fb07faeb7 100644
--- a/docs/en/_static/version.json
+++ b/docs/en/_static/version.json
@@ -1,9 +1,24 @@
{
"Linux": [
+ {
+ "cuda": "11.7",
+ "torch": "1.13.x",
+ "mmcv": [
+ "1.7.0"
+ ]
+ },
+ {
+ "cuda": "11.6",
+ "torch": "1.13.x",
+ "mmcv": [
+ "1.7.0"
+ ]
+ },
{
"cuda": "11.6",
"torch": "1.12.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0"
@@ -13,6 +28,7 @@
"cuda": "11.5",
"torch": "1.11.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -28,6 +44,7 @@
"cuda": "11.3",
"torch": "1.12.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0"
@@ -37,6 +54,7 @@
"cuda": "11.3",
"torch": "1.11.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -52,6 +70,7 @@
"cuda": "11.3",
"torch": "1.10.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -77,6 +96,7 @@
"cuda": "11.1",
"torch": "1.10.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -102,6 +122,7 @@
"cuda": "11.1",
"torch": "1.9.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -134,6 +155,7 @@
"cuda": "11.1",
"torch": "1.8.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -175,6 +197,7 @@
"cuda": "11.0",
"torch": "1.7.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -223,6 +246,7 @@
"cuda": "10.2",
"torch": "1.12.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0"
@@ -232,6 +256,7 @@
"cuda": "10.2",
"torch": "1.11.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -247,6 +272,7 @@
"cuda": "10.2",
"torch": "1.10.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -272,6 +298,7 @@
"cuda": "10.2",
"torch": "1.9.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -304,6 +331,7 @@
"cuda": "10.2",
"torch": "1.8.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -345,6 +373,7 @@
"cuda": "10.2",
"torch": "1.7.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -394,6 +423,7 @@
"cuda": "10.2",
"torch": "1.6.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -451,6 +481,7 @@
"cuda": "10.2",
"torch": "1.5.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -512,6 +543,7 @@
"cuda": "10.1",
"torch": "1.8.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -553,6 +585,7 @@
"cuda": "10.1",
"torch": "1.7.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -602,6 +635,7 @@
"cuda": "10.1",
"torch": "1.6.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -659,6 +693,7 @@
"cuda": "10.1",
"torch": "1.5.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -845,6 +880,7 @@
"cuda": "9.2",
"torch": "1.7.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -894,6 +930,7 @@
"cuda": "9.2",
"torch": "1.6.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -951,6 +988,7 @@
"cuda": "9.2",
"torch": "1.5.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1070,10 +1108,18 @@
"1.0.0"
]
},
+ {
+ "cuda": "cpu",
+ "torch": "1.13.x",
+ "mmcv": [
+ "1.7.0"
+ ]
+ },
{
"cuda": "cpu",
"torch": "1.12.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0"
@@ -1083,6 +1129,7 @@
"cuda": "cpu",
"torch": "1.11.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1098,6 +1145,7 @@
"cuda": "cpu",
"torch": "1.10.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1123,6 +1171,7 @@
"cuda": "cpu",
"torch": "1.9.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1155,6 +1204,7 @@
"cuda": "cpu",
"torch": "1.8.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1196,6 +1246,7 @@
"cuda": "cpu",
"torch": "1.7.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1245,6 +1296,7 @@
"cuda": "cpu",
"torch": "1.6.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1302,6 +1354,7 @@
"cuda": "cpu",
"torch": "1.5.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1424,10 +1477,25 @@
}
],
"Windows": [
+ {
+ "cuda": "11.7",
+ "torch": "1.13.x",
+ "mmcv": [
+ "1.7.0"
+ ]
+ },
+ {
+ "cuda": "11.6",
+ "torch": "1.13.x",
+ "mmcv": [
+ "1.7.0"
+ ]
+ },
{
"cuda": "11.6",
"torch": "1.12.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0"
@@ -1437,6 +1505,7 @@
"cuda": "11.5",
"torch": "1.11.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1452,6 +1521,7 @@
"cuda": "11.3",
"torch": "1.12.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0"
@@ -1461,6 +1531,7 @@
"cuda": "11.3",
"torch": "1.11.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1476,6 +1547,7 @@
"cuda": "11.3",
"torch": "1.10.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1498,6 +1570,7 @@
"cuda": "11.1",
"torch": "1.10.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1520,6 +1593,7 @@
"cuda": "11.1",
"torch": "1.9.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1542,6 +1616,7 @@
"cuda": "11.1",
"torch": "1.8.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1564,6 +1639,7 @@
"cuda": "10.2",
"torch": "1.10.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1586,6 +1662,7 @@
"cuda": "10.2",
"torch": "1.9.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1608,6 +1685,7 @@
"cuda": "10.2",
"torch": "1.8.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1642,6 +1720,7 @@
"cuda": "10.2",
"torch": "1.6.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1666,6 +1745,7 @@
"cuda": "10.2",
"torch": "1.5.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1687,6 +1767,7 @@
"cuda": "10.1",
"torch": "1.8.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1720,6 +1801,7 @@
"cuda": "10.1",
"torch": "1.6.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1744,6 +1826,7 @@
"cuda": "10.1",
"torch": "1.5.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1762,10 +1845,18 @@
"1.4.0"
]
},
+ {
+ "cuda": "cpu",
+ "torch": "1.13.x",
+ "mmcv": [
+ "1.7.0"
+ ]
+ },
{
"cuda": "cpu",
"torch": "1.12.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0"
@@ -1775,6 +1866,7 @@
"cuda": "cpu",
"torch": "1.11.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1790,6 +1882,7 @@
"cuda": "cpu",
"torch": "1.10.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1812,6 +1905,7 @@
"cuda": "cpu",
"torch": "1.9.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1834,6 +1928,7 @@
"cuda": "cpu",
"torch": "1.8.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1856,6 +1951,7 @@
"cuda": "cpu",
"torch": "1.7.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1878,6 +1974,7 @@
"cuda": "cpu",
"torch": "1.6.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1902,6 +1999,7 @@
"cuda": "cpu",
"torch": "1.5.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1927,5 +2025,77 @@
"1.1.5"
]
}
+ ],
+ "macOS": [
+ {
+ "cuda": "cpu",
+ "torch": "1.13.x",
+ "mmcv": [
+ "1.7.0"
+ ]
+ },
+ {
+ "cuda": "mps",
+ "torch": "1.13.x",
+ "mmcv": [
+ "1.7.0"
+ ]
+ },
+ {
+ "cuda": "cpu",
+ "torch": "1.12.x",
+ "mmcv": [
+ "1.7.0"
+ ]
+ },
+ {
+ "cuda": "cpu",
+ "torch": "1.11.x",
+ "mmcv": [
+ "1.7.0"
+ ]
+ },
+ {
+ "cuda": "cpu",
+ "torch": "1.10.x",
+ "mmcv": [
+ "1.7.0"
+ ]
+ },
+ {
+ "cuda": "cpu",
+ "torch": "1.9.x",
+ "mmcv": [
+ "1.7.0"
+ ]
+ },
+ {
+ "cuda": "cpu",
+ "torch": "1.8.x",
+ "mmcv": [
+ "1.7.0"
+ ]
+ },
+ {
+ "cuda": "cpu",
+ "torch": "1.7.x",
+ "mmcv": [
+ "1.7.0"
+ ]
+ },
+ {
+ "cuda": "cpu",
+ "torch": "1.6.x",
+ "mmcv": [
+ "1.7.0"
+ ]
+ },
+ {
+ "cuda": "cpu",
+ "torch": "1.5.x",
+ "mmcv": [
+ "1.7.0"
+ ]
+ }
]
}
diff --git a/docs/en/get_started/installation.md b/docs/en/get_started/installation.md
index fd7a5c7b9..81ffc16aa 100644
--- a/docs/en/get_started/installation.md
+++ b/docs/en/get_started/installation.md
@@ -12,7 +12,6 @@ Do not install both versions in the same environment, otherwise you may encounte
### Install mmcv-full
```{note}
-- The following installation steps are for Linux and Windows platforms only. To install mmcv-full on macOS platform, please refer to [build mmcv-full from source](build.md#build-on-macos).
- To compile ONNX Runtime custom operators, please refer to [How to build custom operators for ONNX Runtime](../deployment/onnxruntime_op.md#how-to-build-custom-operators-for-onnx-runtime)
- To compile TensorRT customization, please refer to [How to build TensorRT plugins in MMCV](../deployment/tensorrt_plugin.md#how-to-build-tensorrt-plugins-in-mmcv)
```
@@ -54,10 +53,10 @@ Collecting mmcv-full==1.6.0
-To install a specific version of mmcv-full, for example, mmcv-full version 1.6.0, you can use the following command
+To install a specific version of mmcv-full, for example, mmcv-full version 1.7.0, you can use the following command
```bash
-mim install mmcv-full==1.6.0
+mim install mmcv-full==1.7.0
```
:::{note}
@@ -198,7 +197,12 @@ Select the appropriate installation command depending on the type of system, CUD
const cmd = document.getElementById("select-cmd");
let cmdString = "pip install mmcv-full=={mmcv_version} -f https://download.openmmlab.com/mmcv/dist/{cu_version}/{torch_version}/index.html";
// e.g: pip install mmcv-full==1.6.0 -f https://download.openmmlab.com/mmcv/dist/cu111/torch1.9/index.html
- const cudaVersion = `${cudaVal === "cpu" ? cudaVal : `cu${cudaVal.split(".").join("")}`}`;
+ let cudaVersion;
+ if (cudaVal === "cpu" || cudaVal === "mps") {
+ cudaVersion = "cpu";
+ } else {
+ cudaVersion = `cu${cudaVal.split(".").join("")}`;
+ }
const torchVersion = `torch${torchVal.substring(0, torchVal.length - 2)}`;
cmdString = cmdString.replace("{cu_version}", cudaVersion).replace("{mmcv_version}", mmcvVal).replace("{torch_version}", torchVersion);
cmd.textContent = cmdString;
@@ -215,7 +219,7 @@ Select the appropriate installation command depending on the type of system, CUD
data.forEach(option => {
const ele = document.createElement("option");
let text = `${name} ${option}`;
- if (name === "os" || option.toUpperCase() === "CPU") {
+ if (name === "os" || option.toUpperCase() === "CPU" || option.toUpperCase() === "MPS") {
text = `${option}`;
}
ele.textContent = text;
diff --git a/docs/zh_cn/_static/version.json b/docs/zh_cn/_static/version.json
index a1643eedb..fb07faeb7 100644
--- a/docs/zh_cn/_static/version.json
+++ b/docs/zh_cn/_static/version.json
@@ -1,9 +1,24 @@
{
"Linux": [
+ {
+ "cuda": "11.7",
+ "torch": "1.13.x",
+ "mmcv": [
+ "1.7.0"
+ ]
+ },
+ {
+ "cuda": "11.6",
+ "torch": "1.13.x",
+ "mmcv": [
+ "1.7.0"
+ ]
+ },
{
"cuda": "11.6",
"torch": "1.12.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0"
@@ -13,6 +28,7 @@
"cuda": "11.5",
"torch": "1.11.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -28,6 +44,7 @@
"cuda": "11.3",
"torch": "1.12.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0"
@@ -37,6 +54,7 @@
"cuda": "11.3",
"torch": "1.11.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -52,6 +70,7 @@
"cuda": "11.3",
"torch": "1.10.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -77,6 +96,7 @@
"cuda": "11.1",
"torch": "1.10.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -102,6 +122,7 @@
"cuda": "11.1",
"torch": "1.9.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -134,6 +155,7 @@
"cuda": "11.1",
"torch": "1.8.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -175,6 +197,7 @@
"cuda": "11.0",
"torch": "1.7.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -223,6 +246,7 @@
"cuda": "10.2",
"torch": "1.12.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0"
@@ -232,6 +256,7 @@
"cuda": "10.2",
"torch": "1.11.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -247,6 +272,7 @@
"cuda": "10.2",
"torch": "1.10.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -272,6 +298,7 @@
"cuda": "10.2",
"torch": "1.9.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -304,6 +331,7 @@
"cuda": "10.2",
"torch": "1.8.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -345,6 +373,7 @@
"cuda": "10.2",
"torch": "1.7.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -394,6 +423,7 @@
"cuda": "10.2",
"torch": "1.6.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -451,6 +481,7 @@
"cuda": "10.2",
"torch": "1.5.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -512,6 +543,7 @@
"cuda": "10.1",
"torch": "1.8.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -553,6 +585,7 @@
"cuda": "10.1",
"torch": "1.7.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -602,6 +635,7 @@
"cuda": "10.1",
"torch": "1.6.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -659,6 +693,7 @@
"cuda": "10.1",
"torch": "1.5.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -845,6 +880,7 @@
"cuda": "9.2",
"torch": "1.7.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -894,6 +930,7 @@
"cuda": "9.2",
"torch": "1.6.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -951,6 +988,7 @@
"cuda": "9.2",
"torch": "1.5.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1070,10 +1108,18 @@
"1.0.0"
]
},
+ {
+ "cuda": "cpu",
+ "torch": "1.13.x",
+ "mmcv": [
+ "1.7.0"
+ ]
+ },
{
"cuda": "cpu",
"torch": "1.12.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0"
@@ -1083,6 +1129,7 @@
"cuda": "cpu",
"torch": "1.11.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1098,6 +1145,7 @@
"cuda": "cpu",
"torch": "1.10.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1123,6 +1171,7 @@
"cuda": "cpu",
"torch": "1.9.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1155,6 +1204,7 @@
"cuda": "cpu",
"torch": "1.8.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1196,6 +1246,7 @@
"cuda": "cpu",
"torch": "1.7.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1245,6 +1296,7 @@
"cuda": "cpu",
"torch": "1.6.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1302,6 +1354,7 @@
"cuda": "cpu",
"torch": "1.5.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1424,10 +1477,25 @@
}
],
"Windows": [
+ {
+ "cuda": "11.7",
+ "torch": "1.13.x",
+ "mmcv": [
+ "1.7.0"
+ ]
+ },
+ {
+ "cuda": "11.6",
+ "torch": "1.13.x",
+ "mmcv": [
+ "1.7.0"
+ ]
+ },
{
"cuda": "11.6",
"torch": "1.12.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0"
@@ -1437,6 +1505,7 @@
"cuda": "11.5",
"torch": "1.11.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1452,6 +1521,7 @@
"cuda": "11.3",
"torch": "1.12.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0"
@@ -1461,6 +1531,7 @@
"cuda": "11.3",
"torch": "1.11.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1476,6 +1547,7 @@
"cuda": "11.3",
"torch": "1.10.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1498,6 +1570,7 @@
"cuda": "11.1",
"torch": "1.10.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1520,6 +1593,7 @@
"cuda": "11.1",
"torch": "1.9.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1542,6 +1616,7 @@
"cuda": "11.1",
"torch": "1.8.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1564,6 +1639,7 @@
"cuda": "10.2",
"torch": "1.10.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1586,6 +1662,7 @@
"cuda": "10.2",
"torch": "1.9.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1608,6 +1685,7 @@
"cuda": "10.2",
"torch": "1.8.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1642,6 +1720,7 @@
"cuda": "10.2",
"torch": "1.6.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1666,6 +1745,7 @@
"cuda": "10.2",
"torch": "1.5.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1687,6 +1767,7 @@
"cuda": "10.1",
"torch": "1.8.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1720,6 +1801,7 @@
"cuda": "10.1",
"torch": "1.6.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1744,6 +1826,7 @@
"cuda": "10.1",
"torch": "1.5.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1762,10 +1845,18 @@
"1.4.0"
]
},
+ {
+ "cuda": "cpu",
+ "torch": "1.13.x",
+ "mmcv": [
+ "1.7.0"
+ ]
+ },
{
"cuda": "cpu",
"torch": "1.12.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0"
@@ -1775,6 +1866,7 @@
"cuda": "cpu",
"torch": "1.11.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1790,6 +1882,7 @@
"cuda": "cpu",
"torch": "1.10.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1812,6 +1905,7 @@
"cuda": "cpu",
"torch": "1.9.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1834,6 +1928,7 @@
"cuda": "cpu",
"torch": "1.8.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1856,6 +1951,7 @@
"cuda": "cpu",
"torch": "1.7.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1878,6 +1974,7 @@
"cuda": "cpu",
"torch": "1.6.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1902,6 +1999,7 @@
"cuda": "cpu",
"torch": "1.5.x",
"mmcv": [
+ "1.7.0",
"1.6.2",
"1.6.1",
"1.6.0",
@@ -1927,5 +2025,77 @@
"1.1.5"
]
}
+ ],
+ "macOS": [
+ {
+ "cuda": "cpu",
+ "torch": "1.13.x",
+ "mmcv": [
+ "1.7.0"
+ ]
+ },
+ {
+ "cuda": "mps",
+ "torch": "1.13.x",
+ "mmcv": [
+ "1.7.0"
+ ]
+ },
+ {
+ "cuda": "cpu",
+ "torch": "1.12.x",
+ "mmcv": [
+ "1.7.0"
+ ]
+ },
+ {
+ "cuda": "cpu",
+ "torch": "1.11.x",
+ "mmcv": [
+ "1.7.0"
+ ]
+ },
+ {
+ "cuda": "cpu",
+ "torch": "1.10.x",
+ "mmcv": [
+ "1.7.0"
+ ]
+ },
+ {
+ "cuda": "cpu",
+ "torch": "1.9.x",
+ "mmcv": [
+ "1.7.0"
+ ]
+ },
+ {
+ "cuda": "cpu",
+ "torch": "1.8.x",
+ "mmcv": [
+ "1.7.0"
+ ]
+ },
+ {
+ "cuda": "cpu",
+ "torch": "1.7.x",
+ "mmcv": [
+ "1.7.0"
+ ]
+ },
+ {
+ "cuda": "cpu",
+ "torch": "1.6.x",
+ "mmcv": [
+ "1.7.0"
+ ]
+ },
+ {
+ "cuda": "cpu",
+ "torch": "1.5.x",
+ "mmcv": [
+ "1.7.0"
+ ]
+ }
]
}
diff --git a/docs/zh_cn/get_started/installation.md b/docs/zh_cn/get_started/installation.md
index a8021fd52..8701c0ae2 100644
--- a/docs/zh_cn/get_started/installation.md
+++ b/docs/zh_cn/get_started/installation.md
@@ -12,7 +12,6 @@ MMCV 有两个版本：
### 安装 mmcv-full
```{note}
-- 下述安装步骤仅适用于 Linux 和 Windows 平台，如需在 macOS 平台安装 mmcv-full，请参考[源码安装 mmcv-full](build.md#在-macos-上编译-mmcv-full)。
- 如需编译 ONNX Runtime 自定义算子，请参考[如何编译ONNX Runtime自定义算子](../deployment/onnxruntime_op.md#如何编译onnx-runtime自定义算子)
- 如需编译 TensorRT 自定义，请参考[如何编译MMCV中的TensorRT插件](../deployment/tensorrt_plugin.md#如何编译mmcv中的tensorrt插件)
```
@@ -54,10 +53,10 @@ Collecting mmcv-full==1.6.0
-如需安装指定版本的 mmcv-full，例如安装 1.6.0 版本的 mmcv-full，可使用以下命令
+如需安装指定版本的 mmcv-full，例如安装 1.7.0 版本的 mmcv-full，可使用以下命令
```bash
-mim install mmcv-full==1.6.0
+mim install mmcv-full==1.7.0
```
:::{note}
@@ -196,7 +195,12 @@ python -c 'import torch;print(torch.__version__);print(torch.version.cuda)'
const cmd = document.getElementById("select-cmd");
let cmdString = "pip install mmcv-full=={mmcv_version} -f https://download.openmmlab.com/mmcv/dist/{cu_version}/{torch_version}/index.html";
// e.g: pip install mmcv-full==1.6.0 -f https://download.openmmlab.com/mmcv/dist/cu111/torch1.9/index.html
- const cudaVersion = `${cudaVal === "cpu" ? cudaVal : `cu${cudaVal.split(".").join("")}`}`;
+ let cudaVersion;
+ if (cudaVal === "cpu" || cudaVal === "mps") {
+ cudaVersion = "cpu";
+ } else {
+ cudaVersion = `cu${cudaVal.split(".").join("")}`;
+ }
const torchVersion = `torch${torchVal.substring(0, torchVal.length - 2)}`;
cmdString = cmdString.replace("{cu_version}", cudaVersion).replace("{mmcv_version}", mmcvVal).replace("{torch_version}", torchVersion);
cmd.textContent = cmdString;
@@ -213,7 +217,7 @@ python -c 'import torch;print(torch.__version__);print(torch.version.cuda)'
data.forEach(option => {
const ele = document.createElement("option");
let text = `${name} ${option}`;
- if (name === "os" || option.toUpperCase() === "CPU") {
+ if (name === "os" || option.toUpperCase() === "CPU" || option.toUpperCase() === "MPS") {
text = `${option}`;
}
ele.textContent = text;