Skip to content

Commit 5eba84c

Browse files
sbaldusbaldu
committed
Formatting
1 parent 3d16e6f commit 5eba84c

File tree

4 files changed

+58
-67
lines changed

4 files changed

+58
-67
lines changed

‎include/CLUEstering/CLUE/CLUEAlpakaKernels.hpp‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE_CLUE {
4343
TilesAlpaka<Ndim>* tiles,
4444
PointsAlpakaView* dev_points,
4545
const KernelType& kernel,
46-
/* const VecArray<VecArray<float, 2>, Ndim>& domains, */
4746
const float* coords_i,
4847
float* rho_i,
4948
float dc,
@@ -72,7 +71,6 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE_CLUE {
7271
}
7372

7473
} // end of interate inside this bin
75-
7674
return;
7775
} else {
7876
for (unsigned int i{search_box[search_box.capacity() - N_][0]};
@@ -99,7 +97,6 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE_CLUE {
9997
TilesAlpaka<Ndim>* dev_tiles,
10098
PointsAlpakaView* dev_points,
10199
const KernelType& kernel,
102-
/* const VecArray<VecArray<float, 2>, Ndim>& domains, */
103100
float dc,
104101
uint32_t n_points) const {
105102
for (auto i : alpaka::uniformElements(acc, n_points)) {
@@ -143,9 +140,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE_CLUE {
143140
const TAcc& acc,
144141
VecArray<uint32_t, Ndim>& base_vec,
145142
const VecArray<VecArray<uint32_t, 2>, Ndim>& s_box,
146-
TilesAlpaka<Ndim>* tiles,
143+
TilesAlpakaView<Ndim>* tiles,
147144
PointsAlpakaView* dev_points,
148-
/* const VecArray<VecArray<float, 2>, Ndim>& domains, */
149145
const float* coords_i,
150146
float rho_i,
151147
float* delta_i,
@@ -211,8 +207,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE_CLUE {
211207
template <typename TAcc, uint8_t Ndim>
212208
ALPAKA_FN_ACC void operator()(const TAcc& acc,
213209
TilesAlpaka<Ndim>* dev_tiles,
210+
TilesAlpakaView<Ndim>* dev_tiles,
214211
PointsAlpakaView* dev_points,
215-
/* const VecArray<VecArray<float, 2>, Ndim>& domains, */
216212
float dm,
217213
float,
218214
uint32_t n_points) const {

‎include/CLUEstering/CLUEstering.hpp‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE_CLUE {
151151
alpaka::memset(queue_, *d_seeds, 0x00);
152152
const Idx grid_size = clue::divide_up_by(h_points.nPoints(), block_size);
153153
const auto working_div = clue::make_workdiv<Acc1D>(grid_size, block_size);
154-
alpaka::exec<Acc1D>(queue_,
155-
156-
working_div,
157-
KernelResetFollowers{},
158-
m_followers,
159-
h_points.nPoints());
154+
alpaka::exec<Acc1D>(
155+
queue_, working_div, KernelResetFollowers{}, m_followers, h_points.nPoints());
160156
}
161157

162158
template <uint8_t Ndim>

‎include/CLUEstering/DataFormats/alpaka/AssociationMap.hpp‎

Lines changed: 49 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,11 @@ namespace clue {
4242
*nbins = max + 1;
4343
}
4444
template <typename TAcc>
45-
ALPAKA_FN_ACC void operator()(
46-
const TAcc& acc, size_t size, uint32_t* associations, uint32_t* nbins, TFunc func) const {
45+
ALPAKA_FN_ACC void operator()(const TAcc& acc,
46+
size_t size,
47+
uint32_t* associations,
48+
uint32_t* nbins,
49+
TFunc func) const {
4750
auto max = 0;
4851
for (auto i : alpaka::uniformElements(acc, size)) {
4952
associations[i] = func(acc, i);
@@ -93,72 +96,68 @@ namespace clue {
9396
};
9497

9598
struct AssociationMapView {
96-
uint32_t* m_indexes;
97-
uint32_t* m_offsets;
98-
uint32_t m_size;
99-
uint32_t m_nbins;
100-
101-
ALPAKA_FN_ACC Span<uint32_t> indexes(size_t assoc_id) {
102-
auto size = m_offsets[assoc_id + 1] - m_offsets[assoc_id];
103-
auto* buf_ptr = m_indexes + m_offsets[assoc_id];
104-
return Span<uint32_t>{buf_ptr, size};
105-
}
106-
ALPAKA_FN_ACC uint32_t offsets(size_t assoc_id) {
107-
return m_offsets[assoc_id];
108-
}
109-
ALPAKA_FN_ACC Span<uint32_t> operator[](size_t assoc_id) {
110-
auto size = m_offsets[assoc_id + 1] - m_offsets[assoc_id];
111-
auto* buf_ptr = m_indexes + m_offsets[assoc_id];
112-
return Span<uint32_t>{buf_ptr, size};
113-
}
99+
uint32_t* m_indexes;
100+
uint32_t* m_offsets;
101+
uint32_t m_size;
102+
uint32_t m_nbins;
103+
104+
ALPAKA_FN_ACC Span<uint32_t> indexes(size_t assoc_id) {
105+
auto size = m_offsets[assoc_id + 1] - m_offsets[assoc_id];
106+
auto* buf_ptr = m_indexes + m_offsets[assoc_id];
107+
return Span<uint32_t>{buf_ptr, size};
108+
}
109+
ALPAKA_FN_ACC uint32_t offsets(size_t assoc_id) { return m_offsets[assoc_id]; }
110+
ALPAKA_FN_ACC Span<uint32_t> operator[](size_t assoc_id) {
111+
auto size = m_offsets[assoc_id + 1] - m_offsets[assoc_id];
112+
auto* buf_ptr = m_indexes + m_offsets[assoc_id];
113+
return Span<uint32_t>{buf_ptr, size};
114+
}
114115
};
115116

116117
template <typename TDev, typename = std::enable_if_t<alpaka::isDevice<TDev>>>
117118
class AssociationMap {
118119
private:
119120
device_buffer<TDev, uint32_t[]> m_indexes;
120121
device_buffer<TDev, uint32_t[]> m_offsets;
121-
device_buffer<TDev, AssociationMapView> m_view;
122-
// TODO: the names of this variables are a bit ambiguous
122+
device_buffer<TDev, AssociationMapView> m_view;
123+
// TODO: the names of this variables are a bit ambiguous
123124
size_t m_size;
124125

125126
public:
126127
AssociationMap() = default;
127-
// TODO: see above
128+
// TODO: see above
128129
AssociationMap(size_t size, size_t nbins, const TDev& dev)
129130
: m_indexes{make_device_buffer<uint32_t[]>(dev, size)},
130131
m_offsets{make_device_buffer<uint32_t[]>(dev, nbins + 1)},
131-
m_view{make_device_buffer<AssociationMapView>(dev)},
132+
m_view{make_device_buffer<AssociationMapView>(dev)},
132133
m_size{nbins} {
133-
auto h_view = make_host_buffer<AssociationMapView>(dev);
134-
h_view->m_indexes = m_indexes.data();
135-
h_view->m_offsets = m_offsets.data();
136-
h_view->m_size = size;
137-
h_view->m_nbins = m_size;
138-
139-
auto queue(dev);
140-
alpaka::memcpy(queue, m_view, h_view);
141-
}
134+
auto h_view = make_host_buffer<AssociationMapView>(dev);
135+
h_view->m_indexes = m_indexes.data();
136+
h_view->m_offsets = m_offsets.data();
137+
h_view->m_size = size;
138+
h_view->m_nbins = m_size;
139+
140+
auto queue(dev);
141+
alpaka::memcpy(queue, m_view, h_view);
142+
}
142143

143-
// TODO: see above
144+
// TODO: see above
144145
template <typename TQueue, typename = std::enable_if_t<alpaka::isQueue<TQueue>>>
145146
AssociationMap(size_t size, size_t nbins, TQueue queue)
146147
: m_indexes{make_device_buffer<uint32_t[]>(queue, size)},
147148
m_offsets{make_device_buffer<uint32_t[]>(queue, nbins + 1)},
148-
m_view{make_device_buffer<AssociationMapView>(queue)},
149+
m_view{make_device_buffer<AssociationMapView>(queue)},
149150
m_size{nbins} {
150-
auto h_view = make_host_buffer<AssociationMapView>(queue);
151-
h_view->m_indexes = m_indexes.data();
152-
h_view->m_offsets = m_offsets.data();
153-
h_view->m_size = size;
154-
h_view->m_nbins = m_size;
151+
auto h_view = make_host_buffer<AssociationMapView>(queue);
152+
h_view->m_indexes = m_indexes.data();
153+
h_view->m_offsets = m_offsets.data();
154+
h_view->m_size = size;
155+
h_view->m_nbins = m_size;
155156

156-
alpaka::memcpy(queue, m_view, h_view);
157-
}
157+
alpaka::memcpy(queue, m_view, h_view);
158+
}
158159

159-
AssociationMapView* view() {
160-
return m_view.data();
161-
}
160+
AssociationMapView* view() { return m_view.data(); }
162161

163162
template <typename TQueue, typename = std::enable_if_t<alpaka::isQueue<TQueue>>>
164163
ALPAKA_FN_HOST void initialize(size_t size, size_t nbins, const TQueue& queue) {
@@ -175,13 +174,14 @@ namespace clue {
175174

176175
auto size() const { return m_size; }
177176

178-
ALPAKA_FN_HOST device_buffer<TDev, uint32_t[]> indexes() { return m_indexes; }
177+
ALPAKA_FN_HOST device_buffer<TDev, uint32_t[]> indexes() { return m_indexes; }
179178
ALPAKA_FN_ACC Span<uint32_t> indexes(size_t assoc_id) {
180179
auto size = m_offsets[assoc_id + 1] - m_offsets[assoc_id];
181180
auto* buf_ptr = m_indexes.data() + m_offsets[assoc_id];
182181
return Span<uint32_t>{buf_ptr, size};
183182
}
184-
ALPAKA_FN_HOST device_view<TDev, uint32_t[]> indexes(const TDev& dev, size_t assoc_id) {
183+
ALPAKA_FN_HOST device_view<TDev, uint32_t[]> indexes(const TDev& dev,
184+
size_t assoc_id) {
185185
auto size = m_offsets[assoc_id + 1] - m_offsets[assoc_id];
186186
auto* buf_ptr = m_indexes.data() + m_offsets[assoc_id];
187187
return make_device_view<uint32_t[], TDev>(dev, buf_ptr, size);
@@ -263,7 +263,7 @@ namespace clue {
263263

264264
/* template <typename TFunc> */
265265
/* ALPAKA_FN_HOST void fill(size_t size, TFunc func, TDev dev) { */
266-
/* std::cout << "nbins = " << m_size << std::endl; */
266+
/* std::cout << "nbins = " << m_size << std::endl; */
267267
/* auto bin_buffer = make_device_buffer<uint32_t[]>(dev, size); */
268268

269269
/* auto queue(dev); */
@@ -323,7 +323,7 @@ namespace clue {
323323
ALPAKA_FN_HOST void fill(size_t size, TFunc func, Queue queue) {
324324
auto bin_buffer = make_device_buffer<uint32_t[]>(queue, size);
325325

326-
const auto dev = alpaka::getDev(queue);
326+
const auto dev = alpaka::getDev(queue);
327327
const auto blocksize = 512;
328328
const auto gridsize = divide_up_by(size, blocksize);
329329
const auto workdiv = make_workdiv<Acc1D>(gridsize, blocksize);
@@ -374,7 +374,6 @@ namespace clue {
374374
temp_offsets.data(),
375375
size);
376376
}
377-
378377
};
379378

380379
/* template <typename TFunc, */

‎include/CLUEstering/DataFormats/alpaka/TilesAlpaka.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,12 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE_CLUE {
111111
template <uint8_t Ndim>
112112
class TilesAlpaka {
113113
public:
114-
TilesAlpaka(Queue queue, uint32_t n_points, int32_t n_perdim, uint32_t n_tiles)
115-
: m_ntiles{n_tiles},
116-
m_nperdim{n_perdim},
114+
TilesAlpaka(Queue queue, uint32_t n_points, int32_t n_perdim, int32_t n_tiles)
115+
: m_assoc{clue::AssociationMap<Device>(n_points, n_tiles, queue)},
117116
m_minmax{clue::make_device_buffer<CoordinateExtremes<Ndim>>(queue)},
118117
m_tilesizes{clue::make_device_buffer<float[Ndim]>(queue)},
119-
m_assoc{clue::AssociationMap<Device>(n_points, n_tiles, queue)},
118+
m_ntiles{n_tiles},
119+
m_nperdim{n_perdim},
120120
m_view{clue::make_device_buffer<TilesAlpakaView<Ndim>>(queue)} {
121121
auto host_view = clue::make_host_buffer<TilesAlpakaView<Ndim>>(queue);
122122
host_view->indexes = m_assoc.indexes().data();
@@ -182,9 +182,9 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE_CLUE {
182182
clue::AssociationMap<Device> m_assoc;
183183
clue::device_buffer<Device, CoordinateExtremes<Ndim>> m_minmax;
184184
clue::device_buffer<Device, float[Ndim]> m_tilesizes;
185-
clue::device_buffer<Device, TilesAlpakaView<Ndim>> m_view;
186185
int32_t m_ntiles;
187186
int32_t m_nperdim;
187+
clue::device_buffer<Device, TilesAlpakaView<Ndim>> m_view;
188188
};
189189

190190
} // namespace ALPAKA_ACCELERATOR_NAMESPACE_CLUE

0 commit comments

Comments
 (0)