NVIDIA/nvbench
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvbench.git synced 2026-04-20 14:58:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring / renaming.

Browse Source
This commit is contained in:
Allison Piper
2025-05-02 20:30:23 +00:00
parent a2bf266e16
commit c8909c7d1b
13 changed files with 231 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
testing/axes_iteration_space.cu
View File

@@ -188,13 +188,13 @@ struct under_diag final : nvbench::user_axis_space
mutable std::size_t y_pos = 0;
mutable std::size_t x_start = 0;
nvbench::detail::axis_space_iterator do_get_iterator(axes_info info) const
nvbench::detail::axis_space_iterator do_get_iterator(axis_value_indices info) const
{
// generate our increment function
auto adv_func = [&, info](std::size_t &inc_index, std::size_t /*len*/) -> bool {
inc_index++;
x_pos++;
if (x_pos == info[0].size)
if (x_pos == info[0].axis_size)
{
x_pos = ++x_start;
y_pos = x_start;
@@ -204,25 +204,24 @@ struct under_diag final : nvbench::user_axis_space
};
// our update function
auto diag_under = [&, info](std::size_t,
std::vector<nvbench::detail::axis_index>::iterator start,
std::vector<nvbench::detail::axis_index>::iterator end) {
start->index = x_pos;
end->index = y_pos;
};
auto diag_under =
[&, info](std::size_t, axis_value_indices::iterator start, axis_value_indices::iterator end) {
start->value_index = x_pos;
end->value_index = y_pos;
};
const size_t iteration_length = ((info[0].size * (info[1].size + 1)) / 2);
const size_t iteration_length = ((info[0].axis_size * (info[1].axis_size + 1)) / 2);
return nvbench::detail::axis_space_iterator(info, iteration_length, adv_func, diag_under);
}
std::size_t do_get_size(const axes_info &info) const
std::size_t do_get_size(const axis_value_indices &info) const
{
return ((info[0].size * (info[1].size + 1)) / 2);
return ((info[0].axis_size * (info[1].axis_size + 1)) / 2);
}
std::size_t do_get_active_count(const axes_info &info) const
std::size_t do_get_active_count(const axis_value_indices &info) const
{
return ((info[0].size * (info[1].size + 1)) / 2);
return ((info[0].axis_size * (info[1].axis_size + 1)) / 2);
}
std::unique_ptr<nvbench::iteration_space_base> do_clone() const

21
testing/state_generator.cu
View File

@@ -65,11 +65,12 @@ void test_single_state()
ASSERT(sg.get_number_of_states() == 1);
sg.init();
ASSERT(sg.iter_valid());
ASSERT(sg.get_current_indices().size() == 1);
ASSERT(sg.get_current_indices()[0].name == "OnlyAxis");
ASSERT(sg.get_current_indices()[0].index == 0);
ASSERT(sg.get_current_indices()[0].size == 1);
ASSERT(sg.get_current_indices()[0].type == nvbench::axis_type::string);
ASSERT(sg.get_current_axis_value_indices().size() == 1);
ASSERT(sg.get_current_axis_value_indices()[0].axis_name == "OnlyAxis");
ASSERT(sg.get_current_axis_value_indices()[0].axis_size == 1);
ASSERT(sg.get_current_axis_value_indices()[0].axis_active_size == 1);
ASSERT(sg.get_current_axis_value_indices()[0].axis_type == nvbench::axis_type::string);
ASSERT(sg.get_current_axis_value_indices()[0].value_index == 0);
sg.next();
ASSERT(!sg.iter_valid());
@@ -112,14 +113,14 @@ void test_basic()
{
line.clear();
fmt::format_to(std::back_inserter(line), "| {:^2}", line_num++);
for (auto &axis_index : sg.get_current_indices())
for (auto &axis_value : sg.get_current_axis_value_indices())
{
ASSERT(axis_index.type == nvbench::axis_type::string);
ASSERT(axis_value.axis_type == nvbench::axis_type::string);
fmt::format_to(std::back_inserter(line),
" | {}: {}/{}",
axis_index.name,
axis_index.index,
axis_index.size);
axis_value.axis_name,
axis_value.value_index,
axis_value.axis_size);
}
fmt::format_to(std::back_inserter(buffer), "{} |\n", fmt::to_string(line));
}