Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into format-libcudacxx-i…
Browse files Browse the repository at this point in the history
…nclude-extensionless-files
  • Loading branch information
bdice committed May 1, 2024
2 parents 8c875d8 + 465d7f3 commit 2b23378
Show file tree
Hide file tree
Showing 133 changed files with 13,351 additions and 8,629 deletions.
3 changes: 3 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,9 @@ IncludeCategories:
- Regex: '^<(cuda/std/detail/__config|cub/config.cuh|thrust/detail/config.h|thrust/system/cuda/config.h)'
Priority: 0
SortPriority: 0
- Regex: '^<cuda/std/detail/libcxx/include/__pragma_push>'
Priority: 6
SortPriority: 5
- Regex: '^<cub/'
Priority: 2
SortPriority: 1
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda11.1-gcc6/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
"vscode": {
"extensions": [
"llvm-vs-code-extensions.vscode-clangd",
"xaver.clang-format"
"xaver.clang-format",
"nvidia.nsight-vscode-edition",
"ms-vscode.cmake-tools"
],
"settings": {
"editor.defaultFormatter": "xaver.clang-format",
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda11.1-gcc7/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
"vscode": {
"extensions": [
"llvm-vs-code-extensions.vscode-clangd",
"xaver.clang-format"
"xaver.clang-format",
"nvidia.nsight-vscode-edition",
"ms-vscode.cmake-tools"
],
"settings": {
"editor.defaultFormatter": "xaver.clang-format",
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda11.1-gcc8/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
"vscode": {
"extensions": [
"llvm-vs-code-extensions.vscode-clangd",
"xaver.clang-format"
"xaver.clang-format",
"nvidia.nsight-vscode-edition",
"ms-vscode.cmake-tools"
],
"settings": {
"editor.defaultFormatter": "xaver.clang-format",
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda11.1-gcc9/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
"vscode": {
"extensions": [
"llvm-vs-code-extensions.vscode-clangd",
"xaver.clang-format"
"xaver.clang-format",
"nvidia.nsight-vscode-edition",
"ms-vscode.cmake-tools"
],
"settings": {
"editor.defaultFormatter": "xaver.clang-format",
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda11.1-llvm9/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
"vscode": {
"extensions": [
"llvm-vs-code-extensions.vscode-clangd",
"xaver.clang-format"
"xaver.clang-format",
"nvidia.nsight-vscode-edition",
"ms-vscode.cmake-tools"
],
"settings": {
"editor.defaultFormatter": "xaver.clang-format",
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda11.8-gcc11/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
"vscode": {
"extensions": [
"llvm-vs-code-extensions.vscode-clangd",
"xaver.clang-format"
"xaver.clang-format",
"nvidia.nsight-vscode-edition",
"ms-vscode.cmake-tools"
],
"settings": {
"editor.defaultFormatter": "xaver.clang-format",
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda12.4-gcc10/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
"vscode": {
"extensions": [
"llvm-vs-code-extensions.vscode-clangd",
"xaver.clang-format"
"xaver.clang-format",
"nvidia.nsight-vscode-edition",
"ms-vscode.cmake-tools"
],
"settings": {
"editor.defaultFormatter": "xaver.clang-format",
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda12.4-gcc11/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
"vscode": {
"extensions": [
"llvm-vs-code-extensions.vscode-clangd",
"xaver.clang-format"
"xaver.clang-format",
"nvidia.nsight-vscode-edition",
"ms-vscode.cmake-tools"
],
"settings": {
"editor.defaultFormatter": "xaver.clang-format",
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda12.4-gcc12/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
"vscode": {
"extensions": [
"llvm-vs-code-extensions.vscode-clangd",
"xaver.clang-format"
"xaver.clang-format",
"nvidia.nsight-vscode-edition",
"ms-vscode.cmake-tools"
],
"settings": {
"editor.defaultFormatter": "xaver.clang-format",
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda12.4-gcc7/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
"vscode": {
"extensions": [
"llvm-vs-code-extensions.vscode-clangd",
"xaver.clang-format"
"xaver.clang-format",
"nvidia.nsight-vscode-edition",
"ms-vscode.cmake-tools"
],
"settings": {
"editor.defaultFormatter": "xaver.clang-format",
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda12.4-gcc8/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
"vscode": {
"extensions": [
"llvm-vs-code-extensions.vscode-clangd",
"xaver.clang-format"
"xaver.clang-format",
"nvidia.nsight-vscode-edition",
"ms-vscode.cmake-tools"
],
"settings": {
"editor.defaultFormatter": "xaver.clang-format",
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda12.4-gcc9/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
"vscode": {
"extensions": [
"llvm-vs-code-extensions.vscode-clangd",
"xaver.clang-format"
"xaver.clang-format",
"nvidia.nsight-vscode-edition",
"ms-vscode.cmake-tools"
],
"settings": {
"editor.defaultFormatter": "xaver.clang-format",
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda12.4-llvm10/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
"vscode": {
"extensions": [
"llvm-vs-code-extensions.vscode-clangd",
"xaver.clang-format"
"xaver.clang-format",
"nvidia.nsight-vscode-edition",
"ms-vscode.cmake-tools"
],
"settings": {
"editor.defaultFormatter": "xaver.clang-format",
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda12.4-llvm11/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
"vscode": {
"extensions": [
"llvm-vs-code-extensions.vscode-clangd",
"xaver.clang-format"
"xaver.clang-format",
"nvidia.nsight-vscode-edition",
"ms-vscode.cmake-tools"
],
"settings": {
"editor.defaultFormatter": "xaver.clang-format",
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda12.4-llvm12/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
"vscode": {
"extensions": [
"llvm-vs-code-extensions.vscode-clangd",
"xaver.clang-format"
"xaver.clang-format",
"nvidia.nsight-vscode-edition",
"ms-vscode.cmake-tools"
],
"settings": {
"editor.defaultFormatter": "xaver.clang-format",
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda12.4-llvm13/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
"vscode": {
"extensions": [
"llvm-vs-code-extensions.vscode-clangd",
"xaver.clang-format"
"xaver.clang-format",
"nvidia.nsight-vscode-edition",
"ms-vscode.cmake-tools"
],
"settings": {
"editor.defaultFormatter": "xaver.clang-format",
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda12.4-llvm14/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
"vscode": {
"extensions": [
"llvm-vs-code-extensions.vscode-clangd",
"xaver.clang-format"
"xaver.clang-format",
"nvidia.nsight-vscode-edition",
"ms-vscode.cmake-tools"
],
"settings": {
"editor.defaultFormatter": "xaver.clang-format",
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda12.4-llvm15/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
"vscode": {
"extensions": [
"llvm-vs-code-extensions.vscode-clangd",
"xaver.clang-format"
"xaver.clang-format",
"nvidia.nsight-vscode-edition",
"ms-vscode.cmake-tools"
],
"settings": {
"editor.defaultFormatter": "xaver.clang-format",
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda12.4-llvm16/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
"vscode": {
"extensions": [
"llvm-vs-code-extensions.vscode-clangd",
"xaver.clang-format"
"xaver.clang-format",
"nvidia.nsight-vscode-edition",
"ms-vscode.cmake-tools"
],
"settings": {
"editor.defaultFormatter": "xaver.clang-format",
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda12.4-llvm9/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
"vscode": {
"extensions": [
"llvm-vs-code-extensions.vscode-clangd",
"xaver.clang-format"
"xaver.clang-format",
"nvidia.nsight-vscode-edition",
"ms-vscode.cmake-tools"
],
"settings": {
"editor.defaultFormatter": "xaver.clang-format",
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda12.4-oneapi2023.2.0/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
"vscode": {
"extensions": [
"llvm-vs-code-extensions.vscode-clangd",
"xaver.clang-format"
"xaver.clang-format",
"nvidia.nsight-vscode-edition",
"ms-vscode.cmake-tools"
],
"settings": {
"editor.defaultFormatter": "xaver.clang-format",
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
"vscode": {
"extensions": [
"llvm-vs-code-extensions.vscode-clangd",
"xaver.clang-format"
"xaver.clang-format",
"nvidia.nsight-vscode-edition",
"ms-vscode.cmake-tools"
],
"settings": {
"editor.defaultFormatter": "xaver.clang-format",
Expand Down
15 changes: 15 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "(cuda-gdb) Launch",
"type": "cuda-gdb",
"request": "launch",
"program": "${command:cmake.launchTargetPath}",
"stopAtEntry": true,
"cwd": "${workspaceFolder}",
"initCommands": ["set cuda api_failures stop"]

}
]
}
10 changes: 10 additions & 0 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,16 @@
"CCCL_ENABLE_EXAMPLES": true,
"CCCL_ENABLE_TESTING": true
}
},
{
"name": "all-dev-debug",
"displayName": "all-dev debug",
"inherits": "all-dev",
"cacheVariables":{
"CCCL_ENABLE_BENCHMARKS": false,
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_CUDA_FLAGS": "-G"
}
}
],
"buildPresets": [
Expand Down
9 changes: 1 addition & 8 deletions libcudacxx/docs/standard_api/numerics_library.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,4 @@ Any Standard C++ header not listed below is omitted.
| [`<cuda/std/cfloat>`](https://en.cppreference.com/w/cpp/header/cfloat) | Limits of floating point types. <br/><br/> 1.0.0 / CUDA 10.2 |
| [`<cuda/std/climits>`](https://en.cppreference.com/w/cpp/header/climits) | Limits of integral types. <br/><br/> 1.0.0 / CUDA 10.2 |
| [`<cuda/std/cstdint>`](https://en.cppreference.com/w/cpp/header/cstdint) | Fixed-width integer types. <br/><br/> 1.0.0 / CUDA 10.2 |


[`<cuda/std/complex>`]: https://en.cppreference.com/w/cpp/header/complex
[`<cuda/std/ccomplex>`]: https://en.cppreference.com/w/cpp/header/ccomplex
[`<cuda/std/ratio>`]: https://en.cppreference.com/w/cpp/header/ratio
[`<cuda/std/cfloat>`]: https://en.cppreference.com/w/cpp/header/cfloat
[`<cuda/std/climits>`]: https://en.cppreference.com/w/cpp/header/climits
[`<cuda/std/cstdint>`]: https://en.cppreference.com/w/cpp/header/cstdint
| [`<cuda/std/numeric>`](https://en.cppreference.com/w/cpp/header/numeric) | Numeric algorithms (see also: [libcu++ Specifics]({{ "standard_api/numerics_library/numeric.html" | relative_url }})). <br/><br/> 2.5.0 |
18 changes: 18 additions & 0 deletions libcudacxx/docs/standard_api/numerics_library/numeric.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
grand_parent: Standard API
parent: Numerics Library
nav_order: 3
---

# `<cuda/std/numeric>`

## Omissions

* Currently we do not expose any parallel algorithms.
* Saturation arithmetics have not been implemented yet

## Extensions

* All features of `<numeric>` are made available in C++11 onwards
* All features of `<numeric>` are made constexpr in C++14 onwards
* Algorithms that return a value have been marked `[[nodiscard]]`
3 changes: 2 additions & 1 deletion libcudacxx/include/cuda/std/__algorithm/max.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@
#include <cuda/std/__algorithm/comp.h>
#include <cuda/std/__algorithm/comp_ref_type.h>
#include <cuda/std/__algorithm/max_element.h>
#include <cuda/std/detail/libcxx/include/__pragma_push>
#include <cuda/std/initializer_list>

#include <cuda/std/detail/libcxx/include/__pragma_push>

_LIBCUDACXX_BEGIN_NAMESPACE_STD

template <class _Tp, class _Compare>
Expand Down
3 changes: 2 additions & 1 deletion libcudacxx/include/cuda/std/__algorithm/min.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@
#include <cuda/std/__algorithm/comp.h>
#include <cuda/std/__algorithm/comp_ref_type.h>
#include <cuda/std/__algorithm/min_element.h>
#include <cuda/std/detail/libcxx/include/__pragma_push>
#include <cuda/std/initializer_list>

#include <cuda/std/detail/libcxx/include/__pragma_push>

_LIBCUDACXX_BEGIN_NAMESPACE_STD

template <class _Tp, class _Compare>
Expand Down
1 change: 1 addition & 0 deletions libcudacxx/include/cuda/std/__algorithm/min_element.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include <cuda/std/__iterator/iterator_traits.h>
#include <cuda/std/__type_traits/is_callable.h>
#include <cuda/std/__utility/move.h>

#include <cuda/std/detail/libcxx/include/__pragma_push>

_LIBCUDACXX_BEGIN_NAMESPACE_STD
Expand Down
Loading

0 comments on commit 2b23378

Please sign in to comment.