Skip to content

Commit d59aba4

Browse files
stephenswatstephenswat
authored
Merge pull request #1135 from stephenswat/cleanup/dead_geo_code
Clean up unused geometry IO code
2 parents 9d98db0 + 313c97d commit d59aba4

36 files changed

+377
-1031
lines changed

‎README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,6 @@ cmake --build build/
272272
--detector-file=geometries/odd/odd-detray_geometry_detray.json \
273273
--material-file=geometries/odd/odd-detray_material_detray.json \
274274
--grid-file=geometries/odd/odd-detray_surface_grids_detray.json \
275-
--use-detray-detector \
276275
--digitization-file=geometries/odd/odd-digi-geometric-config.json \
277276
--use-acts-geom-source --input-directory=odd/geant4_10muon_10GeV/ \
278277
--input-events=10
@@ -281,7 +280,6 @@ cmake --build build/
281280
--detector-file=geometries/odd/odd-detray_geometry_detray.json \
282281
--material-file=geometries/odd/odd-detray_material_detray.json \
283282
--grid-file=geometries/odd/odd-detray_surface_grids_detray.json \
284-
--use-detray-detector \
285283
--digitization-file=geometries/odd/odd-digi-geometric-config.json \
286284
--use-acts-geom-source --input-directory=odd/geant4_10muon_10GeV/ \
287285
--input-events=10 --processed-events=1000 --threads=1

‎benchmarks/cpu/toy_detector_cpu.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
// Traccc IO include(s).
1919
#include "traccc/io/read_detector.hpp"
20-
#include "traccc/io/read_geometry.hpp"
2120
#include "traccc/io/read_measurements.hpp"
2221
#include "traccc/io/read_spacepoints.hpp"
2322

‎benchmarks/cuda/toy_detector_cuda.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include "traccc/fitting/kalman_filter/kalman_fitter.hpp"
1616
#include "traccc/geometry/detector.hpp"
1717
#include "traccc/io/read_detector.hpp"
18-
#include "traccc/io/read_geometry.hpp"
1918
#include "traccc/io/read_measurements.hpp"
2019
#include "traccc/io/read_spacepoints.hpp"
2120
#include "traccc/utils/propagation.hpp"

‎examples/io/create_binaries.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ int create_binaries(const traccc::opts::detector& detector_opts,
3434
traccc::silicon_detector_description::host det_descr{host_mr};
3535
traccc::io::read_detector_description(
3636
det_descr, detector_opts.detector_file, detector_opts.digitization_file,
37-
(detector_opts.use_detray_detector ? traccc::data_format::json
38-
: traccc::data_format::csv));
37+
traccc::data_format::json);
3938

4039
// Loop over events
4140
for (std::size_t event = input_opts.skip;

‎examples/options/include/traccc/options/detector.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ class detector : public interface {
3131
/// The file containing the surface grid description
3232
std::string grid_file =
3333
"geometries/odd/odd-detray_surface_grids_detray.json";
34-
/// Use detray::detector for the geometry handling
35-
bool use_detray_detector = true;
3634

3735
/// The digitization configuration file
3836
std::string digitization_file =

‎examples/options/src/detector.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ detector::detector() : interface("Detector Options") {
3030
m_desc.add_options()("grid-file",
3131
po::value(&grid_file)->default_value(grid_file),
3232
"Surface grid file");
33-
m_desc.add_options()(
34-
"use-detray-detector",
35-
po::value(&use_detray_detector)->default_value(use_detray_detector),
36-
"Use detray::detector for the geometry handling");
3733
m_desc.add_options()(
3834
"digitization-file",
3935
po::value(&digitization_file)->default_value(digitization_file),
@@ -49,8 +45,6 @@ std::unique_ptr<configuration_printable> detector::as_printable() const {
4945
material_file));
5046
cat->add_child(std::make_unique<configuration_kv_pair>("Surface grid file",
5147
grid_file));
52-
cat->add_child(std::make_unique<configuration_kv_pair>(
53-
"Use detray detector", std::format("{}", use_detray_detector)));
5448
cat->add_child(std::make_unique<configuration_kv_pair>("Digitization file",
5549
digitization_file));
5650

‎examples/run/alpaka/seq_example_alpaka.cpp

Lines changed: 94 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,7 @@ int seq_run(const traccc::opts::detector& detector_opts,
8383
traccc::silicon_detector_description::host host_det_descr{host_mr};
8484
traccc::io::read_detector_description(
8585
host_det_descr, detector_opts.detector_file,
86-
detector_opts.digitization_file,
87-
(detector_opts.use_detray_detector ? traccc::data_format::json
88-
: traccc::data_format::csv));
86+
detector_opts.digitization_file, traccc::data_format::json);
8987
traccc::silicon_detector_description::data host_det_descr_data{
9088
vecmem::get_data(host_det_descr)};
9189
traccc::silicon_detector_description::buffer device_det_descr{
@@ -99,15 +97,13 @@ int seq_run(const traccc::opts::detector& detector_opts,
9997
traccc::default_detector::host host_detector{host_mr};
10098
traccc::default_detector::buffer device_detector;
10199
traccc::default_detector::view device_detector_view;
102-
if (detector_opts.use_detray_detector) {
103-
traccc::io::read_detector(
104-
host_detector, host_mr, detector_opts.detector_file,
105-
detector_opts.material_file, detector_opts.grid_file);
106-
device_detector = detray::get_buffer(host_detector, device_mr, copy);
107-
queue.synchronize();
108-
const auto& const_device_detector = device_detector;
109-
device_detector_view = detray::get_data(const_device_detector);
110-
}
100+
traccc::io::read_detector(
101+
host_detector, host_mr, detector_opts.detector_file,
102+
detector_opts.material_file, detector_opts.grid_file);
103+
device_detector = detray::get_buffer(host_detector, device_mr, copy);
104+
queue.synchronize();
105+
const auto& const_device_detector = device_detector;
106+
device_detector_view = detray::get_data(const_device_detector);
111107

112108
// Output stats
113109
uint64_t n_cells = 0;
@@ -263,97 +259,92 @@ int seq_run(const traccc::opts::detector& detector_opts,
263259

264260
// Perform seeding, track finding and fitting only when using a
265261
// Detray geometry.
266-
if (detector_opts.use_detray_detector) {
267-
268-
// Alpaka
269-
{
270-
traccc::performance::timer t(
271-
"Spacepoint formation (alpaka)", elapsedTimes);
272-
spacepoints_alpaka_buffer = sf_alpaka(
273-
device_detector_view, measurements_alpaka_buffer);
274-
queue.synchronize();
275-
} // stop measuring spacepoint formation alpaka timer
276-
277-
// CPU
278-
if (accelerator_opts.compare_with_cpu) {
279-
traccc::performance::timer t("Spacepoint formation (cpu)",
280-
elapsedTimes);
281-
spacepoints_per_event =
282-
sf(host_detector,
283-
vecmem::get_data(measurements_per_event));
284-
} // stop measuring spacepoint formation cpu timer
285-
286-
// Alpaka
287-
{
288-
traccc::performance::timer t("Seeding (alpaka)",
289-
elapsedTimes);
290-
seeds_alpaka_buffer = sa_alpaka(spacepoints_alpaka_buffer);
291-
queue.synchronize();
292-
} // stop measuring seeding alpaka timer
293-
294-
// CPU
295-
if (accelerator_opts.compare_with_cpu) {
296-
traccc::performance::timer t("Seeding (cpu)",
297-
elapsedTimes);
298-
seeds = sa(vecmem::get_data(spacepoints_per_event));
299-
} // stop measuring seeding cpu timer
300-
301-
// Alpaka
302-
{
303-
traccc::performance::timer t("Track params (alpaka)",
304-
elapsedTimes);
305-
params_alpaka_buffer = tp_alpaka(
306-
measurements_alpaka_buffer, spacepoints_alpaka_buffer,
307-
seeds_alpaka_buffer, field_vec);
308-
queue.synchronize();
309-
} // stop measuring track params timer
310-
311-
// CPU
312-
if (accelerator_opts.compare_with_cpu) {
313-
traccc::performance::timer t("Track params (cpu)",
314-
elapsedTimes);
315-
params = tp(vecmem::get_data(measurements_per_event),
316-
vecmem::get_data(spacepoints_per_event),
317-
vecmem::get_data(seeds), field_vec);
318-
} // stop measuring track params cpu timer
319-
320-
// Alpaka
321-
{
322-
traccc::performance::timer timer{"Track finding (alpaka)",
323-
elapsedTimes};
324-
track_candidates_buffer = finding_alg_alpaka(
325-
device_detector_view, field, measurements_alpaka_buffer,
326-
params_alpaka_buffer);
327-
}
328-
329-
// CPU
330-
if (accelerator_opts.compare_with_cpu) {
331-
traccc::performance::timer timer{"Track finding (cpu)",
332-
elapsedTimes};
333-
track_candidates =
334-
finding_alg(host_detector, field,
335-
vecmem::get_data(measurements_per_event),
336-
vecmem::get_data(params));
337-
}
338-
339-
// Alpaka
340-
{
341-
traccc::performance::timer timer{"Track fitting (alpaka)",
342-
elapsedTimes};
343-
track_states_buffer = fitting_alg_alpaka(
344-
device_detector_view, field,
345-
{track_candidates_buffer, measurements_alpaka_buffer});
346-
}
347-
348-
// CPU
349-
if (accelerator_opts.compare_with_cpu) {
350-
traccc::performance::timer timer{"Track fitting (cpu)",
351-
elapsedTimes};
352-
track_states =
353-
fitting_alg(host_detector, field,
354-
{vecmem::get_data(track_candidates),
355-
vecmem::get_data(measurements_per_event)});
356-
}
262+
263+
// Alpaka
264+
{
265+
traccc::performance::timer t("Spacepoint formation (alpaka)",
266+
elapsedTimes);
267+
spacepoints_alpaka_buffer =
268+
sf_alpaka(device_detector_view, measurements_alpaka_buffer);
269+
queue.synchronize();
270+
} // stop measuring spacepoint formation alpaka timer
271+
272+
// CPU
273+
if (accelerator_opts.compare_with_cpu) {
274+
traccc::performance::timer t("Spacepoint formation (cpu)",
275+
elapsedTimes);
276+
spacepoints_per_event =
277+
sf(host_detector, vecmem::get_data(measurements_per_event));
278+
} // stop measuring spacepoint formation cpu timer
279+
280+
// Alpaka
281+
{
282+
traccc::performance::timer t("Seeding (alpaka)", elapsedTimes);
283+
seeds_alpaka_buffer = sa_alpaka(spacepoints_alpaka_buffer);
284+
queue.synchronize();
285+
} // stop measuring seeding alpaka timer
286+
287+
// CPU
288+
if (accelerator_opts.compare_with_cpu) {
289+
traccc::performance::timer t("Seeding (cpu)", elapsedTimes);
290+
seeds = sa(vecmem::get_data(spacepoints_per_event));
291+
} // stop measuring seeding cpu timer
292+
293+
// Alpaka
294+
{
295+
traccc::performance::timer t("Track params (alpaka)",
296+
elapsedTimes);
297+
params_alpaka_buffer = tp_alpaka(
298+
measurements_alpaka_buffer, spacepoints_alpaka_buffer,
299+
seeds_alpaka_buffer, field_vec);
300+
queue.synchronize();
301+
} // stop measuring track params timer
302+
303+
// CPU
304+
if (accelerator_opts.compare_with_cpu) {
305+
traccc::performance::timer t("Track params (cpu)",
306+
elapsedTimes);
307+
params = tp(vecmem::get_data(measurements_per_event),
308+
vecmem::get_data(spacepoints_per_event),
309+
vecmem::get_data(seeds), field_vec);
310+
} // stop measuring track params cpu timer
311+
312+
// Alpaka
313+
{
314+
traccc::performance::timer timer{"Track finding (alpaka)",
315+
elapsedTimes};
316+
track_candidates_buffer = finding_alg_alpaka(
317+
device_detector_view, field, measurements_alpaka_buffer,
318+
params_alpaka_buffer);
319+
}
320+
321+
// CPU
322+
if (accelerator_opts.compare_with_cpu) {
323+
traccc::performance::timer timer{"Track finding (cpu)",
324+
elapsedTimes};
325+
track_candidates =
326+
finding_alg(host_detector, field,
327+
vecmem::get_data(measurements_per_event),
328+
vecmem::get_data(params));
329+
}
330+
331+
// Alpaka
332+
{
333+
traccc::performance::timer timer{"Track fitting (alpaka)",
334+
elapsedTimes};
335+
track_states_buffer = fitting_alg_alpaka(
336+
device_detector_view, field,
337+
{track_candidates_buffer, measurements_alpaka_buffer});
338+
}
339+
340+
// CPU
341+
if (accelerator_opts.compare_with_cpu) {
342+
traccc::performance::timer timer{"Track fitting (cpu)",
343+
elapsedTimes};
344+
track_states =
345+
fitting_alg(host_detector, field,
346+
{vecmem::get_data(track_candidates),
347+
vecmem::get_data(measurements_per_event)});
357348
}
358349
} // Stop measuring wall time
359350

‎examples/run/common/throughput_mt.ipp

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -98,16 +98,13 @@ int throughput_mt(std::string_view description, int argc, char* argv[]) {
9898
traccc::silicon_detector_description::host det_descr{host_mr};
9999
traccc::io::read_detector_description(
100100
det_descr, detector_opts.detector_file, detector_opts.digitization_file,
101-
(detector_opts.use_detray_detector ? traccc::data_format::json
102-
: traccc::data_format::csv));
101+
traccc::data_format::json);
103102

104103
// Construct a Detray detector object, if supported by the configuration.
105104
traccc::default_detector::host detector{host_mr};
106-
if (detector_opts.use_detray_detector) {
107-
traccc::io::read_detector(
108-
detector, host_mr, detector_opts.detector_file,
109-
detector_opts.material_file, detector_opts.grid_file);
110-
}
105+
traccc::io::read_detector(detector, host_mr, detector_opts.detector_file,
106+
detector_opts.material_file,
107+
detector_opts.grid_file);
111108

112109
// Construct the magnetic field object.
113110
const auto field = details::make_magnetic_field(bfield_opts);
@@ -157,11 +154,10 @@ int throughput_mt(std::string_view description, int argc, char* argv[]) {
157154
std::vector<FULL_CHAIN_ALG> algs;
158155
algs.reserve(threading_opts.threads + 1);
159156
for (std::size_t i = 0; i < threading_opts.threads + 1; ++i) {
160-
algs.push_back(
161-
{host_mr, clustering_cfg, seedfinder_config, spacepoint_grid_config,
162-
seedfilter_config, finding_cfg, fitting_cfg, det_descr, field,
163-
(detector_opts.use_detray_detector ? &detector : nullptr),
164-
logger().clone()});
157+
algs.push_back({host_mr, clustering_cfg, seedfinder_config,
158+
spacepoint_grid_config, seedfilter_config, finding_cfg,
159+
fitting_cfg, det_descr, field, &detector,
160+
logger().clone()});
165161
}
166162

167163
// Set up a lambda that calls the correct function on the algorithms.

‎examples/run/common/throughput_st.ipp

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,13 @@ int throughput_st(std::string_view description, int argc, char* argv[]) {
8686
traccc::silicon_detector_description::host det_descr{host_mr};
8787
traccc::io::read_detector_description(
8888
det_descr, detector_opts.detector_file, detector_opts.digitization_file,
89-
(detector_opts.use_detray_detector ? traccc::data_format::json
90-
: traccc::data_format::csv));
89+
traccc::data_format::json);
9190

9291
// Construct a Detray detector object, if supported by the configuration.
9392
traccc::default_detector::host detector{host_mr};
94-
if (detector_opts.use_detray_detector) {
95-
traccc::io::read_detector(
96-
detector, host_mr, detector_opts.detector_file,
97-
detector_opts.material_file, detector_opts.grid_file);
98-
}
93+
traccc::io::read_detector(detector, host_mr, detector_opts.detector_file,
94+
detector_opts.material_file,
95+
detector_opts.grid_file);
9996

10097
// Construct the magnetic field object.
10198
const auto field = details::make_magnetic_field(bfield_opts);
@@ -138,8 +135,7 @@ int throughput_st(std::string_view description, int argc, char* argv[]) {
138135
std::unique_ptr<FULL_CHAIN_ALG> alg = std::make_unique<FULL_CHAIN_ALG>(
139136
host_mr, clustering_cfg, seedfinder_config, spacepoint_grid_config,
140137
seedfilter_config, finding_cfg, fitting_cfg, det_descr, field,
141-
(detector_opts.use_detray_detector ? &detector : nullptr),
142-
logger->clone("FullChainAlg"));
138+
&detector, logger->clone("FullChainAlg"));
143139

144140
// Seed the random number generator.
145141
if (throughput_opts.random_seed == 0) {

‎examples/run/cpu/misaligned_truth_fitting_example.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include "traccc/definitions/primitives.hpp"
1313
#include "traccc/fitting/kalman_fitting_algorithm.hpp"
1414
#include "traccc/geometry/detector.hpp"
15-
#include "traccc/io/read_geometry.hpp"
1615
#include "traccc/io/utils.hpp"
1716
#include "traccc/options/detector.hpp"
1817
#include "traccc/options/input_data.hpp"

0 commit comments

Comments
 (0)