Skip to content

Commit 2b730b4

Browse files
upsjMarcelKochyhmtsai
committed
review updates
- make accessor constexpr - rename device_view namespace to view Co-authored-by: Marcel Koch <marcel.koch@kit.edu> Co-authored-by: Yu-Hsiang M. Tsai <yhmtsai@gmail.com>
1 parent 0177218 commit 2b730b4

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

core/test/matrix/device_views.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ TYPED_TEST_SUITE(DenseView, gko::test::ValueTypes, TypenameNameGenerator);
1818
TYPED_TEST(DenseView, AccessWorks)
1919
{
2020
std::vector<TypeParam> values(10);
21-
gko::matrix::device_view::dense<TypeParam> view{gko::dim<2>{1, 2}, 3,
22-
values.data()};
21+
gko::matrix::view::dense<TypeParam> view{gko::dim<2>{1, 2}, 3,
22+
values.data()};
2323

2424
ASSERT_EQ(view.size, gko::dim<2>(1, 2));
2525
ASSERT_EQ(view.stride, 3);

include/ginkgo/core/matrix/dense.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@ class Dense
186186
using absolute_type = remove_complex<Dense>;
187187
using real_type = absolute_type;
188188
using complex_type = to_complex<Dense>;
189-
using device_view = matrix::device_view::dense<value_type>;
190-
using const_device_view = matrix::device_view::dense<const value_type>;
189+
using device_view = matrix::view::dense<value_type>;
190+
using const_device_view = matrix::view::dense<const value_type>;
191191

192192
using row_major_range = gko::range<gko::accessor::row_major<ValueType, 2>>;
193193

include/ginkgo/core/matrix/device_views.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010

1111
namespace gko {
1212
namespace matrix {
13-
namespace device_view {
13+
namespace view {
1414

1515

1616
/**
17-
* non-owning view of a matrix::Dense to be used inside device kernels.
17+
* Non-owning view of a matrix::Dense to be used inside device kernels.
1818
* This type is used to provide a simple and stable ABI for passing data between
1919
* libraries.
2020
*
@@ -26,14 +26,14 @@ struct dense {
2626
size_type stride;
2727
ValueType* data;
2828

29-
ValueType& operator()(size_type row, size_type col) const
29+
constexpr ValueType& operator()(size_type row, size_type col) const
3030
{
3131
return data[row * stride + col];
3232
}
3333
};
3434

3535

36-
} // namespace device_view
36+
} // namespace view
3737
} // namespace matrix
3838
} // namespace gko
3939

0 commit comments

Comments
 (0)