Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop CUB's util_compiler.cuh #3302

Merged
merged 1 commit into from
Jan 9, 2025
Merged

Drop CUB's util_compiler.cuh #3302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion cub/cub/config.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
#endif // no system header

#include <cub/util_arch.cuh> // IWYU pragma: export
#include <cub/util_compiler.cuh> // IWYU pragma: export
#include <cub/util_cpp_dialect.cuh> // IWYU pragma: export
#include <cub/util_macro.cuh> // IWYU pragma: export
#include <cub/util_namespace.cuh> // IWYU pragma: export
66 changes: 0 additions & 66 deletions cub/cub/util_compiler.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,69 +42,3 @@
#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
# pragma system_header
#endif // no system header

// enumerate host compilers we know about
//! deprecated [Since 2.7]
#define CUB_HOST_COMPILER_UNKNOWN 0
//! deprecated [Since 2.7]
#define CUB_HOST_COMPILER_MSVC 1
//! deprecated [Since 2.7]
#define CUB_HOST_COMPILER_GCC 2
//! deprecated [Since 2.7]
#define CUB_HOST_COMPILER_CLANG 3

// enumerate device compilers we know about
//! deprecated [Since 2.7]
#define CUB_DEVICE_COMPILER_UNKNOWN 0
//! deprecated [Since 2.7]
#define CUB_DEVICE_COMPILER_MSVC 1
//! deprecated [Since 2.7]
#define CUB_DEVICE_COMPILER_GCC 2
//! deprecated [Since 2.7]
#define CUB_DEVICE_COMPILER_NVCC 3
//! deprecated [Since 2.7]
#define CUB_DEVICE_COMPILER_CLANG 4

// figure out which host compiler we're using
#if _CCCL_COMPILER(MSVC)
//! deprecated [Since 2.7]
# define CUB_HOST_COMPILER CUB_HOST_COMPILER_MSVC
//! deprecated [Since 2.7]
# define CUB_MSVC_VERSION _MSC_VER
//! deprecated [Since 2.7]
# define CUB_MSVC_VERSION_FULL _MSC_FULL_VER
#elif _CCCL_COMPILER(CLANG)
//! deprecated [Since 2.7]
# define CUB_HOST_COMPILER CUB_HOST_COMPILER_CLANG
//! deprecated [Since 2.7]
# define CUB_CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__)
#elif _CCCL_COMPILER(GCC)
//! deprecated [Since 2.7]
# define CUB_HOST_COMPILER CUB_HOST_COMPILER_GCC
//! deprecated [Since 2.7]
# define CUB_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
#endif

// figure out which device compiler we're using
#if _CCCL_CUDA_COMPILER(NVCC) || _CCCL_CUDA_COMPILER(NVHPC)
//! deprecated [Since 2.7]
# define CUB_DEVICE_COMPILER CUB_DEVICE_COMPILER_NVCC
#elif _CCCL_COMPILER(MSVC)
//! deprecated [Since 2.7]
# define CUB_DEVICE_COMPILER CUB_DEVICE_COMPILER_MSVC
#elif _CCCL_COMPILER(GCC)
//! deprecated [Since 2.7]
# define CUB_DEVICE_COMPILER CUB_DEVICE_COMPILER_GCC
#elif _CCCL_COMPILER(CLANG)
// CUDA-capable clang should behave similar to NVCC.
# if _CCCL_CUDA_COMPILER(NVCC)
//! deprecated [Since 2.7]
# define CUB_DEVICE_COMPILER CUB_DEVICE_COMPILER_NVCC
# else
//! deprecated [Since 2.7]
# define CUB_DEVICE_COMPILER CUB_DEVICE_COMPILER_CLANG
# endif
#else
//! deprecated [Since 2.7]
# define CUB_DEVICE_COMPILER CUB_DEVICE_COMPILER_UNKNOWN
#endif
2 changes: 0 additions & 2 deletions cub/cub/util_cpp_dialect.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@
# pragma system_header
#endif // no system header

#include <cub/util_compiler.cuh> // IWYU pragma: export

#ifndef _CCCL_DOXYGEN_INVOKED // Do not document

// Deprecation warnings may be silenced by defining the following macros. These
Expand Down
1 change: 0 additions & 1 deletion cub/test/test_warning_suppression.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@

#pragma once

#include <cub/util_compiler.cuh>
#include <cub/util_cpp_dialect.cuh>

// C4127: conditional expression is constant
Expand Down
Loading