aboutsummaryrefslogtreecommitdiff
path: root/docs/markdown
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2019-02-24 23:48:28 +0200
committerGitHub <noreply@github.com>2019-02-24 23:48:28 +0200
commit41fb5c2960b678ec7722d5f9b3c555757ba8a6bd (patch)
tree7643436b63bdf4773a3e0b3a9d012802ec01aaac /docs/markdown
parent5b53335724c11e4443ac62bfbaea90881323d2b1 (diff)
parent104397a4293f78d3cbdd84f380cefb84ca54ec99 (diff)
downloadmeson-41fb5c2960b678ec7722d5f9b3c555757ba8a6bd.zip
meson-41fb5c2960b678ec7722d5f9b3c555757ba8a6bd.tar.gz
meson-41fb5c2960b678ec7722d5f9b3c555757ba8a6bd.tar.bz2
Merge pull request #4972 from obilaniu/cudafixes
CUDA fixes
Diffstat (limited to 'docs/markdown')
-rw-r--r--docs/markdown/Cuda-module.md10
1 files changed, 9 insertions, 1 deletions
diff --git a/docs/markdown/Cuda-module.md b/docs/markdown/Cuda-module.md
index caa1756..f161eac 100644
--- a/docs/markdown/Cuda-module.md
+++ b/docs/markdown/Cuda-module.md
@@ -71,6 +71,14 @@ mixed with architecture names or compute capabilities. Their interpretation is:
| `'Common'` | Relatively common CCs supported by given NVCC compiler. Generally excludes Tegra and Tesla devices. |
| `'Auto'` | The CCs provided by the `detected:` keyword, filtered for support by given NVCC compiler. |
+As a special case, when `nvcc_arch_flags()` is invoked with
+
+- an NVCC `compiler` object `nvcc`,
+- `'Auto'` mode and
+- no `detected:` keyword,
+
+Meson uses `nvcc`'s architecture auto-detection results.
+
The supported architecture names and their corresponding compute capabilities
are:
@@ -85,7 +93,7 @@ are:
| `'Pascal'` | 6.0, 6.1 |
| `'Pascal+Tegra'` | 6.2 |
| `'Volta'` | 7.0 |
-| `'Volta+Tegra'` | 7.2 |
+| `'Xavier'` | 7.2 |
| `'Turing'` | 7.5 |