11/*
2- * Copyright (c) 2020-2024 , NVIDIA CORPORATION.
2+ * Copyright (c) 2020-2025 , NVIDIA CORPORATION.
33 *
44 * Licensed under the Apache License, Version 2.0 (the "License");
55 * you may not use this file except in compliance with the License.
2626#include < rmm/device_uvector.hpp>
2727#include < rmm/exec_policy.hpp>
2828
29+ #include < cuda/std/optional>
2930#include < thrust/binary_search.h>
3031#include < thrust/distance.h>
3132#include < thrust/execution_policy.h>
32- #include < thrust/optional.h>
3333#include < thrust/transform.h>
3434#include < thrust/transform_reduce.h>
3535#include < thrust/tuple.h>
@@ -43,18 +43,18 @@ namespace cugraph {
4343namespace detail {
4444
4545template <typename vertex_t >
46- __device__ thrust ::optional<vertex_t > major_hypersparse_idx_from_major_nocheck_impl (
46+ __device__ cuda::std ::optional<vertex_t > major_hypersparse_idx_from_major_nocheck_impl (
4747 raft::device_span<vertex_t const > dcs_nzd_vertices, vertex_t major)
4848{
4949 // we can avoid binary search (and potentially improve performance) if we add an auxiliary array
5050 // or cuco::static_map (at the expense of additional memory)
5151 auto it =
5252 thrust::lower_bound (thrust::seq, dcs_nzd_vertices.begin (), dcs_nzd_vertices.end (), major);
5353 return it != dcs_nzd_vertices.end ()
54- ? (*it == major ? thrust ::optional<vertex_t >{static_cast <vertex_t >(
54+ ? (*it == major ? cuda::std ::optional<vertex_t >{static_cast <vertex_t >(
5555 thrust::distance (dcs_nzd_vertices.begin (), it))}
56- : thrust ::nullopt)
57- : thrust ::nullopt;
56+ : cuda::std ::nullopt)
57+ : cuda::std ::nullopt;
5858}
5959
6060template <typename vertex_t , typename edge_t , typename return_type_t , bool multi_gpu, bool use_dcs>
@@ -490,7 +490,7 @@ class edge_partition_device_view_t<vertex_t, edge_t, multi_gpu, std::enable_if_t
490490 return major_value_start_offset_;
491491 }
492492
493- __host__ __device__ thrust ::optional<vertex_t > major_hypersparse_first () const noexcept
493+ __host__ __device__ cuda::std ::optional<vertex_t > major_hypersparse_first () const noexcept
494494 {
495495 return major_hypersparse_first_;
496496 }
@@ -528,15 +528,16 @@ class edge_partition_device_view_t<vertex_t, edge_t, multi_gpu, std::enable_if_t
528528 return major_range_first_ + major_offset;
529529 }
530530
531- __device__ thrust::optional<vertex_t > major_idx_from_major_nocheck (vertex_t major) const noexcept
531+ __device__ cuda::std::optional<vertex_t > major_idx_from_major_nocheck (
532+ vertex_t major) const noexcept
532533 {
533534 if (major_hypersparse_first_ && (major >= *major_hypersparse_first_)) {
534535 auto major_hypersparse_idx =
535536 detail::major_hypersparse_idx_from_major_nocheck_impl (*dcs_nzd_vertices_, major);
536537 return major_hypersparse_idx
537- ? thrust ::make_optional
538- *major_hypersparse_idx)
539- : thrust ::nullopt;
538+ ? cuda::std ::make_optional
539+ *major_hypersparse_idx)
540+ : cuda::std ::nullopt;
540541 } else {
541542 return major - major_range_first_;
542543 }
@@ -554,60 +555,60 @@ class edge_partition_device_view_t<vertex_t, edge_t, multi_gpu, std::enable_if_t
554555 }
555556
556557 // major_hypersparse_idx: index within the hypersparse segment
557- __device__ thrust ::optional<vertex_t > major_hypersparse_idx_from_major_nocheck (
558+ __device__ cuda::std ::optional<vertex_t > major_hypersparse_idx_from_major_nocheck (
558559 vertex_t major) const noexcept
559560 {
560561 if (dcs_nzd_vertices_) {
561562 return detail::major_hypersparse_idx_from_major_nocheck_impl (*dcs_nzd_vertices_, major);
562563 } else {
563- return thrust ::nullopt;
564+ return cuda::std ::nullopt;
564565 }
565566 }
566567
567568 // major_hypersparse_idx: index within the hypersparse segment
568- __device__ thrust ::optional<vertex_t > major_from_major_hypersparse_idx_nocheck (
569+ __device__ cuda::std ::optional<vertex_t > major_from_major_hypersparse_idx_nocheck (
569570 vertex_t major_hypersparse_idx) const noexcept
570571 {
571572 return dcs_nzd_vertices_
572- ? thrust ::optional<vertex_t >{(*dcs_nzd_vertices_)[major_hypersparse_idx]}
573- : thrust ::nullopt;
573+ ? cuda::std ::optional<vertex_t >{(*dcs_nzd_vertices_)[major_hypersparse_idx]}
574+ : cuda::std ::nullopt;
574575 }
575576
576577 __host__ __device__ vertex_t minor_from_minor_offset_nocheck (vertex_t minor_offset) const noexcept
577578 {
578579 return minor_range_first_ + minor_offset;
579580 }
580581
581- // FIxME: better return thrust:: optional<raft::device_span<vertex_t const>> for consistency (see
582- // dcs_nzd_range_bitmap())
583- __host__ __device__ thrust ::optional<vertex_t const *> dcs_nzd_vertices () const
582+ // FIxME: better return cuda::std:: optional<raft::device_span<vertex_t const>> for consistency
583+ // (see dcs_nzd_range_bitmap())
584+ __host__ __device__ cuda::std ::optional<vertex_t const *> dcs_nzd_vertices () const
584585 {
585- return dcs_nzd_vertices_ ? thrust ::optional<vertex_t const *>{(*dcs_nzd_vertices_).data ()}
586- : thrust ::nullopt;
586+ return dcs_nzd_vertices_ ? cuda::std ::optional<vertex_t const *>{(*dcs_nzd_vertices_).data ()}
587+ : cuda::std ::nullopt;
587588 }
588589
589- __host__ __device__ thrust ::optional<vertex_t > dcs_nzd_vertex_count () const
590+ __host__ __device__ cuda::std ::optional<vertex_t > dcs_nzd_vertex_count () const
590591 {
591592 return dcs_nzd_vertices_
592- ? thrust ::optional<vertex_t >{static_cast <vertex_t >((*dcs_nzd_vertices_).size ())}
593- : thrust ::nullopt;
593+ ? cuda::std ::optional<vertex_t >{static_cast <vertex_t >((*dcs_nzd_vertices_).size ())}
594+ : cuda::std ::nullopt;
594595 }
595596
596- __host__ __device__ thrust ::optional<raft::device_span<uint32_t const >> dcs_nzd_range_bitmap ()
597+ __host__ __device__ cuda::std ::optional<raft::device_span<uint32_t const >> dcs_nzd_range_bitmap ()
597598 const
598599 {
599600 return dcs_nzd_range_bitmap_
600- ? thrust ::make_optional<raft::device_span<uint32_t const >>(
601+ ? cuda::std ::make_optional<raft::device_span<uint32_t const >>(
601602 (*dcs_nzd_range_bitmap_).data (), (*dcs_nzd_range_bitmap_).size ())
602- : thrust ::nullopt;
603+ : cuda::std ::nullopt;
603604 }
604605
605606 private:
606607 // should be trivially copyable to device
607608
608- thrust:: optional<raft::device_span<vertex_t const >> dcs_nzd_vertices_{thrust ::nullopt};
609- thrust:: optional<raft::device_span<uint32_t const >> dcs_nzd_range_bitmap_{thrust ::nullopt};
610- thrust:: optional<vertex_t > major_hypersparse_first_{thrust ::nullopt};
609+ cuda::std:: optional<raft::device_span<vertex_t const >> dcs_nzd_vertices_{cuda::std ::nullopt};
610+ cuda::std:: optional<raft::device_span<uint32_t const >> dcs_nzd_range_bitmap_{cuda::std ::nullopt};
611+ cuda::std:: optional<vertex_t > major_hypersparse_first_{cuda::std ::nullopt};
611612
612613 vertex_t major_range_first_{0 };
613614 vertex_t major_range_last_{0 };
@@ -790,10 +791,10 @@ class edge_partition_device_view_t<vertex_t, edge_t, multi_gpu, std::enable_if_t
790791
791792 __host__ __device__ vertex_t major_value_start_offset () const { return vertex_t {0 }; }
792793
793- __host__ __device__ thrust ::optional<vertex_t > major_hypersparse_first () const noexcept
794+ __host__ __device__ cuda::std ::optional<vertex_t > major_hypersparse_first () const noexcept
794795 {
795796 assert (false );
796- return thrust ::nullopt;
797+ return cuda::std ::nullopt;
797798 }
798799
799800 __host__ __device__ constexpr vertex_t major_range_first () const noexcept { return vertex_t {0 }; }
@@ -823,7 +824,8 @@ class edge_partition_device_view_t<vertex_t, edge_t, multi_gpu, std::enable_if_t
823824 return major_offset;
824825 }
825826
826- __device__ thrust::optional<vertex_t > major_idx_from_major_nocheck (vertex_t major) const noexcept
827+ __device__ cuda::std::optional<vertex_t > major_idx_from_major_nocheck (
828+ vertex_t major) const noexcept
827829 {
828830 return major_offset_from_major_nocheck (major);
829831 }
@@ -834,34 +836,34 @@ class edge_partition_device_view_t<vertex_t, edge_t, multi_gpu, std::enable_if_t
834836 }
835837
836838 // major_hypersparse_idx: index within the hypersparse segment
837- __device__ thrust ::optional<vertex_t > major_hypersparse_idx_from_major_nocheck (
839+ __device__ cuda::std ::optional<vertex_t > major_hypersparse_idx_from_major_nocheck (
838840 vertex_t major) const noexcept
839841 {
840842 assert (false );
841- return thrust ::nullopt;
843+ return cuda::std ::nullopt;
842844 }
843845
844846 // major_hypersparse_idx: index within the hypersparse segment
845- __device__ thrust ::optional<vertex_t > major_from_major_hypersparse_idx_nocheck (
847+ __device__ cuda::std ::optional<vertex_t > major_from_major_hypersparse_idx_nocheck (
846848 vertex_t major_hypersparse_idx) const noexcept
847849 {
848850 assert (false );
849- return thrust ::nullopt;
851+ return cuda::std ::nullopt;
850852 }
851853
852854 __host__ __device__ vertex_t minor_from_minor_offset_nocheck (vertex_t minor_offset) const noexcept
853855 {
854856 return minor_offset;
855857 }
856858
857- __host__ __device__ thrust ::optional<vertex_t const *> dcs_nzd_vertices () const
859+ __host__ __device__ cuda::std ::optional<vertex_t const *> dcs_nzd_vertices () const
858860 {
859- return thrust ::nullopt;
861+ return cuda::std ::nullopt;
860862 }
861863
862- __host__ __device__ thrust ::optional<vertex_t > dcs_nzd_vertex_count () const
864+ __host__ __device__ cuda::std ::optional<vertex_t > dcs_nzd_vertex_count () const
863865 {
864- return thrust ::nullopt;
866+ return cuda::std ::nullopt;
865867 }
866868
867869 private:
0 commit comments