Skip to content

Commit 452b53c

Browse files
beomki-yeobeomki-yeo
authored
Merge pull request #423 from guilhermeAlmeida1/patch-00
Minor improvements
2 parents 0e030d7 + 445f5d8 commit 452b53c

File tree

5 files changed

+43
-52
lines changed

5 files changed

+43
-52
lines changed

‎core/include/traccc/clusterization/detail/sparse_ccl.hpp

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -111,27 +111,22 @@ TRACCC_HOST_DEVICE inline unsigned int sparse_ccl(
111111
for (unsigned int i = 0; i < n_cells; ++i) {
112112
L[i] = i;
113113
unsigned int ai = i;
114-
if (i > 0) {
115-
for (unsigned int j = start_j; j < i; ++j) {
116-
if (is_adjacent(cells[i], cells[j])) {
117-
ai = make_union(L, ai, find_root(L, j));
118-
} else if (is_far_enough(cells[i], cells[j])) {
119-
++start_j;
120-
}
114+
for (unsigned int j = start_j; j < i; ++j) {
115+
if (is_adjacent(cells[i], cells[j])) {
116+
ai = make_union(L, ai, find_root(L, j));
117+
} else if (is_far_enough(cells[i], cells[j])) {
118+
++start_j;
121119
}
122120
}
123121
}
124122

125123
// second scan: transitive closure
126124
for (unsigned int i = 0; i < n_cells; ++i) {
127-
unsigned int l = 0;
128125
if (L[i] == i) {
129-
l = labels;
130-
++labels;
126+
L[i] = labels++;
131127
} else {
132-
l = L[L[i]];
128+
L[i] = L[L[i]];
133129
}
134-
L[i] = l;
135130
}
136131

137132
return labels;

‎examples/run/cuda/seeding_example_cuda.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ int seq_run(const traccc::seeding_input_config& i_cfg,
206206
---------------*/
207207

208208
n_spacepoints += reader_output.spacepoints.size();
209+
n_modules += reader_output.modules.size();
209210
n_seeds_cuda += seeds_cuda.size();
210211
n_seeds += seeds.size();
211212

‎examples/run/cuda/seq_example_cuda.cpp

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -228,11 +228,9 @@ int seq_run(const traccc::full_tracking_input_config& i_cfg,
228228
traccc::spacepoint_collection_types::host spacepoints_per_event_cuda;
229229
traccc::seed_collection_types::host seeds_cuda;
230230
traccc::bound_track_parameters_collection_types::host params_cuda;
231-
if (run_cpu || i_cfg.check_performance) {
232-
copy(spacepoints_cuda_buffer, spacepoints_per_event_cuda)->wait();
233-
copy(seeds_cuda_buffer, seeds_cuda)->wait();
234-
copy(params_cuda_buffer, params_cuda)->wait();
235-
}
231+
copy(spacepoints_cuda_buffer, spacepoints_per_event_cuda)->wait();
232+
copy(seeds_cuda_buffer, seeds_cuda)->wait();
233+
copy(params_cuda_buffer, params_cuda)->wait();
236234

237235
if (run_cpu) {
238236

@@ -258,16 +256,17 @@ int seq_run(const traccc::full_tracking_input_config& i_cfg,
258256
compare_track_parameters{"track parameters"};
259257
compare_track_parameters(vecmem::get_data(params),
260258
vecmem::get_data(params_cuda));
261-
262-
/// Statistics
263-
n_modules += read_out_per_event.modules.size();
264-
n_cells += read_out_per_event.cells.size();
265-
n_measurements += measurements_per_event.size();
266-
n_spacepoints += spacepoints_per_event.size();
267-
n_spacepoints_cuda += spacepoints_per_event_cuda.size();
268-
n_seeds_cuda += seeds_cuda.size();
269-
n_seeds += seeds.size();
270259
}
260+
261+
/// Statistics
262+
n_modules += read_out_per_event.modules.size();
263+
n_cells += read_out_per_event.cells.size();
264+
n_measurements += measurements_per_event.size();
265+
n_spacepoints += spacepoints_per_event.size();
266+
n_seeds += seeds.size();
267+
n_spacepoints_cuda += spacepoints_per_event_cuda.size();
268+
n_seeds_cuda += seeds_cuda.size();
269+
271270
if (i_cfg.check_performance) {
272271

273272
traccc::event_map evt_map(
@@ -291,12 +290,11 @@ int seq_run(const traccc::full_tracking_input_config& i_cfg,
291290
}
292291

293292
std::cout << "==> Statistics ... " << std::endl;
294-
std::cout << "- read " << n_spacepoints << " spacepoints from "
295-
<< n_modules << " modules" << std::endl;
296-
std::cout << "- created " << n_cells << " cells" << std::endl;
297-
std::cout << "- created " << n_measurements << " measurements "
293+
std::cout << "- read " << n_cells << " cells from " << n_modules
294+
<< " modules" << std::endl;
295+
std::cout << "- created (cpu) " << n_measurements << " measurements "
298296
<< std::endl;
299-
std::cout << "- created " << n_spacepoints << " spacepoints "
297+
std::cout << "- created (cpu) " << n_spacepoints << " spacepoints "
300298
<< std::endl;
301299
std::cout << "- created (cuda) " << n_spacepoints_cuda
302300
<< " spacepoints " << std::endl;

‎examples/run/sycl/seeding_example_sycl.sycl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ int seq_run(const traccc::seeding_input_config& i_cfg,
181181
copy(seeds_sycl_buffer, seeds_sycl)->wait();
182182
copy(params_sycl_buffer, params_sycl)->wait();
183183

184-
if (run_cpu && i_cfg.check_performance) {
184+
if (run_cpu) {
185185
// Show which event we are currently presenting the results for.
186186
std::cout << "===>>> Event " << event << " <<<===" << std::endl;
187187

@@ -205,6 +205,7 @@ int seq_run(const traccc::seeding_input_config& i_cfg,
205205
---------------*/
206206

207207
n_spacepoints += reader_output.spacepoints.size();
208+
n_modules += reader_output.modules.size();
208209
n_seeds_sycl += seeds_sycl.size();
209210
n_seeds += seeds.size();
210211

‎examples/run/sycl/seq_example_sycl.sycl

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -254,11 +254,9 @@ int seq_run(const traccc::full_tracking_input_config& i_cfg,
254254
traccc::spacepoint_collection_types::host spacepoints_per_event_sycl;
255255
traccc::seed_collection_types::host seeds_sycl;
256256
traccc::bound_track_parameters_collection_types::host params_sycl;
257-
if (run_cpu || i_cfg.check_performance) {
258-
copy(spacepoints_sycl_buffer, spacepoints_per_event_sycl)->wait();
259-
copy(seeds_sycl_buffer, seeds_sycl)->wait();
260-
copy(params_sycl_buffer, params_sycl)->wait();
261-
}
257+
copy(spacepoints_sycl_buffer, spacepoints_per_event_sycl)->wait();
258+
copy(seeds_sycl_buffer, seeds_sycl)->wait();
259+
copy(params_sycl_buffer, params_sycl)->wait();
262260

263261
if (run_cpu) {
264262

@@ -284,17 +282,17 @@ int seq_run(const traccc::full_tracking_input_config& i_cfg,
284282
compare_track_parameters{"track parameters"};
285283
compare_track_parameters(vecmem::get_data(params),
286284
vecmem::get_data(params_sycl));
287-
288-
/// Statistics
289-
n_modules += read_out_per_event.modules.size();
290-
n_cells += read_out_per_event.cells.size();
291-
n_measurements += measurements_per_event.size();
292-
n_spacepoints += spacepoints_per_event.size();
293-
n_spacepoints_sycl += spacepoints_per_event_sycl.size();
294-
n_seeds_sycl += seeds_sycl.size();
295-
n_seeds += seeds.size();
296285
}
297286

287+
/// Statistics
288+
n_modules += read_out_per_event.modules.size();
289+
n_cells += read_out_per_event.cells.size();
290+
n_measurements += measurements_per_event.size();
291+
n_spacepoints += spacepoints_per_event.size();
292+
n_spacepoints_sycl += spacepoints_per_event_sycl.size();
293+
n_seeds_sycl += seeds_sycl.size();
294+
n_seeds += seeds.size();
295+
298296
if (i_cfg.check_performance) {
299297

300298
traccc::event_map evt_map(
@@ -318,13 +316,11 @@ int seq_run(const traccc::full_tracking_input_config& i_cfg,
318316
}
319317

320318
std::cout << "==> Statistics ... " << std::endl;
321-
std::cout << "- read " << n_spacepoints << " spacepoints from "
322-
<< n_modules << " modules" << std::endl;
323-
std::cout << "- created " << n_cells << " cells "
324-
<< std::endl;
325-
std::cout << "- created " << n_measurements << " measurements "
319+
std::cout << "- read " << n_cells << " cells from " << n_modules
320+
<< " modules" << std::endl;
321+
std::cout << "- created (cpu) " << n_measurements << " measurements"
326322
<< std::endl;
327-
std::cout << "- created " << n_spacepoints << " spacepoints "
323+
std::cout << "- created (cpu) " << n_spacepoints << " spacepoints"
328324
<< std::endl;
329325
std::cout << "- created (sycl) " << n_spacepoints_sycl
330326
<< " spacepoints " << std::endl;

0 commit comments

Comments
 (0)