From . * [new ref] HEAD -> merge-attempt From https://github.com/cms-sw/cmssw * [new ref] refs/pull/47611/head -> cms-sw/refs/pull/47611/head Switched to branch 'merge-attempt' Merge made by the 'ort' strategy. .../plugins/SiPixelCompareRecHits.cc | 39 +- .../plugins/SiPixelCompareTracks.cc | 41 +- .../plugins/SiPixelMonitorRecHitsSoAAlpaka.cc | 33 +- .../plugins/SiPixelMonitorTrackSoAAlpaka.cc | 32 +- DataFormats/TrackSoA/interface/TracksDevice.h | 33 +- DataFormats/TrackSoA/interface/TracksHost.h | 48 +- DataFormats/TrackSoA/interface/TracksSoA.h | 186 ++++--- .../TrackSoA/interface/alpaka/TrackUtilities.h | 85 +-- .../interface/alpaka/TracksSoACollection.h | 47 +- .../TrackSoA/src/alpaka/classes_cuda_def.xml | 17 +- .../TrackSoA/src/alpaka/classes_rocm_def.xml | 19 +- DataFormats/TrackSoA/src/classes.cc | 8 +- DataFormats/TrackSoA/src/classes.h | 2 - DataFormats/TrackSoA/src/classes_def.xml | 31 +- DataFormats/TrackSoA/test/BuildFile.xml | 10 + DataFormats/TrackSoA/test/TestReadHostTrackSoA.cc | 53 ++ DataFormats/TrackSoA/test/TestWriteHostTrackSoA.cc | 52 ++ .../test/alpaka/TrackSoAHeterogeneous_test.cc | 17 +- .../test/alpaka/TrackSoAHeterogeneous_test.dev.cc | 22 +- .../test/alpaka/TrackSoAHeterogeneous_test.h | 3 +- .../TrackSoA/test/alpaka/TrajectoryStateSoA_t.cc | 4 +- .../test/alpaka/TrajectoryStateSoA_t.dev.cc | 14 +- .../TrackSoA/test/alpaka/TrajectoryStateSoA_t.h | 2 +- DataFormats/TrackSoA/test/testReadHostTrackSoA.py | 19 + .../TrackSoA/test/testWriteAndReadTrackSoA.sh | 21 + DataFormats/TrackSoA/test/testWriteHostTrackSoA.py | 21 + .../interface/TrackingRecHitsDevice.h | 105 ++-- .../interface/TrackingRecHitsHost.h | 70 +-- .../interface/TrackingRecHitsSoA.h | 64 +-- .../alpaka/TrackingRecHitsSoACollection.h | 86 +-- .../src/alpaka/classes_cuda_def.xml | 17 +- .../src/alpaka/classes_rocm_def.xml | 20 +- DataFormats/TrackingRecHitSoA/src/classes.cc | 8 +- DataFormats/TrackingRecHitSoA/src/classes.h | 4 +- DataFormats/TrackingRecHitSoA/src/classes_def.xml | 35 +- DataFormats/TrackingRecHitSoA/test/BuildFile.xml | 10 + .../TrackingRecHitSoA/test/TestReadHostHitSoA.cc | 55 ++ .../TrackingRecHitSoA/test/TestWriteHostHitSoA.cc | 52 ++ .../TrackingRecHitSoA/test/alpaka/Hits_test.cc | 68 ++- .../TrackingRecHitSoA/test/alpaka/Hits_test.dev.cc | 29 +- .../TrackingRecHitSoA/test/alpaka/Hits_test.h | 3 +- .../TrackingRecHitSoA/test/testReadHostHitSoA.py | 19 + .../test/testWriteAndReadHitSoA.sh | 21 + .../TrackingRecHitSoA/test/testWriteHostHitSoA.py | 19 + .../interface/SimplePixelTopology.h | 45 +- .../Configuration/python/customizeHLTforCMSSW.py | 157 +++++- .../AlpakaInterface/interface/prefixScan.h | 13 +- .../ClusterParameterEstimator/BuildFile.xml | 5 + .../alpaka/SiPixelRawToClusterKernel.dev.cc | 33 +- .../SiPixelRecHits/interface/pixelCPEforDevice.h | 29 +- .../plugins/SiPixelRecHitFromSoAAlpaka.cc | 68 +-- .../alpaka/PixelCPEFastParamsESProducerAlpaka.cc | 1 - .../plugins/alpaka/PixelRecHitKernel.h | 12 +- .../plugins/alpaka/PixelRecHitKernels.dev.cc | 65 +-- .../SiPixelRecHits/plugins/alpaka/PixelRecHits.h | 10 +- .../plugins/alpaka/SiPixelRecHitAlpaka.cc | 2 +- .../SiPixelRecHits/python/SiPixelRecHits_cfi.py | 18 +- .../SiPixelRecHits/src/PixelCPEFastParamsHost.cc | 67 +-- .../HLTProducers/src/L2TauTagNNProducerAlpaka.cc | 21 +- .../python/customizePixelTracksForTriplets.py | 70 ++- RecoTracker/PixelSeeding/BuildFile.xml | 3 + .../PixelSeeding/interface/CACoupleDevice.h | 17 + RecoTracker/PixelSeeding/interface/CACoupleHost.h | 15 + RecoTracker/PixelSeeding/interface/CACoupleSoA.h | 20 + .../interface/alpaka/CACoupleSoACollection.h | 26 + .../plugins/alpaka/BrokenLineFit.dev.cc | 89 ++- RecoTracker/PixelSeeding/plugins/alpaka/CACell.h | 198 ++----- .../PixelSeeding/plugins/alpaka/CAFishbone.h | 186 ++++--- .../plugins/alpaka/CAGeometryESProucer.cc | 207 +++++++ .../PixelSeeding/plugins/alpaka/CAHitNtuplet.cc | 39 +- .../plugins/alpaka/CAHitNtupletGenerator.cc | 228 ++++---- .../plugins/alpaka/CAHitNtupletGenerator.h | 41 +- .../alpaka/CAHitNtupletGeneratorKernels.dev.cc | 595 ++++++++++++++------- .../plugins/alpaka/CAHitNtupletGeneratorKernels.h | 331 ++++++------ .../alpaka/CAHitNtupletGeneratorKernelsImpl.h | 552 +++++++++++-------- .../PixelSeeding/plugins/alpaka/CAPixelDoublets.h | 67 +-- .../plugins/alpaka/CAPixelDoubletsAlgos.h | 364 ++++++------- .../PixelSeeding/plugins/alpaka/CASimpleCell.h | 299 +++++++++++ .../PixelSeeding/plugins/alpaka/CAStructures.h | 84 ++- .../PixelSeeding/plugins/alpaka/HelixFit.cc | 6 +- RecoTracker/PixelSeeding/plugins/alpaka/HelixFit.h | 26 +- .../PixelSeeding/plugins/alpaka/RiemannFit.dev.cc | 54 +- .../python/CAGeometryESProducer_cfi.py | 50 ++ .../PixelSeeding/test/alpaka/CAGeometry_t.cpp | 81 +++ .../PixelSeeding/test/alpaka/CAGeometry_t.h | 13 + .../plugins/PixelTrackDumpAlpaka.cc | 2 +- .../plugins/PixelTrackProducerFromSoAAlpaka.cc | 77 +-- .../PixelTrackFitting/python/PixelTracks_cff.py | 59 +- RecoTracker/Record/BuildFile.xml | 2 + RecoTracker/Record/interface/CAGeometryDevice.h | 16 + RecoTracker/Record/interface/CAGeometryHost.h | 15 + RecoTracker/Record/interface/CAGeometrySoA.h | 58 ++ .../interface/alpaka/CAGeometrySoACollection.h | 26 + RecoTracker/Record/src/ES_CAGeometry.cc | 4 + .../src/alpaka/ES_CAGeometrySoACollection.cc | 4 + .../Configuration/python/RecoPixelVertexing_cff.py | 2 +- .../plugins/alpaka/PixelVertexProducerAlpaka.cc | 2 +- .../plugins/alpaka/vertexFinder.dev.cc | 12 +- .../plugins/alpaka/vertexFinder.h | 2 +- 99 files changed, 3796 insertions(+), 2236 deletions(-) create mode 100644 DataFormats/TrackSoA/test/TestReadHostTrackSoA.cc create mode 100644 DataFormats/TrackSoA/test/TestWriteHostTrackSoA.cc create mode 100644 DataFormats/TrackSoA/test/testReadHostTrackSoA.py create mode 100755 DataFormats/TrackSoA/test/testWriteAndReadTrackSoA.sh create mode 100644 DataFormats/TrackSoA/test/testWriteHostTrackSoA.py create mode 100644 DataFormats/TrackingRecHitSoA/test/TestReadHostHitSoA.cc create mode 100644 DataFormats/TrackingRecHitSoA/test/TestWriteHostHitSoA.cc create mode 100644 DataFormats/TrackingRecHitSoA/test/testReadHostHitSoA.py create mode 100755 DataFormats/TrackingRecHitSoA/test/testWriteAndReadHitSoA.sh create mode 100644 DataFormats/TrackingRecHitSoA/test/testWriteHostHitSoA.py create mode 100644 RecoTracker/PixelSeeding/interface/CACoupleDevice.h create mode 100644 RecoTracker/PixelSeeding/interface/CACoupleHost.h create mode 100644 RecoTracker/PixelSeeding/interface/CACoupleSoA.h create mode 100644 RecoTracker/PixelSeeding/interface/alpaka/CACoupleSoACollection.h create mode 100644 RecoTracker/PixelSeeding/plugins/alpaka/CAGeometryESProucer.cc create mode 100644 RecoTracker/PixelSeeding/plugins/alpaka/CASimpleCell.h create mode 100644 RecoTracker/PixelSeeding/python/CAGeometryESProducer_cfi.py create mode 100644 RecoTracker/PixelSeeding/test/alpaka/CAGeometry_t.cpp create mode 100644 RecoTracker/PixelSeeding/test/alpaka/CAGeometry_t.h create mode 100644 RecoTracker/Record/interface/CAGeometryDevice.h create mode 100644 RecoTracker/Record/interface/CAGeometryHost.h create mode 100644 RecoTracker/Record/interface/CAGeometrySoA.h create mode 100644 RecoTracker/Record/interface/alpaka/CAGeometrySoACollection.h create mode 100644 RecoTracker/Record/src/ES_CAGeometry.cc create mode 100644 RecoTracker/Record/src/alpaka/ES_CAGeometrySoACollection.cc Switched to branch 'from-CMSSW_15_1_X_2025-03-27-2300'