From a8ee4eea826f60dcfce2874324d60f6d1c696b08 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Thu, 13 Oct 2022 11:17:10 -0400 Subject: [PATCH] Add thrust output iterator fix to rapids-cmake thrust patches Fixes https://github.com/NVIDIA/thrust/pull/1805 --- .../transform_iter_with_reduce_by_key.diff | 26 +++++++++++++++++++ rapids-cmake/cpm/versions.json | 5 ++++ 2 files changed, 31 insertions(+) create mode 100644 rapids-cmake/cpm/patches/Thrust/transform_iter_with_reduce_by_key.diff diff --git a/rapids-cmake/cpm/patches/Thrust/transform_iter_with_reduce_by_key.diff b/rapids-cmake/cpm/patches/Thrust/transform_iter_with_reduce_by_key.diff new file mode 100644 index 00000000..035da3ef --- /dev/null +++ b/rapids-cmake/cpm/patches/Thrust/transform_iter_with_reduce_by_key.diff @@ -0,0 +1,26 @@ +diff --git a/thrust/iterator/transform_input_output_iterator.h b/thrust/iterator/transform_input_output_iterator.h +index f512a36..a5f725d 100644 +--- a/thrust/iterator/transform_input_output_iterator.h ++++ b/thrust/iterator/transform_input_output_iterator.h +@@ -102,6 +102,8 @@ template + /*! \endcond + */ + ++ transform_input_output_iterator() = default; ++ + /*! This constructor takes as argument a \c Iterator an \c InputFunction and an + * \c OutputFunction and copies them to a new \p transform_input_output_iterator + * +diff --git a/thrust/iterator/transform_output_iterator.h b/thrust/iterator/transform_output_iterator.h +index 66fb46a..4a68cb5 100644 +--- a/thrust/iterator/transform_output_iterator.h ++++ b/thrust/iterator/transform_output_iterator.h +@@ -104,6 +104,8 @@ template + /*! \endcond + */ + ++ transform_output_iterator() = default; ++ + /*! This constructor takes as argument an \c OutputIterator and an \c + * UnaryFunction and copies them to a new \p transform_output_iterator + * diff --git a/rapids-cmake/cpm/versions.json b/rapids-cmake/cpm/versions.json index 6e9b4aa7..850510b3 100644 --- a/rapids-cmake/cpm/versions.json +++ b/rapids-cmake/cpm/versions.json @@ -36,6 +36,11 @@ "git_url" : "https://github.com/NVIDIA/thrust.git", "git_tag" : "${version}", "patches" : [ + { + "file" : "Thrust/transform_iter_with_reduce_by_key.diff", + "issue" : "Support transform iterator with reduce by key [https://github.com/NVIDIA/thrust/pull/1805]", + "fixed_in" : "2.1" + }, { "file" : "Thrust/install_rules.diff", "issue" : "Thrust 1.X installs incorrect files [https://github.com/NVIDIA/thrust/issues/1790]",