Skip to content

Commit

Permalink
Minor fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
guilhermeAlmeida1 committed Feb 1, 2023
1 parent 0da0895 commit ea896e1
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 18 deletions.
4 changes: 0 additions & 4 deletions core/include/traccc/edm/alt_measurement.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@ struct alt_measurement {
point2 local{0., 0.};
/// Variance on the 2D coordinates of the measurement
variance2 variance{0., 0.};
// TODO: We should consider removing the cluster link, as it is only used in
// a CI test.
/// Cluster link
std::size_t cluster_link = std::numeric_limits<std::size_t>::infinity();

using link_type = cell_module_collection_types::view::size_type;
link_type module_link;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ inline void form_spacepoints(
point3 global = mod.placement.point_to_global(local_3d);

// Fill the result object with this spacepoint
spacepoints_device[globalIndex] = {
global, {meas.local, meas.variance, meas.cluster_link}};
spacepoints_device[globalIndex] = {global, {meas.local, meas.variance, 0}};
}

} // namespace traccc::device
6 changes: 2 additions & 4 deletions device/common/src/clusterization/partitioning_algorithm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@ namespace {
// to different modules in order to be partitioned. This assumes sorting by
// channel1 already done
bool isFarEnough(const traccc::alt_cell& c1, const traccc::alt_cell& c2) {
if (c1.module_link != c2.module_link || c1.c.channel1 + 1 < c2.c.channel1) {
return true;
}
return false;
return (c1.module_link != c2.module_link ||
c1.c.channel1 + 1 < c2.c.channel1);
}
} // namespace

Expand Down
1 change: 0 additions & 1 deletion device/cuda/src/clusterization/clusterization_algorithm.cu
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,6 @@ clusterization_algorithm::output_type clusterization_algorithm::operator()(
measurements_buffer, *num_measurements_device);

CUDA_ERROR_CHECK(cudaGetLastError());
m_stream.synchronize();

// Copy number of measurements to host
vecmem::unique_alloc_ptr<unsigned int> num_measurements_host =
Expand Down
3 changes: 0 additions & 3 deletions examples/run/cuda/full_chain_algorithm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,6 @@ full_chain_algorithm::output_type full_chain_algorithm::operator()(
partitions.size(), *m_cached_device_mr);
m_copy(vecmem::get_data(partitions), partitions_buffer);

// Synchronize assynchronous copies.
m_stream.synchronize();

// Run the clusterization (asynchronously).
const clusterization_algorithm::output_type spacepoints =
m_clusterization(cells_buffer, modules_buffer, partitions_buffer);
Expand Down
4 changes: 0 additions & 4 deletions examples/run/kokkos/seeding_example_kokkos.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -133,17 +133,13 @@ int seq_run(const traccc::seeding_input_config& i_cfg,
common_opts.input_data_format, &host_mr);
} // stop measuring hit reading timer

std::cout << "here " << __LINE__ << std::endl;

{ // Spacepoin binning for kokkos
traccc::performance::timer t("Spacepoint binning (kokkos)",
elapsedTimes);
m_spacepoint_binning(
vecmem::get_data(alt_spacepoints_per_event));
}

std::cout << "here " << __LINE__ << std::endl;

/*----------------------------
Seeding algorithm
----------------------------*/
Expand Down

0 comments on commit ea896e1

Please sign in to comment.