Skip to content

Commit

Permalink
Merge branch 'main' into fea/atomic_ref_8_16_bit_support
Browse files Browse the repository at this point in the history
  • Loading branch information
wmaxey committed Sep 10, 2024
2 parents 1000597 + d5492d5 commit f48a49b
Show file tree
Hide file tree
Showing 933 changed files with 32,765 additions and 14,503 deletions.
27 changes: 6 additions & 21 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -25,53 +25,35 @@ AlwaysBreakTemplateDeclarations: Yes
AttributeMacros: [
'_CCCL_ALIGNAS_TYPE',
'_CCCL_ALIGNAS',
'_CCCL_ALWAYS_INLINE',
'_CCCL_CONSTEXPR_CXX14',
'_CCCL_CONSTEXPR_CXX17',
'_CCCL_CONSTEXPR_CXX20',
'_CCCL_CONSTEXPR_CXX23',
'_CCCL_DEVICE',
'_CCCL_FALLTHROUGH',
'_CCCL_FORCEINLINE',
'_CCCL_HIDE_FROM_ABI',
'_CCCL_HOST_DEVICE',
'_CCCL_HOST',
'_CCCL_NO_UNIQUE_ADDRESS',
'_CCCL_NODISCARD_FRIEND',
'_CCCL_NODISCARD',
'_CCCL_NORETURN',
'_CCCL_TYPE_VISIBILITY_DEFAULT',
'_CCCL_VISIBILITY_HIDDEN',
'CUB_RUNTIME_FUNCTION',
'CUB_DETAIL_KERNEL_ATTRIBUTES',
'THRUST_RUNTIME_FUNCTION',
'THRUST_DETAIL_KERNEL_ATTRIBUTES',
'_LIBCUDACXX_ALIGNOF',
'_LIBCUDACXX_ALWAYS_INLINE',
'_LIBCUDACXX_AVAILABILITY_THROW_BAD_VARIANT_ACCESS',
'_LIBCUDACXX_CONSTINIT',
'_LIBCUDACXX_DEPRECATED_IN_CXX11',
'_LIBCUDACXX_DEPRECATED_IN_CXX14',
'_LIBCUDACXX_DEPRECATED_IN_CXX17',
'_LIBCUDACXX_DEPRECATED_IN_CXX20',
'_LIBCUDACXX_DEPRECATED',
'_LIBCUDACXX_DISABLE_EXTENTSION_WARNING',
'_LIBCUDACXX_EXCLUDE_FROM_EXPLICIT_INSTANTIATION',
'_LIBCUDACXX_EXPORTED_FROM_ABI',
'_LIBCUDACXX_EXTERN_TEMPLATE_TYPE_VIS',
'_LIBCUDACXX_HIDDEN',
'_LIBCUDACXX_HIDE_FROM_ABI_AFTER_V1',
'_LIBCUDACXX_HIDE_FROM_ABI',
'_LIBCUDACXX_INLINE_VISIBILITY',
'_LIBCUDACXX_INTERNAL_LINKAGE',
'_LIBCUDACXX_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS',
'_LIBCUDACXX_NO_DESTROY',
'_LIBCUDACXX_NO_SANITIZE',
'_LIBCUDACXX_NOALIAS',
'_LIBCUDACXX_OVERRIDABLE_FUNC_VIS',
'_LIBCUDACXX_STANDALONE_DEBUG',
'_LIBCUDACXX_TEMPLATE_DATA_VIS',
'_LIBCUDACXX_TEMPLATE_VIS',
'_LIBCUDACXX_THREAD_SAFETY_ANNOTATION',
'_LIBCUDACXX_USING_IF_EXISTS',
'_LIBCUDACXX_WEAK',
]
BinPackArguments: false
BinPackParameters: false
Expand Down Expand Up @@ -108,6 +90,9 @@ IfMacros: [
IndentWrappedFunctionNames: false
IncludeBlocks: Regroup
IncludeCategories:
- Regex: '^<cuda/experimental/__async/prologue.cuh>'
Priority: 0x7FFFFFFF
SortPriority: 0x7FFFFFFF
- Regex: '^<(cuda/std/detail/__config|cub/config.cuh|thrust/detail/config.h|thrust/system/cuda/config.h)'
Priority: 0
SortPriority: 0
Expand Down
53 changes: 0 additions & 53 deletions .devcontainer/cuda12.5-gcc10/devcontainer.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:24.10-cpp-gcc12-cuda12.5",
"image": "rapidsai/devcontainers:24.10-cpp-gcc10-cuda12.6",
"hostRequirements": {
"gpu": "optional"
},
Expand All @@ -15,11 +15,11 @@
"SCCACHE_BUCKET": "rapids-sccache-devs",
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda12.5-gcc12",
"CCCL_CUDA_VERSION": "12.5",
"DEVCONTAINER_NAME": "cuda12.6-gcc10",
"CCCL_CUDA_VERSION": "12.6",
"CCCL_HOST_COMPILER": "gcc",
"CCCL_HOST_COMPILER_VERSION": "12",
"CCCL_BUILD_INFIX": "cuda12.5-gcc12"
"CCCL_HOST_COMPILER_VERSION": "10",
"CCCL_BUILD_INFIX": "cuda12.6-gcc10"
},
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",
Expand Down Expand Up @@ -49,5 +49,5 @@
}
}
},
"name": "cuda12.5-gcc12"
"name": "cuda12.6-gcc10"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:24.10-cpp-gcc11-cuda12.5",
"image": "rapidsai/devcontainers:24.10-cpp-gcc11-cuda12.6",
"hostRequirements": {
"gpu": "optional"
},
Expand All @@ -15,11 +15,11 @@
"SCCACHE_BUCKET": "rapids-sccache-devs",
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda12.5-gcc11",
"CCCL_CUDA_VERSION": "12.5",
"DEVCONTAINER_NAME": "cuda12.6-gcc11",
"CCCL_CUDA_VERSION": "12.6",
"CCCL_HOST_COMPILER": "gcc",
"CCCL_HOST_COMPILER_VERSION": "11",
"CCCL_BUILD_INFIX": "cuda12.5-gcc11"
"CCCL_BUILD_INFIX": "cuda12.6-gcc11"
},
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",
Expand Down Expand Up @@ -49,5 +49,5 @@
}
}
},
"name": "cuda12.5-gcc11"
"name": "cuda12.6-gcc11"
}
53 changes: 53 additions & 0 deletions .devcontainer/cuda12.6-gcc12/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:24.10-cpp-gcc12-cuda12.6",
"hostRequirements": {
"gpu": "optional"
},
"initializeCommand": [
"/bin/bash",
"-c",
"mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build;",
"if [[ -n ${WSLENV+set} ]]; then docker volume create cccl-build; else docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build fi;"
],
"containerEnv": {
"SCCACHE_REGION": "us-east-2",
"SCCACHE_BUCKET": "rapids-sccache-devs",
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda12.6-gcc12",
"CCCL_CUDA_VERSION": "12.6",
"CCCL_HOST_COMPILER": "gcc",
"CCCL_HOST_COMPILER_VERSION": "12",
"CCCL_BUILD_INFIX": "cuda12.6-gcc12"
},
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",
"mounts": [
"source=${localWorkspaceFolder}/.aws,target=/home/coder/.aws,type=bind,consistency=consistent",
"source=${localWorkspaceFolder}/.cache,target=/home/coder/.cache,type=bind,consistency=consistent",
"source=${localWorkspaceFolder}/.config,target=/home/coder/.config,type=bind,consistency=consistent",
"source=cccl-build,target=/home/coder/cccl/build"
],
"customizations": {
"vscode": {
"extensions": [
"llvm-vs-code-extensions.vscode-clangd",
"xaver.clang-format",
"nvidia.nsight-vscode-edition",
"ms-vscode.cmake-tools"
],
"settings": {
"editor.defaultFormatter": "xaver.clang-format",
"editor.formatOnSave": true,
"clang-format.executable": "/usr/bin/clang-format",
"clangd.arguments": [
"--compile-commands-dir=${workspaceFolder}"
],
"files.eol": "\n",
"files.trimTrailingWhitespace": true
}
}
},
"name": "cuda12.6-gcc12"
}
53 changes: 53 additions & 0 deletions .devcontainer/cuda12.6-gcc13/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:24.10-cpp-gcc13-cuda12.6",
"hostRequirements": {
"gpu": "optional"
},
"initializeCommand": [
"/bin/bash",
"-c",
"mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build;",
"if [[ -n ${WSLENV+set} ]]; then docker volume create cccl-build; else docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build fi;"
],
"containerEnv": {
"SCCACHE_REGION": "us-east-2",
"SCCACHE_BUCKET": "rapids-sccache-devs",
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda12.6-gcc13",
"CCCL_CUDA_VERSION": "12.6",
"CCCL_HOST_COMPILER": "gcc",
"CCCL_HOST_COMPILER_VERSION": "13",
"CCCL_BUILD_INFIX": "cuda12.6-gcc13"
},
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",
"mounts": [
"source=${localWorkspaceFolder}/.aws,target=/home/coder/.aws,type=bind,consistency=consistent",
"source=${localWorkspaceFolder}/.cache,target=/home/coder/.cache,type=bind,consistency=consistent",
"source=${localWorkspaceFolder}/.config,target=/home/coder/.config,type=bind,consistency=consistent",
"source=cccl-build,target=/home/coder/cccl/build"
],
"customizations": {
"vscode": {
"extensions": [
"llvm-vs-code-extensions.vscode-clangd",
"xaver.clang-format",
"nvidia.nsight-vscode-edition",
"ms-vscode.cmake-tools"
],
"settings": {
"editor.defaultFormatter": "xaver.clang-format",
"editor.formatOnSave": true,
"clang-format.executable": "/usr/bin/clang-format",
"clangd.arguments": [
"--compile-commands-dir=${workspaceFolder}"
],
"files.eol": "\n",
"files.trimTrailingWhitespace": true
}
}
},
"name": "cuda12.6-gcc13"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:24.10-cpp-gcc9-cuda12.5",
"image": "rapidsai/devcontainers:24.10-cpp-gcc7-cuda12.6",
"hostRequirements": {
"gpu": "optional"
},
Expand All @@ -15,11 +15,11 @@
"SCCACHE_BUCKET": "rapids-sccache-devs",
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda12.5-gcc9",
"CCCL_CUDA_VERSION": "12.5",
"DEVCONTAINER_NAME": "cuda12.6-gcc7",
"CCCL_CUDA_VERSION": "12.6",
"CCCL_HOST_COMPILER": "gcc",
"CCCL_HOST_COMPILER_VERSION": "9",
"CCCL_BUILD_INFIX": "cuda12.5-gcc9"
"CCCL_HOST_COMPILER_VERSION": "7",
"CCCL_BUILD_INFIX": "cuda12.6-gcc7"
},
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",
Expand Down Expand Up @@ -49,5 +49,5 @@
}
}
},
"name": "cuda12.5-gcc9"
"name": "cuda12.6-gcc7"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:24.10-cpp-gcc8-cuda12.5",
"image": "rapidsai/devcontainers:24.10-cpp-gcc8-cuda12.6",
"hostRequirements": {
"gpu": "optional"
},
Expand All @@ -15,11 +15,11 @@
"SCCACHE_BUCKET": "rapids-sccache-devs",
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda12.5-gcc8",
"CCCL_CUDA_VERSION": "12.5",
"DEVCONTAINER_NAME": "cuda12.6-gcc8",
"CCCL_CUDA_VERSION": "12.6",
"CCCL_HOST_COMPILER": "gcc",
"CCCL_HOST_COMPILER_VERSION": "8",
"CCCL_BUILD_INFIX": "cuda12.5-gcc8"
"CCCL_BUILD_INFIX": "cuda12.6-gcc8"
},
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",
Expand Down Expand Up @@ -49,5 +49,5 @@
}
}
},
"name": "cuda12.5-gcc8"
"name": "cuda12.6-gcc8"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:24.10-cpp-gcc7-cuda12.5",
"image": "rapidsai/devcontainers:24.10-cpp-gcc9-cuda12.6",
"hostRequirements": {
"gpu": "optional"
},
Expand All @@ -15,11 +15,11 @@
"SCCACHE_BUCKET": "rapids-sccache-devs",
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda12.5-gcc7",
"CCCL_CUDA_VERSION": "12.5",
"DEVCONTAINER_NAME": "cuda12.6-gcc9",
"CCCL_CUDA_VERSION": "12.6",
"CCCL_HOST_COMPILER": "gcc",
"CCCL_HOST_COMPILER_VERSION": "7",
"CCCL_BUILD_INFIX": "cuda12.5-gcc7"
"CCCL_HOST_COMPILER_VERSION": "9",
"CCCL_BUILD_INFIX": "cuda12.6-gcc9"
},
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",
Expand Down Expand Up @@ -49,5 +49,5 @@
}
}
},
"name": "cuda12.5-gcc7"
"name": "cuda12.6-gcc9"
}
Loading

0 comments on commit f48a49b

Please sign in to comment.