Build fails with CUDA 13

[Delicates]

Build of the latest git code (2022) fails against CUDA v13.3.0 due to the API changes in CCCL v3.0.

[6/11] /opt/cuda/bin/nvcc -forward-unknown-to-host-compiler -ccbin=/usr/x86_64-pc-linux-gnu/gcc-bin/15 -DFLANN_EXPORTS -DFLANN_USE_CUDA -D_FLANN_VERSION=1.9.2 -Iflann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp -O2 -g -DNDEBUG -std=c++17 -Xcompiler=-fPIC   -Wall -Wno-unknown-pragmas -Wno-unused-function -MD -MT src/cpp/CMakeFiles/flann_cuda.dir/flann/algorithms/kdtree_cuda_3d_index.cu.o -MF src/cpp/CMakeFiles/flann_cuda.dir/flann/algorithms/kdtree_cuda_3d_index.cu.o.d -x cu -c flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu -o src/cpp/CMakeFiles/flann_cuda.dir/flann/
algorithms/kdtree_cuda_3d_index.cu.o
FAILED: [code=2] src/cpp/CMakeFiles/flann_cuda.dir/flann/algorithms/kdtree_cuda_3d_index.cu.o 
/opt/cuda/bin/nvcc -forward-unknown-to-host-compiler -ccbin=/usr/x86_64-pc-linux-gnu/gcc-bin/15 -DFLANN_EXPORTS -DFLANN_USE_CUDA -D_FLANN_VERSION=1.9.2 -Iflann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp -O2 -g -DNDEBUG -std=c++17 -Xcompiler=-fPIC   -Wall -Wno-unknown-pragmas -Wno-unused-function -MD -MT src/cpp/CMakeFiles/flann_cuda.dir/flann/algorithms/kdtree_cuda_3d_index.cu.o -MF src/cpp/CMakeFiles/flann_cuda.dir/flann/algorithms/kdtree_cuda_3d_index.cu.o.d -x cu -c flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu -o src/cpp/CMakeFiles/flann_cuda.dir/flann/algorit
hms/kdtree_cuda_3d_index.cu.o
flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_builder.h(237): error: explicit type is missing ("int" assumed)
      bool operator()( const thrust::tuple<int,int>& i )
                             ^

flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_builder.h(237): error: qualified name is not allowed
      bool operator()( const thrust::tuple<int,int>& i )
                             ^

flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_builder.h(237): error: expected a ")"
      bool operator()( const thrust::tuple<int,int>& i )
                                          ^

flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_builder.h(239): error: namespace "thrust" has no member "get"
          return (thrust::get<1>(i)& 1)==0;
                          ^

flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_builder.h(239): error: identifier "i" is undefined
          return (thrust::get<1>(i)& 1)==0;
                                 ^

flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_builder.h(278): error: explicit type is missing ("int" assumed)
      void operator()( const thrust::tuple<int, int, int, int>& data )
                             ^

flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_builder.h(278): error: qualified name is not allowed
      void operator()( const thrust::tuple<int, int, int, int>& data )
                             ^

flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_builder.h(278): error: expected a ")"
      void operator()( const thrust::tuple<int, int, int, int>& data )
                                          ^

flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_builder.h(280): error: namespace "thrust" has no member "get"
          int index = thrust::get<0>(data);
                              ^

flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_builder.h(280): error: identifier "data" is undefined
          int index = thrust::get<0>(data);
                                     ^

flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_builder.h(282): error: namespace "thrust" has no member "get"
          int point_ind1=thrust::get<1>(data);
                                 ^

flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_builder.h(283): error: namespace "thrust" has no member "get"
          int point_ind2=thrust::get<2>(data);
                                 ^

flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_builder.h(284): error: namespace "thrust" has no member "get"
          int point_ind3=thrust::get<3>(data);
                                 ^

flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_builder.h(385): error: namespace "thrust" has no member "tuple"
      void operator()( thrust::tuple<int&, int&,SplitInfo&,float4&,float4&, int> node )
                               ^

flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_builder.h(385): error: expected a ")"
      void operator()( thrust::tuple<int&, int&,SplitInfo&,float4&,float4&, int> node )
                                    ^

flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_builder.h(387): error: namespace "thrust" has no member "get"
          int& parent=thrust::get<0>(node);
                              ^

flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_builder.h(387): error: identifier "node" is undefined
          int& parent=thrust::get<0>(node);
                                     ^

flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_builder.h(388): error: namespace "thrust" has no member "get"
          int& child1=thrust::get<1>(node);
                              ^

flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_builder.h(389): error: namespace "thrust" has no member "get"
          SplitInfo& s=thrust::get<2>(node);
                               ^

flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_builder.h(390): error: namespace "thrust" has no member "get"
          const float4& aabbMin=thrust::get<3>(node);
                                        ^

flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_builder.h(391): error: namespace "thrust" has no member "get"
          const float4& aabbMax=thrust::get<4>(node);
                                        ^

flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_builder.h(392): error: namespace "thrust" has no member "get"
          int my_index = thrust::get<5>(node);
                                 ^

flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_builder.h(489): error: qualified name is not allowed
      thrust::tuple<float,float,float> operator()( const float4& val )
      ^

flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_builder.h(489): error: this declaration has no storage class or type specifier
      thrust::tuple<float,float,float> operator()( const float4& val )
      ^

flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_builder.h(488): warning #1835-D: attribute "__device__" does not apply here
      __attribute__((device))
                     ^

Remark: The warnings can be suppressed with "-diag-suppress <warning-number>"

flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_builder.h(489): error: expected a ";"
      thrust::tuple<float,float,float> operator()( const float4& val )
                   ^

flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_builder.h(493): warning #12-D: parsing restarts here after previous syntax error
  };
  ^

flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_builder.h(596): error: namespace "thrust" has no member "make_tuple"
          thrust::transform(thrust::cuda::par.on(gpu_stream), points_->begin(), points_->end(), thrust::make_zip_iterator(thrust::make_tuple(points_x_->begin(), points_y_->begin(),points_z_->begin()) ), cuda::kd_tree_builder_detail::pointxyz_to_px_py_pz() );
                                                                                                                                  ^

flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_builder.h(657): error: namespace "thrust" has no member "make_tuple"
              thrust::for_each(thrust::cuda::par.on(gpu_stream), thrust::make_zip_iterator(thrust::make_tuple( parent_->begin(), child1_->begin(), splits_->begin(), aabb_min_->begin(), aabb_max_->begin(), cit )),
                                                                                                   ^

flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_builder.h(658): error: namespace "thrust" has no member "make_tuple"
                                thrust::make_zip_iterator(thrust::make_tuple( parent_->begin()+last_node_count, child1_->begin()+last_node_count,splits_->begin()+last_node_count, aabb_min_->begin()+last_node_count, aabb_max_->begin()+last_node_count,cit+last_node_count )),
                                                                  ^

flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_builder.h(697): error: namespace "thrust" has no member "make_tuple"
              thrust::for_each(thrust::cuda::par.on(gpu_stream), thrust::make_zip_iterator( thrust::make_tuple( ci0, index_x_->begin(), index_y_->begin(), index_z_->begin()) ),
                                                                                                    ^

flann-f9caaf609d8b8cb2b7104a85cf59eb92c275a25d/src/cpp/flann/algorithms/kdtree_cuda_builder.h(698): error: namespace "thrust" has no member "make_tuple"
                                thrust::make_zip_iterator( thrust::make_tuple( ci0+points_->size(), index_x_->end(), index_y_->end(), index_z_->end()) ),sno );

[Delicates]

CUDA 13 build fixed with the following patch:

--- a/src/cpp/flann/algorithms/kdtree_cuda_builder.h    2022-10-28 07:51:59.000000000 +1100
+++ b/src/cpp/flann/algorithms/kdtree_cuda_builder.h    2026-06-03 19:59:52.472830914 +1000
@@ -35,6 +35,7 @@
 #include <thrust/partition.h>
 #include <thrust/unique.h>
 #include <thrust/scan.h>
+#include <thrust/tuple.h>
 #include <thrust/execution_policy.h>
 #include <flann/util/cutil_math.h>
 #include <stdlib.h>