Skip to content

Commit ba8356f

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

File tree

9 files changed

+85
-85
lines changed

9 files changed

+85
-85
lines changed

‎examples/custom_iteration_spaces.cu‎

Lines changed: 11 additions & 11 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_iterator(axes_info info) const
103103
{
104104
// generate our increment function
105105
auto adv_func = [&, info](std::size_t &inc_index,
@@ -136,17 +136,17 @@ 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
}
148148

149-
std::unique_ptr<nvbench::axis_space_base> do_clone() const
149+
std::unique_ptr<nvbench::iteration_space_base> do_clone() const
150150
{
151151
return std::make_unique<under_diag>(*this);
152152
}
@@ -155,7 +155,7 @@ struct under_diag final : nvbench::user_axis_space
155155
NVBENCH_BENCH(copy_sweep_grid_shape)
156156
.set_name("user_copy_sweep_grid_shape")
157157
.add_user_iteration_axes(
158-
[](auto... args) -> std::unique_ptr<nvbench::axis_space_base> {
158+
[](auto... args) -> std::unique_ptr<nvbench::iteration_space_base> {
159159
return std::make_unique<under_diag>(args...);
160160
},
161161
nvbench::int64_axis("BlockSize", {64, 128, 256, 512, 1024}),
@@ -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_iterator(axes_info info) const
179179
{
180180
const double mid_point = static_cast<double>((info[0].size / 2));
181181

@@ -206,14 +206,14 @@ 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
}
215215

216-
std::unique_ptr<axis_space_base> do_clone() const
216+
std::unique_ptr<iteration_space_base> do_clone() const
217217
{
218218
return std::make_unique<gauss>(*this);
219219
}
@@ -232,12 +232,12 @@ void dual_float64_axis(nvbench::state &state)
232232
}
233233
NVBENCH_BENCH(dual_float64_axis)
234234
.add_user_iteration_axes(
235-
[](auto... args) -> std::unique_ptr<nvbench::axis_space_base> {
235+
[](auto... args) -> std::unique_ptr<nvbench::iteration_space_base> {
236236
return std::make_unique<gauss>(args...);
237237
},
238238
nvbench::float64_axis("Duration_A", nvbench::range(0., 1e-4, 1e-5)))
239239
.add_user_iteration_axes(
240-
[](auto... args) -> std::unique_ptr<nvbench::axis_space_base> {
240+
[](auto... args) -> std::unique_ptr<nvbench::iteration_space_base> {
241241
return std::make_unique<gauss>(args...);
242242
},
243243
nvbench::float64_axis("Duration_B", nvbench::range(0., 1e-4, 1e-5)));

‎nvbench/axes_metadata.cuh‎

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

4545
template <typename... TypeAxes>
4646
explicit axes_metadata(nvbench::type_list<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: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
namespace nvbench
2424
{
2525

26-
struct axis_space_base
26+
struct iteration_space_base
2727
{
2828
using axes_type = std::vector<std::unique_ptr<nvbench::axis_base>>;
2929
using axes_info = std::vector<detail::axis_index>;
@@ -32,62 +32,62 @@ struct axis_space_base
3232
nvbench::detail::axis_space_iterator::AdvanceSignature;
3333
using UpdateSignature = nvbench::detail::axis_space_iterator::UpdateSignature;
3434

35-
axis_space_base(std::vector<std::size_t> input_indices,
35+
iteration_space_base(std::vector<std::size_t> input_indices,
3636
std::vector<std::size_t> output_indices);
37-
virtual ~axis_space_base();
37+
virtual ~iteration_space_base();
3838

39-
[[nodiscard]] std::unique_ptr<axis_space_base> clone() const;
40-
[[nodiscard]] std::vector<std::unique_ptr<axis_space_base>>
39+
[[nodiscard]] std::unique_ptr<iteration_space_base> clone() const;
40+
[[nodiscard]] std::vector<std::unique_ptr<iteration_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_iterator(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

4949
protected:
5050
std::vector<std::size_t> m_input_indices;
5151
std::vector<std::size_t> m_output_indices;
5252

53-
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;
53+
virtual std::unique_ptr<iteration_space_base> do_clone() const = 0;
54+
virtual detail::axis_space_iterator do_get_iterator(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

59-
struct linear_axis_space final : axis_space_base
59+
struct linear_axis_space final : iteration_space_base
6060
{
6161
linear_axis_space(std::size_t in, std::size_t out);
6262
~linear_axis_space();
6363

64-
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;
64+
std::unique_ptr<iteration_space_base> do_clone() const override;
65+
detail::axis_space_iterator do_get_iterator(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

70-
struct zip_axis_space final : axis_space_base
70+
struct zip_axis_space final : iteration_space_base
7171
{
7272
zip_axis_space(std::vector<std::size_t> input_indices,
7373
std::vector<std::size_t> output_indices);
7474
~zip_axis_space();
7575

76-
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;
76+
std::unique_ptr<iteration_space_base> do_clone() const override;
77+
detail::axis_space_iterator do_get_iterator(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

82-
struct user_axis_space : axis_space_base
82+
struct user_axis_space : iteration_space_base
8383
{
8484
user_axis_space(std::vector<std::size_t> input_indices,
8585
std::vector<std::size_t> output_indices);
8686
~user_axis_space();
8787
};
8888

8989
using make_user_space_signature =
90-
std::unique_ptr<axis_space_base>(std::vector<std::size_t> input_indices,
90+
std::unique_ptr<iteration_space_base>(std::vector<std::size_t> input_indices,
9191
std::vector<std::size_t> output_indices);
9292

9393
} // namespace nvbench

‎nvbench/axis_iteration_space.cxx‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,24 @@
2323
namespace nvbench
2424
{
2525

26-
axis_space_base::axis_space_base(std::vector<std::size_t> input_indices,
26+
iteration_space_base::iteration_space_base(std::vector<std::size_t> input_indices,
2727
std::vector<std::size_t> output_indices)
2828
: m_input_indices(std::move(input_indices))
2929
, m_output_indices(std::move(output_indices))
3030
{}
3131

32-
axis_space_base::~axis_space_base() = default;
32+
iteration_space_base::~iteration_space_base() = default;
3333

34-
std::unique_ptr<axis_space_base> axis_space_base::clone() const
34+
std::unique_ptr<iteration_space_base> iteration_space_base::clone() const
3535
{
3636
auto clone = this->do_clone();
3737
return clone;
3838
}
3939

40-
std::vector<std::unique_ptr<axis_space_base>>
41-
axis_space_base::clone_as_linear() const
40+
std::vector<std::unique_ptr<iteration_space_base>>
41+
iteration_space_base::clone_as_linear() const
4242
{
43-
std::vector<std::unique_ptr<axis_space_base>> clones;
43+
std::vector<std::unique_ptr<iteration_space_base>> clones;
4444
clones.reserve(m_input_indices.size());
4545

4646
for (std::size_t i = 0; i < m_input_indices.size(); ++i)
@@ -55,11 +55,11 @@ axis_space_base::clone_as_linear() const
5555

5656
namespace
5757
{
58-
nvbench::axis_space_base::axes_info
59-
get_axes_info(const nvbench::axis_space_base::axes_type &axes,
58+
nvbench::iteration_space_base::axes_info
59+
get_axes_info(const nvbench::iteration_space_base::axes_type &axes,
6060
const std::vector<std::size_t> &indices)
6161
{
62-
nvbench::axis_space_base::axes_info info;
62+
nvbench::iteration_space_base::axes_info info;
6363
info.reserve(indices.size());
6464
for (auto &n : indices)
6565
{
@@ -69,22 +69,22 @@ 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 iteration_space_base::get_iterator(const axes_type &axes) const
7373
{
7474

75-
return this->do_iter(get_axes_info(axes, m_input_indices));
75+
return this->do_get_iterator(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 iteration_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 iteration_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

87-
bool axis_space_base::contains(std::size_t in_index) const
87+
bool iteration_space_base::contains(std::size_t in_index) const
8888
{
8989
auto iter =
9090
std::find_if(m_input_indices.cbegin(),
@@ -95,12 +95,12 @@ bool axis_space_base::contains(std::size_t in_index) const
9595

9696
linear_axis_space::linear_axis_space(std::size_t in_index,
9797
std::size_t out_index)
98-
: axis_space_base({in_index}, {out_index})
98+
: iteration_space_base({in_index}, {out_index})
9999
{}
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_iterator(axes_info info) const
104104
{
105105
std::size_t loc(m_output_indices[0]);
106106
auto update_func = [=](std::size_t inc_index,
@@ -112,29 +112,29 @@ 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
}
124124

125-
std::unique_ptr<axis_space_base> linear_axis_space::do_clone() const
125+
std::unique_ptr<iteration_space_base> linear_axis_space::do_clone() const
126126
{
127127
return std::make_unique<linear_axis_space>(*this);
128128
}
129129

130130
zip_axis_space::zip_axis_space(std::vector<std::size_t> input_indices,
131131
std::vector<std::size_t> output_indices)
132-
: axis_space_base(std::move(input_indices), std::move(output_indices))
132+
: iteration_space_base(std::move(input_indices), std::move(output_indices))
133133
{}
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_iterator(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,24 +150,24 @@ 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
}
162162

163-
std::unique_ptr<axis_space_base> zip_axis_space::do_clone() const
163+
std::unique_ptr<iteration_space_base> zip_axis_space::do_clone() const
164164
{
165165
return std::make_unique<zip_axis_space>(*this);
166166
}
167167

168168
user_axis_space::user_axis_space(std::vector<std::size_t> input_indices,
169169
std::vector<std::size_t> output_indices)
170-
: axis_space_base(std::move(input_indices), std::move(output_indices))
170+
: iteration_space_base(std::move(input_indices), std::move(output_indices))
171171
{}
172172
user_axis_space::~user_axis_space() = default;
173173

‎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
}

0 commit comments

Comments
 (0)