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

Fix building for CUDA 11.6 #917

Merged
merged 2 commits into from
Feb 10, 2022
Merged

Fix building for CUDA 11.6 #917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70b0355
Fix building for CUDA 11.6
csukuangfj Feb 9, 2022
27fc8c9
Minor fixes.
csukuangfj Feb 10, 2022
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
5 changes: 5 additions & 0 deletions k2/csrc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,11 @@ add_library(context ${context_srcs})
target_compile_definitions(context PUBLIC K2_TORCH_VERSION_MAJOR=${K2_TORCH_VERSION_MAJOR})
target_compile_definitions(context PUBLIC K2_TORCH_VERSION_MINOR=${K2_TORCH_VERSION_MINOR})

# see https://github.com/NVIDIA/thrust/issues/1401
# and https://github.com/k2-fsa/k2/pull/917
target_compile_definitions(context PUBLIC CUB_WRAPPED_NAMESPACE=k2)
target_compile_definitions(context PUBLIC THRUST_NS_QUALIFIER=thrust)

set_target_properties(context PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
set_target_properties(context PROPERTIES OUTPUT_NAME "k2context")

Expand Down
42 changes: 0 additions & 42 deletions k2/csrc/cub.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,50 +20,8 @@
#ifndef K2_CSRC_CUB_H_
#define K2_CSRC_CUB_H_

// See
// https://github.com/k2-fsa/k2/issues/698
// and
// https://github.com/pytorch/pytorch/issues/54245#issuecomment-805707551
// for why we need the following two macros
//
// NOTE: We define the following two macros so
// that k2 and PyTorch use a different copy
// of CUB.

#ifdef CUB_NS_PREFIX
#undef CUB_NS_PREFIX
#endif

#ifdef CUB_NS_POSTFIX
#undef CUB_NS_POSTFIX
#endif

#ifdef CUB_NS_QUALIFIER
#undef CUB_NS_QUALIFIER
#endif

// see
// https://github.com/NVIDIA/cub/commit/6631c72630f10e370d93814a59146b12f7620d85
// The above commit replaced "thrust" with "THRUST_NS_QUALIFIER"
#ifndef THRUST_NS_QUALIFIER
#define THRUST_NS_QUALIFIER thrust
#endif

#define CUB_NS_PREFIX namespace k2 {
#define CUB_NS_POSTFIX }

// See
// https://github.com/NVIDIA/cub/commit/6631c72630f10e370d93814a59146b12f7620d85
// and
// https://github.com/NVIDIA/cub/pull/350
#define CUB_NS_QUALIFIER ::k2::cub

#ifdef K2_WITH_CUDA
#include "cub/cub.cuh" // NOLINT
#endif

#undef CUB_NS_PREFIX
#undef CUB_NS_POSTFIX
#undef CUB_NS_QUALIFIER

#endif // K2_CSRC_CUB_H_