From 40bb4bcc21e65b308884ca1be5dc0efa30c465c6 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Tue, 18 Jan 2022 17:51:34 -0500 Subject: [PATCH] Remove libcudacxx patch needed for nvcc 11.4 (#446) The `libcudacxx.patch` was required to fix issues with libcudacxx 1.6 and incorrect detection of the arm nvcc 11.4 compiler. As rapids-cmake has moved to libcudacxx 1.7 this patch is not needed, and should be removed. Authors: - Robert Maynard (https://github.com/robertmaynard) Approvers: - Corey J. Nolet (https://github.com/cjnolet) URL: https://github.com/rapidsai/raft/pull/446 --- cpp/cmake/libcudacxx.patch | 21 --------------------- cpp/cmake/thirdparty/get_libcudacxx.cmake | 5 +---- 2 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 cpp/cmake/libcudacxx.patch diff --git a/cpp/cmake/libcudacxx.patch b/cpp/cmake/libcudacxx.patch deleted file mode 100644 index 3cdc40ef08..0000000000 --- a/cpp/cmake/libcudacxx.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/include/cuda/std/detail/__config b/include/cuda/std/detail/__config -index d55a43688..654142d7e 100644 ---- a/include/cuda/std/detail/__config -+++ b/include/cuda/std/detail/__config -@@ -23,7 +23,7 @@ - #define _LIBCUDACXX_CUDACC_VER_MINOR __CUDACC_VER_MINOR__ - #define _LIBCUDACXX_CUDACC_VER_BUILD __CUDACC_VER_BUILD__ - #define _LIBCUDACXX_CUDACC_VER \ -- _LIBCUDACXX_CUDACC_VER_MAJOR * 10000 + _LIBCUDACXX_CUDACC_VER_MINOR * 100 + \ -+ _LIBCUDACXX_CUDACC_VER_MAJOR * 100000 + _LIBCUDACXX_CUDACC_VER_MINOR * 1000 + \ - _LIBCUDACXX_CUDACC_VER_BUILD - - #define _LIBCUDACXX_HAS_NO_LONG_DOUBLE -@@ -64,7 +64,7 @@ - # endif - #endif - --#if defined(_LIBCUDACXX_COMPILER_MSVC) || (defined(_LIBCUDACXX_CUDACC_VER) && (_LIBCUDACXX_CUDACC_VER < 110500)) -+#if defined(_LIBCUDACXX_COMPILER_MSVC) || (defined(_LIBCUDACXX_CUDACC_VER) && (_LIBCUDACXX_CUDACC_VER < 1105000)) - # define _LIBCUDACXX_HAS_NO_INT128 - #endif diff --git a/cpp/cmake/thirdparty/get_libcudacxx.cmake b/cpp/cmake/thirdparty/get_libcudacxx.cmake index e18b912ba7..5343250dca 100644 --- a/cpp/cmake/thirdparty/get_libcudacxx.cmake +++ b/cpp/cmake/thirdparty/get_libcudacxx.cmake @@ -16,10 +16,7 @@ function(find_and_configure_libcudacxx) include(${rapids-cmake-dir}/cpm/libcudacxx.cmake) - rapids_cpm_libcudacxx( - BUILD_EXPORT_SET raft-exports INSTALL_EXPORT_SET raft-exports PATCH_COMMAND patch - --reject-file=- -p1 -N < ${RAFT_SOURCE_DIR}/cmake/libcudacxx.patch || true - ) + rapids_cpm_libcudacxx(BUILD_EXPORT_SET raft-exports INSTALL_EXPORT_SET raft-exports) endfunction()