Skip to content

GitLab

Commit 7887c0ac authored by Jianfeng yan's avatar Jianfeng yan
Browse files

rename num_accesses to num_access

parent f8301636
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 24 deletions
include/ck/tensor_operation/gpu/thread/threadwise_tensor_slice_transfer_v6r1.hpp
View file @ 7887c0ac
......@@ -82,9 +82,9 @@ struct ThreadwiseTensorSliceTransfer_v6r1
remove_cv_t<decltype(scalar_per_access)>>;
// loop over space-filling curve
constexpr auto num_accesses = SpaceFillingCurve::GetNumOfAccess();
constexpr auto num_access = SpaceFillingCurve::GetNumOfAccess();
static_for<0, num_accesses, 1>{}([&](auto idx_1d) {
static_for<0, num_access, 1>{}([&](auto idx_1d) {
using src_vector_type = vector_type_maker_t<SrcData, ScalarPerVector>;
using src_vector_t = typename src_vector_type::type;
......@@ -116,7 +116,7 @@ struct ThreadwiseTensorSliceTransfer_v6r1
dst_vector_container.template AsType<dst_vector_t>()[I0]);
// move coordinate
if constexpr(idx_1d.value != num_accesses - 1)
if constexpr(idx_1d.value != num_access - 1)
{
constexpr auto forward_step = SpaceFillingCurve::GetForwardStep(idx_1d);
move_tensor_coordinate(
......@@ -153,15 +153,15 @@ struct ThreadwiseTensorSliceTransfer_v6r1
DimAccessOrder,
remove_cv_t<decltype(scalar_per_access)>>;
constexpr auto num_accesses = SpaceFillingCurve::GetNumOfAccess();
if constexpr(num_accesses == 0)
constexpr auto num_access = SpaceFillingCurve::GetNumOfAccess();
if constexpr(num_access == 0)
{
return typename SpaceFillingCurve::Index{};
}
else
{
constexpr auto reset_step =
SpaceFillingCurve::GetStepBetween(Number<num_accesses - 1>{}, Number<0>{});
SpaceFillingCurve::GetStepBetween(Number<num_access - 1>{}, Number<0>{});
return reset_step;
}
......
include/ck/tensor_operation/gpu/thread/threadwise_tensor_slice_transfer_v6r2.hpp
View file @ 7887c0ac
......@@ -97,10 +97,10 @@ struct ThreadwiseTensorSliceTransfer_v6r2
DimAccessOrder,
remove_cv_t<decltype(scalar_per_access)>>;
constexpr auto num_accesses = SpaceFillingCurve::GetNumOfAccess();
constexpr auto num_access = SpaceFillingCurve::GetNumOfAccess();
// loop over space-filling curve
static_for<0, num_accesses, 1>{}([&](auto idx_1d) {
static_for<0, num_access, 1>{}([&](auto idx_1d) {
using src0_vector_type = vector_type_maker_t<Src0Data, ScalarPerVector>;
using src0_vector_t = typename src0_vector_type::type;
......@@ -142,7 +142,7 @@ struct ThreadwiseTensorSliceTransfer_v6r2
dst_vector_container.template AsType<dst_vector_t>()[I0]);
// move coordinate
if constexpr(idx_1d.value != num_accesses - 1)
if constexpr(idx_1d.value != num_access - 1)
{
constexpr auto forward_step = SpaceFillingCurve::GetForwardStep(idx_1d);
move_tensor_coordinate(
......@@ -189,15 +189,15 @@ struct ThreadwiseTensorSliceTransfer_v6r2
DimAccessOrder,
remove_cv_t<decltype(scalar_per_access)>>;
constexpr auto num_accesses = SpaceFillingCurve::GetNumOfAccess();
if constexpr(num_accesses == 0)
constexpr auto num_access = SpaceFillingCurve::GetNumOfAccess();
if constexpr(num_access == 0)
{
return typename SpaceFillingCurve::Index{};
}
else
{
constexpr auto reset_step =
SpaceFillingCurve::GetStepBetween(Number<num_accesses - 1>{}, Number<0>{});
SpaceFillingCurve::GetStepBetween(Number<num_access - 1>{}, Number<0>{});
return reset_step;
}
......
include/ck/tensor_operation/gpu/thread/threadwise_tensor_slice_transfer_v6r3.hpp
View file @ 7887c0ac
......@@ -112,10 +112,10 @@ struct ThreadwiseTensorSliceTransfer_v6r3
DimAccessOrder,
remove_cv_t<decltype(scalar_per_access)>>;
constexpr auto num_accesses = SpaceFillingCurve::GetNumOfAccess();
constexpr auto num_access = SpaceFillingCurve::GetNumOfAccess();
// loop over space-filling curve
static_for<0, num_accesses, 1>{}([&](auto idx_1d) {
static_for<0, num_access, 1>{}([&](auto idx_1d) {
using src0_vector_type = vector_type_maker_t<Src0Data, ScalarPerVector>;
using src0_vector_t = typename src0_vector_type::type;
......@@ -166,7 +166,7 @@ struct ThreadwiseTensorSliceTransfer_v6r3
dst_vector_container.template AsType<dst_vector_t>()[I0]);
// move coordinate
if constexpr(idx_1d.value != num_accesses - 1)
if constexpr(idx_1d.value != num_access - 1)
{
constexpr auto forward_step = SpaceFillingCurve::GetForwardStep(idx_1d);
move_tensor_coordinate(
......@@ -223,15 +223,15 @@ struct ThreadwiseTensorSliceTransfer_v6r3
DimAccessOrder,
remove_cv_t<decltype(scalar_per_access)>>;
constexpr auto num_accesses = SpaceFillingCurve::GetNumOfAccess();
if constexpr(num_accesses == 0)
constexpr auto num_access = SpaceFillingCurve::GetNumOfAccess();
if constexpr(num_access == 0)
{
return typename SpaceFillingCurve::Index{};
}
else
{
constexpr auto reset_step =
SpaceFillingCurve::GetStepBetween(Number<num_accesses - 1>{}, Number<0>{});
SpaceFillingCurve::GetStepBetween(Number<num_access - 1>{}, Number<0>{});
return reset_step;
}
......
test/space_filling_curve/space_filling_curve.cpp
View file @ 7887c0ac
......@@ -95,13 +95,13 @@ void traverse_using_space_filling_curve()
make_tuple(12, 2, 6),
make_tuple(12, 0, 6));
constexpr index_t num_accesses = SpaceFillingCurve::GetNumOfAccess();
constexpr index_t num_access = SpaceFillingCurve::GetNumOfAccess();
static_assert(num_accesses == reduce_on_sequence(TensorLengths{} / ScalarsPerAccess{},
math::multiplies{},
Number<1>{}));
static_assert(num_access == reduce_on_sequence(TensorLengths{} / ScalarsPerAccess{},
math::multiplies{},
Number<1>{}));
static_for<1, num_accesses, 1>{}([&](auto i) {
static_for<1, num_access, 1>{}([&](auto i) {
constexpr auto idx_curr = SpaceFillingCurve::GetIndex(i);
static_assert(idx_curr[I0] == expected[i][I0]);
......@@ -115,7 +115,7 @@ void traverse_using_space_filling_curve()
static_assert(backward_step[I2] == expected_step[I2]);
});
static_for<0, num_accesses - 1, 1>{}([&](auto i) {
static_for<0, num_access - 1, 1>{}([&](auto i) {
constexpr auto idx_curr = SpaceFillingCurve::GetIndex(i);
static_assert(idx_curr[I0] == expected[i][I0]);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment