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

Use dynamic_extent from stdex. #523

Merged
merged 1 commit into from
Feb 22, 2022
Merged

Use dynamic_extent from stdex. #523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 2 deletions cpp/include/raft/detail/mdarray.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
*/
#pragma once
#include <experimental/mdspan>
#include <raft/detail/span.hpp> // dynamic_extent
#include <rmm/cuda_stream_view.hpp>
#include <rmm/device_uvector.hpp>
#include <thrust/device_ptr.h>
Expand Down Expand Up @@ -234,7 +235,7 @@ using device_accessor = accessor_mixin<AccessorPolicy, false>;

namespace stdex = std::experimental;

using vector_extent = stdex::extents<stdex::dynamic_extent>;
using matrix_extent = stdex::extents<stdex::dynamic_extent, stdex::dynamic_extent>;
using vector_extent = stdex::extents<dynamic_extent>;
using matrix_extent = stdex::extents<dynamic_extent, dynamic_extent>;
using scalar_extent = stdex::extents<1>;
} // namespace raft::detail
3 changes: 2 additions & 1 deletion cpp/include/raft/detail/span.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@
*/
#pragma once

#include <experimental/mdspan>
#include <limits> // numeric_limits
#include <thrust/host_vector.h> // __host__ __device__
#include <type_traits>

namespace raft {
constexpr std::size_t dynamic_extent = std::numeric_limits<std::size_t>::max();
constexpr std::size_t dynamic_extent = std::experimental::dynamic_extent;

template <class ElementType, bool is_device, std::size_t Extent>
class span;
Expand Down
8 changes: 4 additions & 4 deletions cpp/test/mdarray.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ void test_mdspan()
auto stream = rmm::cuda_stream_default;
rmm::device_uvector<float> a{16ul, stream};
thrust::sequence(rmm::exec_policy(stream), a.begin(), a.end());
stdex::mdspan<float, stdex::extents<stdex::dynamic_extent, stdex::dynamic_extent>> span{
stdex::mdspan<float, stdex::extents<raft::dynamic_extent, raft::dynamic_extent>> span{
a.data(), 4, 4};
thrust::device_vector<int32_t> status(1, 0);
auto p_status = status.data().get();
Expand Down Expand Up @@ -74,7 +74,7 @@ TEST(MDArray, Policy) { test_uvector_policy(); }

void test_mdarray_basic()
{
using matrix_extent = stdex::extents<stdex::dynamic_extent, stdex::dynamic_extent>;
using matrix_extent = stdex::extents<dynamic_extent, dynamic_extent>;
auto s = rmm::cuda_stream_default;
{
/**
Expand Down Expand Up @@ -180,7 +180,7 @@ TEST(MDArray, Basic) { test_mdarray_basic(); }
template <typename BasicMDarray, typename PolicyFn, typename ThrustPolicy>
void test_mdarray_copy_move(ThrustPolicy exec, PolicyFn make_policy)
{
using matrix_extent = stdex::extents<stdex::dynamic_extent, stdex::dynamic_extent>;
using matrix_extent = stdex::extents<dynamic_extent, dynamic_extent>;
layout_c_contiguous::mapping<matrix_extent> layout{matrix_extent{4, 4}};

using mdarray_t = BasicMDarray;
Expand Down Expand Up @@ -251,7 +251,7 @@ void test_mdarray_copy_move(ThrustPolicy exec, PolicyFn make_policy)

TEST(MDArray, CopyMove)
{
using matrix_extent = stdex::extents<stdex::dynamic_extent, stdex::dynamic_extent>;
using matrix_extent = stdex::extents<dynamic_extent, dynamic_extent>;
using d_matrix_t = device_mdarray<float, matrix_extent>;
using policy_t = typename d_matrix_t::container_policy_type;
auto s = rmm::cuda_stream_default;
Expand Down