diff --git a/.devcontainer/cuda12.0-gcc7/devcontainer.json b/.devcontainer/cuda12.0-gcc7/devcontainer.json deleted file mode 100644 index 96a32136eb1..00000000000 --- a/.devcontainer/cuda12.0-gcc7/devcontainer.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:25.02-cpp-gcc7-cuda12.0", - "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", - "AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs", - "HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history", - "DEVCONTAINER_NAME": "cuda12.0-gcc7", - "CCCL_CUDA_VERSION": "12.0", - "CCCL_HOST_COMPILER": "gcc", - "CCCL_HOST_COMPILER_VERSION": "7", - "CCCL_BUILD_INFIX": "cuda12.0-gcc7", - "CCCL_CUDA_EXTENDED": "false" - }, - "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.0-gcc7" -} diff --git a/.devcontainer/cuda12.0-gcc8/devcontainer.json b/.devcontainer/cuda12.0-gcc8/devcontainer.json deleted file mode 100644 index 9cfe4709e07..00000000000 --- a/.devcontainer/cuda12.0-gcc8/devcontainer.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:25.02-cpp-gcc8-cuda12.0", - "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", - "AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs", - "HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history", - "DEVCONTAINER_NAME": "cuda12.0-gcc8", - "CCCL_CUDA_VERSION": "12.0", - "CCCL_HOST_COMPILER": "gcc", - "CCCL_HOST_COMPILER_VERSION": "8", - "CCCL_BUILD_INFIX": "cuda12.0-gcc8", - "CCCL_CUDA_EXTENDED": "false" - }, - "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.0-gcc8" -} diff --git a/cub/benchmarks/bench/reduce/custom.cu b/cub/benchmarks/bench/reduce/custom.cu deleted file mode 100644 index 0203ef60b8c..00000000000 --- a/cub/benchmarks/bench/reduce/custom.cu +++ /dev/null @@ -1,42 +0,0 @@ -/****************************************************************************** - * Copyright (c) 2011-2023, NVIDIA CORPORATION. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the NVIDIA CORPORATION nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL NVIDIA CORPORATION BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - ******************************************************************************/ - -// This benchmark uses a custom reduction operation, max_t, which is not known to CUB, so no operator specific -// optimizations (e.g. using redux or DPX instructions) are performed. This benchmark covers the unoptimized code path. - -// Because CUB cannot detect this operator, we cannot add any tunings based on the results of this benchmark. Its main -// use is to detect regressions. - -#include - -// %RANGE% TUNE_ITEMS_PER_THREAD ipt 7:24:1 -// %RANGE% TUNE_THREADS_PER_BLOCK tpb 128:1024:32 -// %RANGE% TUNE_ITEMS_PER_VEC_LOAD_POW2 ipv 1:2:1 - -using value_types = all_types; -using op_t = max_t; -#include "base.cuh" diff --git a/libcudacxx/include/cuda/std/__cccl/builtin.h b/libcudacxx/include/cuda/std/__cccl/builtin.h index 71458700c7c..95f3d5040d5 100644 --- a/libcudacxx/include/cuda/std/__cccl/builtin.h +++ b/libcudacxx/include/cuda/std/__cccl/builtin.h @@ -245,24 +245,6 @@ # define _CCCL_BUILTIN_EXPECT(...) __builtin_expect(__VA_ARGS__) #endif // _CCCL_CHECK_BUILTIN(builtin_expect) -#if _CCCL_CHECK_BUILTIN(builtin_add_overflow) -# define _CCCL_BUILTIN_ADD_OVERFLOW(...) __builtin_add_overflow(__VA_ARGS__) -#endif // _CCCL_CHECK_BUILTIN(builtin_add_overflow) - -#if _CCCL_CHECK_BUILTIN(builtin_sub_overflow) -# define _CCCL_BUILTIN_SUB_OVERFLOW(...) __builtin_sub_overflow(__VA_ARGS__) -#endif // _CCCL_CHECK_BUILTIN(builtin_sub_overflow) - -#if _CCCL_CHECK_BUILTIN(builtin_mul_overflow) -# define _CCCL_BUILTIN_MUL_OVERFLOW(...) __builtin_mul_overflow(__VA_ARGS__) -#endif // _CCCL_CHECK_BUILTIN(builtin_mul_overflow) - -#if _CCCL_CUDA_COMPILER(NVCC) -# undef _CCCL_BUILTIN_ADD_OVERFLOW -# undef _CCCL_BUILTIN_SUB_OVERFLOW -# undef _CCCL_BUILTIN_MUL_OVERFLOW -#endif // _CCCL_CUDA_COMPILER(NVCC) - #if _CCCL_CHECK_BUILTIN(builtin_floor) || _CCCL_COMPILER(GCC) # define _CCCL_BUILTIN_FLOORF(...) __builtin_floorf(__VA_ARGS__) # define _CCCL_BUILTIN_FLOOR(...) __builtin_floor(__VA_ARGS__)