Skip to content

Commit d8d80e4

Browse files
robertmaynardrobertmaynard
committed
Refactor names
1 parent 5b000e8 commit d8d80e4

File tree

9 files changed

+50
-50
lines changed

9 files changed

+50
-50
lines changed

‎examples/custom_iteration_spaces.cu‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ struct under_diag final : nvbench::user_axis_space
9999
mutable std::size_t y_pos = 0;
100100
mutable std::size_t x_start = 0;
101101

102-
nvbench::detail::axis_space_iterator do_iter(axes_info info) const
102+
nvbench::detail::axis_space_iterator do_get_iter(axes_info info) const
103103
{
104104
// generate our increment function
105105
auto adv_func = [&, info](std::size_t &inc_index,
@@ -136,12 +136,12 @@ struct under_diag final : nvbench::user_axis_space
136136
diag_under);
137137
}
138138

139-
std::size_t do_size(const axes_info &info) const
139+
std::size_t do_get_size(const axes_info &info) const
140140
{
141141
return ((info[0].size * (info[1].size + 1)) / 2);
142142
}
143143

144-
std::size_t do_valid_count(const axes_info &info) const
144+
std::size_t do_get_active_count(const axes_info &info) const
145145
{
146146
return ((info[0].size * (info[1].size + 1)) / 2);
147147
}
@@ -175,7 +175,7 @@ struct gauss final : nvbench::user_axis_space
175175
std::move(output_indices))
176176
{}
177177

178-
nvbench::detail::axis_space_iterator do_iter(axes_info info) const
178+
nvbench::detail::axis_space_iterator do_get_iter(axes_info info) const
179179
{
180180
const double mid_point = static_cast<double>((info[0].size / 2));
181181

@@ -206,9 +206,9 @@ struct gauss final : nvbench::user_axis_space
206206
gauss_func);
207207
}
208208

209-
std::size_t do_size(const axes_info &info) const { return info[0].size; }
209+
std::size_t do_get_size(const axes_info &info) const { return info[0].size; }
210210

211-
std::size_t do_valid_count(const axes_info &info) const
211+
std::size_t do_get_active_count(const axes_info &info) const
212212
{
213213
return info[0].size;
214214
}

‎nvbench/axes_metadata.cuh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ namespace nvbench
3939
struct axes_metadata
4040
{
4141
using axes_type = std::vector<std::unique_ptr<nvbench::axis_base>>;
42-
using axes_iteration_space =
42+
using iteration_space_type =
4343
std::vector<std::unique_ptr<nvbench::axis_space_base>>;
4444

4545
template <typename... TypeAxes>
@@ -86,11 +86,11 @@ struct axes_metadata
8686
user_iteration_axes(std::function<nvbench::make_user_space_signature> make,
8787
std::vector<std::string> names);
8888

89-
[[nodiscard]] const axes_iteration_space &get_type_iteration_space() const
89+
[[nodiscard]] const iteration_space_type &get_type_iteration_space() const
9090
{
9191
return m_type_space;
9292
}
93-
[[nodiscard]] const axes_iteration_space &get_value_iteration_space() const
93+
[[nodiscard]] const iteration_space_type &get_value_iteration_space() const
9494
{
9595
return m_value_space;
9696
}
@@ -131,8 +131,8 @@ struct axes_metadata
131131
private:
132132
axes_type m_axes;
133133
std::size_t m_type_axe_count = 0;
134-
axes_iteration_space m_type_space;
135-
axes_iteration_space m_value_space;
134+
iteration_space_type m_type_space;
135+
iteration_space_type m_value_space;
136136
};
137137

138138
template <typename... TypeAxes>

‎nvbench/axes_metadata.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,12 +177,12 @@ get_axes_indices(std::size_t type_axe_count,
177177
}
178178

179179
void reset_iteration_space(
180-
nvbench::axes_metadata::axes_iteration_space &all_spaces,
180+
nvbench::axes_metadata::iteration_space_type &all_spaces,
181181
const std::vector<std::size_t> &indices_to_remove)
182182
{
183183
// 1. Find all spaces indices that
184-
nvbench::axes_metadata::axes_iteration_space reset_space;
185-
nvbench::axes_metadata::axes_iteration_space to_filter;
184+
nvbench::axes_metadata::iteration_space_type reset_space;
185+
nvbench::axes_metadata::iteration_space_type to_filter;
186186
for (auto &space : all_spaces)
187187
{
188188
bool added = false;

‎nvbench/axis_iteration_space.cuh‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ struct axis_space_base
4040
[[nodiscard]] std::vector<std::unique_ptr<axis_space_base>>
4141
clone_as_linear() const;
4242

43-
[[nodiscard]] detail::axis_space_iterator iter(const axes_type &axes) const;
44-
[[nodiscard]] std::size_t size(const axes_type &axes) const;
45-
[[nodiscard]] std::size_t valid_count(const axes_type &axes) const;
43+
[[nodiscard]] detail::axis_space_iterator get_iter(const axes_type &axes) const;
44+
[[nodiscard]] std::size_t get_size(const axes_type &axes) const;
45+
[[nodiscard]] std::size_t get_active_count(const axes_type &axes) const;
4646

4747
[[nodiscard]] bool contains(std::size_t input_index) const;
4848

@@ -51,9 +51,9 @@ protected:
5151
std::vector<std::size_t> m_output_indices;
5252

5353
virtual std::unique_ptr<axis_space_base> do_clone() const = 0;
54-
virtual detail::axis_space_iterator do_iter(axes_info info) const = 0;
55-
virtual std::size_t do_size(const axes_info &info) const = 0;
56-
virtual std::size_t do_valid_count(const axes_info &info) const = 0;
54+
virtual detail::axis_space_iterator do_get_iter(axes_info info) const = 0;
55+
virtual std::size_t do_get_size(const axes_info &info) const = 0;
56+
virtual std::size_t do_get_active_count(const axes_info &info) const = 0;
5757
};
5858

5959
struct linear_axis_space final : axis_space_base
@@ -62,9 +62,9 @@ struct linear_axis_space final : axis_space_base
6262
~linear_axis_space();
6363

6464
std::unique_ptr<axis_space_base> do_clone() const override;
65-
detail::axis_space_iterator do_iter(axes_info info) const override;
66-
std::size_t do_size(const axes_info &info) const override;
67-
std::size_t do_valid_count(const axes_info &info) const override;
65+
detail::axis_space_iterator do_get_iter(axes_info info) const override;
66+
std::size_t do_get_size(const axes_info &info) const override;
67+
std::size_t do_get_active_count(const axes_info &info) const override;
6868
};
6969

7070
struct zip_axis_space final : axis_space_base
@@ -74,9 +74,9 @@ struct zip_axis_space final : axis_space_base
7474
~zip_axis_space();
7575

7676
std::unique_ptr<axis_space_base> do_clone() const override;
77-
detail::axis_space_iterator do_iter(axes_info info) const override;
78-
std::size_t do_size(const axes_info &info) const override;
79-
std::size_t do_valid_count(const axes_info &info) const override;
77+
detail::axis_space_iterator do_get_iter(axes_info info) const override;
78+
std::size_t do_get_size(const axes_info &info) const override;
79+
std::size_t do_get_active_count(const axes_info &info) const override;
8080
};
8181

8282
struct user_axis_space : axis_space_base

‎nvbench/axis_iteration_space.cxx‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,19 +69,19 @@ get_axes_info(const nvbench::axis_space_base::axes_type &axes,
6969
}
7070
} // namespace
7171

72-
detail::axis_space_iterator axis_space_base::iter(const axes_type &axes) const
72+
detail::axis_space_iterator axis_space_base::get_iter(const axes_type &axes) const
7373
{
7474

75-
return this->do_iter(get_axes_info(axes, m_input_indices));
75+
return this->do_get_iter(get_axes_info(axes, m_input_indices));
7676
}
7777

78-
std::size_t axis_space_base::size(const axes_type &axes) const
78+
std::size_t axis_space_base::get_size(const axes_type &axes) const
7979
{
80-
return this->do_size(get_axes_info(axes, m_input_indices));
80+
return this->do_get_size(get_axes_info(axes, m_input_indices));
8181
}
82-
std::size_t axis_space_base::valid_count(const axes_type &axes) const
82+
std::size_t axis_space_base::get_active_count(const axes_type &axes) const
8383
{
84-
return this->do_valid_count(get_axes_info(axes, m_input_indices));
84+
return this->do_get_active_count(get_axes_info(axes, m_input_indices));
8585
}
8686

8787
bool axis_space_base::contains(std::size_t in_index) const
@@ -100,7 +100,7 @@ linear_axis_space::linear_axis_space(std::size_t in_index,
100100

101101
linear_axis_space::~linear_axis_space() = default;
102102

103-
detail::axis_space_iterator linear_axis_space::do_iter(axes_info info) const
103+
detail::axis_space_iterator linear_axis_space::do_get_iter(axes_info info) const
104104
{
105105
std::size_t loc(m_output_indices[0]);
106106
auto update_func = [=](std::size_t inc_index,
@@ -112,12 +112,12 @@ detail::axis_space_iterator linear_axis_space::do_iter(axes_info info) const
112112
return detail::make_space_iterator(1, info[0].size, update_func);
113113
}
114114

115-
std::size_t linear_axis_space::do_size(const axes_info &info) const
115+
std::size_t linear_axis_space::do_get_size(const axes_info &info) const
116116
{
117117
return info[0].size;
118118
}
119119

120-
std::size_t linear_axis_space::do_valid_count(const axes_info &info) const
120+
std::size_t linear_axis_space::do_get_active_count(const axes_info &info) const
121121
{
122122
return info[0].active_size;
123123
}
@@ -134,7 +134,7 @@ zip_axis_space::zip_axis_space(std::vector<std::size_t> input_indices,
134134

135135
zip_axis_space::~zip_axis_space() = default;
136136

137-
detail::axis_space_iterator zip_axis_space::do_iter(axes_info info) const
137+
detail::axis_space_iterator zip_axis_space::do_get_iter(axes_info info) const
138138
{
139139
std::vector<std::size_t> locs = m_output_indices;
140140
auto update_func = [=](std::size_t inc_index,
@@ -150,12 +150,12 @@ detail::axis_space_iterator zip_axis_space::do_iter(axes_info info) const
150150
return detail::make_space_iterator(locs.size(), info[0].size, update_func);
151151
}
152152

153-
std::size_t zip_axis_space::do_size(const axes_info &info) const
153+
std::size_t zip_axis_space::do_get_size(const axes_info &info) const
154154
{
155155
return info[0].size;
156156
}
157157

158-
std::size_t zip_axis_space::do_valid_count(const axes_info &info) const
158+
std::size_t zip_axis_space::do_get_active_count(const axes_info &info) const
159159
{
160160
return info[0].active_size;
161161
}

‎nvbench/benchmark_base.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,14 @@ std::size_t benchmark_base::get_config_count() const
7070
m_axes.get_value_iteration_space().cend(),
7171
std::size_t{1},
7272
std::multiplies<>{},
73-
[&axes](const auto &space) { return space->size(axes); });
73+
[&axes](const auto &space) { return space->get_size(axes); });
7474

7575
const std::size_t type_count = nvbench::detail::transform_reduce(
7676
m_axes.get_type_iteration_space().cbegin(),
7777
m_axes.get_type_iteration_space().cend(),
7878
std::size_t{1},
7979
std::multiplies<>{},
80-
[&axes](const auto &space) { return space->valid_count(axes); });
80+
[&axes](const auto &space) { return space->get_active_count(axes); });
8181

8282
return (value_count * type_count) * std::max(1UL, m_devices.size());
8383
}

‎nvbench/detail/state_generator.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,12 @@ void state_generator::build_axis_configs()
108108
std::for_each(type_space.crbegin(),
109109
type_space.crend(),
110110
[&ti, &axes_vec](const auto &space) {
111-
ti.add_iteration_space(space->iter(axes_vec));
111+
ti.add_iteration_space(space->get_iter(axes_vec));
112112
});
113113
std::for_each(value_space.begin(),
114114
value_space.end(),
115115
[&vi, &axes_vec](const auto &space) {
116-
vi.add_iteration_space(space->iter(axes_vec));
116+
vi.add_iteration_space(space->get_iter(axes_vec));
117117
});
118118
}
119119

‎testing/axes_iteration_space.cu‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ struct under_diag final : nvbench::user_axis_space
279279
mutable std::size_t y_pos = 0;
280280
mutable std::size_t x_start = 0;
281281

282-
nvbench::detail::axis_space_iterator do_iter(axes_info info) const
282+
nvbench::detail::axis_space_iterator do_get_iter(axes_info info) const
283283
{
284284
// generate our increment function
285285
auto adv_func = [&, info](std::size_t &inc_index,
@@ -316,12 +316,12 @@ struct under_diag final : nvbench::user_axis_space
316316
diag_under);
317317
}
318318

319-
std::size_t do_size(const axes_info &info) const
319+
std::size_t do_get_size(const axes_info &info) const
320320
{
321321
return ((info[0].size * (info[1].size + 1)) / 2);
322322
}
323323

324-
std::size_t do_valid_count(const axes_info &info) const
324+
std::size_t do_get_active_count(const axes_info &info) const
325325
{
326326
return ((info[0].size * (info[1].size + 1)) / 2);
327327
}

‎testing/state_generator.cu‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ void test_single_state()
6262
std::vector<std::unique_ptr<nvbench::axis_base>> axes;
6363
axes.push_back(std::make_unique<nvbench::string_axis>(si));
6464

65-
sg.add_iteration_space(nvbench::linear_axis_space{0, 0}.iter(axes));
65+
sg.add_iteration_space(nvbench::linear_axis_space{0, 0}.get_iter(axes));
6666
ASSERT(sg.get_number_of_states() == 1);
6767
sg.init();
6868
ASSERT(sg.iter_valid());
@@ -96,10 +96,10 @@ void test_basic()
9696
axes.emplace_back(std::make_unique<nvbench::string_axis>(si3));
9797
axes.emplace_back(std::make_unique<nvbench::string_axis>(si4));
9898

99-
sg.add_iteration_space(nvbench::linear_axis_space{0, 0}.iter(axes));
100-
sg.add_iteration_space(nvbench::linear_axis_space{1, 1}.iter(axes));
101-
sg.add_iteration_space(nvbench::linear_axis_space{2, 2}.iter(axes));
102-
sg.add_iteration_space(nvbench::linear_axis_space{3, 3}.iter(axes));
99+
sg.add_iteration_space(nvbench::linear_axis_space{0, 0}.get_iter(axes));
100+
sg.add_iteration_space(nvbench::linear_axis_space{1, 1}.get_iter(axes));
101+
sg.add_iteration_space(nvbench::linear_axis_space{2, 2}.get_iter(axes));
102+
sg.add_iteration_space(nvbench::linear_axis_space{3, 3}.get_iter(axes));
103103

104104
ASSERT_MSG(sg.get_number_of_states() == (2 * 3 * 3 * 2),
105105
"Actual: {} Expected: {}",

0 commit comments

Comments
 (0)