Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Follow up to the Alpaka integration in CMSSW #43853

Merged
merged 25 commits into from
Feb 12, 2024
Merged

Follow up to the Alpaka integration in CMSSW #43853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
28bcb55
Skip invalid or corrupted ROCs
fwyzard Feb 2, 2024
e142ccc
Add check on the ROC range
fwyzard Feb 2, 2024
a2c7a27
Clean up includes and dependencies in pixel CondFormats
fwyzard Feb 3, 2024
2b5e6f6
Add overflow checks to CountModules::operator()
fwyzard Feb 3, 2024
937f0da
Rewrite the pixel clustering code
fwyzard Feb 4, 2024
571c91f
Rewrite the pixel charge cut code
fwyzard Feb 5, 2024
357cfba
Update comments to pixel topologies
fwyzard Feb 3, 2024
8f6ecae
Fixed decoding of the pixel timeout error
AdrianoDee Feb 5, 2024
c073269
Fix check for invalid pixel digis
AdrianoDee Feb 5, 2024
1f91765
Fix the constants used in the pixel clustering
fwyzard Feb 5, 2024
c116e10
Minor clean up of legacy CUDA code
fwyzard Feb 5, 2024
f3592ed
Renumber the ECAL-only alpaka workflow to .412
fwyzard Feb 6, 2024
e16a1a8
Add pixel-only alpaka workflows to the README
fwyzard Feb 6, 2024
0851cc3
Add alpaka workflows to the GPU relvals
fwyzard Feb 7, 2024
9369dbc
Add a protection for quasi-empty events
fwyzard Feb 7, 2024
63902cb
Fix include guards, clean up namespaces and includes
fwyzard Feb 9, 2024
ff7e930
Adjust the size of the collection created by CopyToHost::copyAsync
fwyzard Feb 9, 2024
bd9fe2d
Synchronise the treatment of pixel errors 26, 27, 30 with legacy code
fwyzard Feb 10, 2024
b3de2a3
Rewrite the uniform element kernel loops
fwyzard Feb 9, 2024
5a87cef
Rewrite the independent element kernel loops
fwyzard Feb 9, 2024
70371a8
Rewrite zeroAndInit kernel using alpakatools utilities
fwyzard Feb 11, 2024
2d01108
Rewrite pixel clustering and rechits using alpakatools utilities
fwyzard Feb 9, 2024
1bd5d4a
Rewrite pixel seeding using alpakatools utilities
fwyzard Feb 11, 2024
008ca51
Rename elements_with_stride to uniform_elements in user code
fwyzard Feb 10, 2024
c7d3641
Remove obsolete alpakatools utilities
fwyzard Feb 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions CondFormats/SiPixelObjects/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
<use name="alpaka"/>
<use name="DataFormats/DetId"/>
<use name="DataFormats/SiPixelDetId"/>
<use name="CalibFormats/SiPixelObjects"/>
<use name="FWCore/Utilities"/>
<use name="DataFormats/FEDRawData"/>
<use name="CondFormats/Serialization"/>
<use name="CondCore/DBOutputService"/>
<use name="CondFormats/DataRecord"/>
<use name="CondFormats/SiStripObjects"/>
<use name="Geometry/TrackerGeometryBuilder"/>
<use name="CondFormats/External"/>
<use name="CondFormats/Serialization"/>
<use name="CondFormats/SiStripObjects"/>
<use name="DataFormats/DetId"/>
<use name="DataFormats/FEDRawData"/>
<use name="DataFormats/GeometryVector"/>
<use name="DataFormats/Portable"/>
<use name="DataFormats/SiPixelDetId"/>
<use name="DataFormats/SoATemplate"/>
<use name="DataFormats/TrackerCommon"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/Utilities"/>
<use name="Geometry/CommonDetUnit"/>
<use name="Geometry/CommonTopologies"/>
<use name="HeterogeneousCore/AlpakaInterface"/>
<use name="Geometry/TrackerGeometryBuilder"/>
<use name="HeterogeneousCore/AlpakaCore"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is certainly beyond this PR, but I want to note nevertheless the AlpakaCore dependence smells (because of its dependence on the FWCore/Framework). It is, however, needed (even with this PR) because of

cmssw/CondFormats/SiPixelObjects/src/alpaka/T_EventSetup_SiPixelGainCalibrationForHLTDevice.cc

Line 2 in a37e29d

#include "HeterogeneousCore/AlpakaCore/interface/alpaka/typelookup.h"

and

cmssw/HeterogeneousCore/AlpakaCore/interface/alpaka/typelookup.h

Line 5 in a37e29d

#include "HeterogeneousCore/AlpakaCore/interface/alpaka/ESDeviceProduct.h"

A simple fix would be to move HeterogeneousCore/AlpakaCore/interface/alpaka/typelookup.h and HeterogeneousCore/AlpakaCore/interface/alpaka/ESDeviceProduct.h to HeterogeneousCore/AlpakaInterface.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mhm... I think that ALPAKA_ACCELERATOR_NAMESPACE::ESDeviceProduct<T> is something too framework specific for HeterogeneousCore/AlpakaInterface ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AlpakaInterface has already

cmssw/HeterogeneousCore/AlpakaInterface/interface/CopyToDevice.h

Lines 4 to 5 in 70c7fb8

// TODO: this utility class is specific to CMSSW, but needs to be in a
// package that is suitable as DataFormat dependence

and

cmssw/HeterogeneousCore/AlpakaInterface/interface/CopyToHost.h

Lines 4 to 5 in 70c7fb8

// TODO: this utility class is specific to CMSSW, but needs to be in a
// package that is suitable as DataFormat dependence

Maybe we need a new package then for CMSSW-specific classes that must not depend on FWCore/Framework?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I see.

<use name="HeterogeneousCore/AlpakaInterface"/>
<flags ALPAKA_BACKENDS="1"/>
<export>
<lib name="1"/>
Expand Down
9 changes: 4 additions & 5 deletions CondFormats/SiPixelObjects/interface/SiPixelMappingHost.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
#ifndef CondFormats_SiPixelObjects_SiPixelMappingHost_h
#define CondFormats_SiPixelObjects_SiPixelMappingHost_h
#ifndef CondFormats_SiPixelObjects_interface_SiPixelMappingHost_h
#define CondFormats_SiPixelObjects_interface_SiPixelMappingHost_h

#include <alpaka/alpaka.hpp>
#include "DataFormats/Portable/interface/PortableHostCollection.h"
#include "CondFormats/SiPixelObjects/interface/SiPixelMappingLayout.h"
#include "DataFormats/Portable/interface/PortableHostCollection.h"

using SiPixelMappingHost = PortableHostCollection<SiPixelMappingSoA>;

#endif // CondFormats_SiPixelObjects_SiPixelMappingHost_h
#endif // CondFormats_SiPixelObjects_interface_SiPixelMappingHost_h
5 changes: 3 additions & 2 deletions CondFormats/SiPixelObjects/interface/alpaka/SiPixelGainCalibrationForHLTDevice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
#ifndef CondFormats_SiPixelObjects_interface_alpaka_SiPixelGainCalibrationForHLTDevice_h
#define CondFormats_SiPixelObjects_interface_alpaka_SiPixelGainCalibrationForHLTDevice_h

#include <alpaka/alpaka.hpp>
#include "DataFormats/Portable/interface/alpaka/PortableCollection.h"
#include "CondFormats/SiPixelObjects/interface/SiPixelGainCalibrationForHLTLayout.h"
#include "DataFormats/Portable/interface/alpaka/PortableCollection.h"
#include "HeterogeneousCore/AlpakaInterface/interface/config.h"

namespace ALPAKA_ACCELERATOR_NAMESPACE {

using SiPixelGainCalibrationForHLTDevice = PortableCollection<SiPixelGainCalibrationForHLTSoA>;

} // namespace ALPAKA_ACCELERATOR_NAMESPACE

#endif // CondFormats_SiPixelObjects_interface_alpaka_SiPixelGainCalibrationForHLTDevice_h
5 changes: 2 additions & 3 deletions CondFormats/SiPixelObjects/interface/alpaka/SiPixelMappingDevice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
#define CondFormats_SiPixelObjects_interface_alpaka_SiPixelMappingDevice_h

#include <cstdint>
#include <alpaka/alpaka.hpp>

#include "DataFormats/Portable/interface/alpaka/PortableCollection.h"
#include "CondFormats/SiPixelObjects/interface/SiPixelMappingLayout.h"
#include "HeterogeneousCore/AlpakaCore/interface/alpaka/ESProducer.h"
#include "DataFormats/Portable/interface/PortableHostCollection.h"
#include "HeterogeneousCore/AlpakaInterface/interface/config.h"

namespace ALPAKA_ACCELERATOR_NAMESPACE {

Expand Down
11 changes: 9 additions & 2 deletions CondFormats/SiPixelObjects/interface/alpaka/SiPixelMappingUtilities.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
#ifndef CondFormats_SiPixelObjects_interface_alpaka_SiPixelMappingUtilities_h
#define CondFormats_SiPixelObjects_interface_alpaka_SiPixelMappingUtilities_h

#include <cstdint>
#include <set>
#include <vector>

#include <alpaka/alpaka.hpp>
#include "CondFormats/SiPixelObjects/interface/SiPixelMappingLayout.h"

#include "CondFormats/SiPixelObjects/interface/CablingPathToDetUnit.h"
#include "CondFormats/SiPixelObjects/interface/PixelROC.h"
#include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingMap.h"
#include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingTree.h"
#include "CondFormats/SiPixelObjects/interface/SiPixelMappingLayout.h"
#include "CondFormats/SiPixelObjects/interface/SiPixelROCsStatusAndMapping.h"
#include "HeterogeneousCore/AlpakaInterface/interface/config.h"
#include "HeterogeneousCore/AlpakaInterface/interface/memory.h"

namespace ALPAKA_ACCELERATOR_NAMESPACE {
Expand Down
4 changes: 4 additions & 0 deletions CondFormats/SiPixelObjects/test/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<use name="CondCore/DBOutputService"/>
<use name="CondFormats/DataRecord"/>
<use name="CondFormats/SiPixelObjects"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ServiceRegistry"/>
<use name="Geometry/Records"/>
<use name="Geometry/TrackerGeometryBuilder"/>
<library name="SiPixelObjectsTest" file="*.cc">
<flags EDM_PLUGIN="1"/>
Expand Down
5 changes: 4 additions & 1 deletion Configuration/PyReleaseValidation/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@ The offsets currently in use are:
* 0.2: Tracking Run-2 era, `Run2_2017_trackingRun2`
* 0.3: 0.1 + 0.2
* 0.4: LowPU tracking era, `Run2_2017_trackingLowPU`
* 0.411: Patatrack, ECAL only, Alpaka
* 0.402: Alpaka, pixel only quadruplets, portable
* 0.403: Alpaka, pixel only quadruplets, portable vs. CPU validation
* 0.404: Alpaka, pixel only quadruplets, portable profiling
* 0.412: Alpaka, ECAL only, portable
* 0.5: Pixel tracking only + 0.1
* 0.501: Patatrack, pixel only quadruplets, on CPU
* 0.502: Patatrack, pixel only quadruplets, with automatic offload to GPU if available
Expand Down
22 changes: 17 additions & 5 deletions Configuration/PyReleaseValidation/python/relval_gpu.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@

# mc WFs to run in IB:

# mc 2023 Patatrack pixel-only quadruplets: ZMM - on GPU (optional), GPU-vs-CPU validation, profiling
# mc 2023 Alpaka pixel-only quadruplets: ZMM: any backend, any backend vs cpu validation, profiling
# Alpaka pixel-only quadruplets: TTbar: any backend, any backend vs cpu validation, profiling
# Alpaka ECAL-only: TTbar: any backend
# Alpaka pixel-only quadruplets: Single Nu E10: any backend
# Patatrack pixel-only quadruplets: ZMM - on GPU (optional), GPU-vs-CPU validation, profiling
# Patatrack pixel-only triplets: ZMM - on GPU (optional), GPU-vs-CPU validation, profiling
# Patatrack pixel-only quadruplets: TTbar - on GPU (optional), GPU-vs-CPU validation, profiling
# Patatrack pixel-only triplets: TTbar - on GPU (optional), GPU-vs-CPU validation, profiling
Expand All @@ -23,10 +27,17 @@
# Patatrack pixel-only triplets, ECAL, HCAL: TTbar - on GPU (optional), GPU-vs-CPU validation, profiling (to be implemented)
# full reco with Patatrack pixel-only quadruplets: TTbar - on GPU (optional), GPU-vs-CPU validation
# full reco with Patatrack pixel-only triplets: TTbar - on GPU (optional), GPU-vs-CPU validation
# Patatrack Single Nu E10 on GPU (optional)
# mc 2026 Patatrack Single Nu E10 on GPU (optional)
# Patatrack pixel-only quadruplets: Single Nu E10 on GPU (optional)
# mc 2026 Patatrack pixel-only quadruplets: Single Nu E10 on GPU (optional)
numWFIB = [
# 2023
# 2023, Alpaka-based
12450.402, 12450.403, 12450.404,
#12450.406, 12450.407, 12450.408,
12434.402, 12434.403, 12434.404,
#12434.406, 12434.407, 12434.408,
12434.412, #12434.413, 12434.414,
12461.402,
# 2023, CUDA-based
12450.502, 12450.503, 12450.504,
12450.506, 12450.507, 12450.508,
12434.502, 12434.503, 12434.504,
Expand All @@ -37,7 +48,8 @@
12434.586, 12434.587, # 12434.588,
12434.592, 12434.593,
12434.596, 12434.597,
12461.502,
12461.502,
# 2026, CUDA-based
24861.502
]

Expand Down
2 changes: 1 addition & 1 deletion Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1073,7 +1073,7 @@ def setup_(self, step, stepName, stepDict, k, properties):
'-s': 'HARVESTING:@ecalOnlyValidation+@ecal'
},
suffix = 'Patatrack_ECALOnlyAlpaka',
offset = 0.411,
offset = 0.412,
)

# ECAL-only workflow running on CPU
Expand Down
3 changes: 2 additions & 1 deletion DataFormats/SiPixelClusterSoA/interface/alpaka/SiPixelClustersSoACollection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ namespace cms::alpakatools {
struct CopyToHost<SiPixelClustersDevice<TDevice>> {
template <typename TQueue>
static auto copyAsync(TQueue &queue, SiPixelClustersDevice<TDevice> const &srcData) {
SiPixelClustersHost dstData(srcData->metadata().size(), queue);
// SiPixelClustersHost and SiPixelClustersDevice have a capacity larger than the ctor argument by one
SiPixelClustersHost dstData(srcData->metadata().size() - 1, queue);
alpaka::memcpy(queue, dstData.buffer(), srcData.buffer());
dstData.setNClusters(srcData.nClusters(), srcData.offsetBPIX2());
#ifdef GPU_DEBUG //keeping this untiil copies are in the Tracer
Expand Down
4 changes: 2 additions & 2 deletions DataFormats/SiPixelClusterSoA/test/alpaka/Clusters_test.dev.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
public:
template <typename TAcc, typename = std::enable_if_t<isAccelerator<TAcc>>>
ALPAKA_FN_ACC void operator()(TAcc const& acc, SiPixelClustersSoAView clust_view) const {
for (int32_t j : elements_with_stride(acc, clust_view.metadata().size())) {
for (int32_t j : uniform_elements(acc, clust_view.metadata().size())) {
clust_view[j].moduleStart() = j;
clust_view[j].clusInModule() = j * 2;
clust_view[j].moduleId() = j * 3;
Expand All @@ -28,7 +28,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
public:
template <typename TAcc, typename = std::enable_if_t<isAccelerator<TAcc>>>
ALPAKA_FN_ACC void operator()(TAcc const& acc, SiPixelClustersSoAConstView clust_view) const {
for (uint32_t j : elements_with_stride(acc, clust_view.metadata().size())) {
for (uint32_t j : uniform_elements(acc, clust_view.metadata().size())) {
assert(clust_view[j].moduleStart() == j);
assert(clust_view[j].clusInModule() == j * 2);
assert(clust_view[j].moduleId() == j * 3);
Expand Down
15 changes: 10 additions & 5 deletions DataFormats/TrackSoA/interface/alpaka/TrackUtilities.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
#ifndef DataFormats_Track_interface_alpaka_TrackUtilities_h
#define DataFormats_Track_interface_alpaka_TrackUtilities_h
#ifndef DataFormats_TrackSoA_interface_alpaka_TrackUtilities_h
#define DataFormats_TrackSoA_interface_alpaka_TrackUtilities_h

#include <algorithm>
#include <cmath>
#include <cstdint>

#include <alpaka/alpaka.hpp>

#include "Geometry/CommonTopologies/interface/SimplePixelTopology.h"
#include "DataFormats/TrackSoA/interface/TrackDefinitions.h"
#include "DataFormats/TrackSoA/interface/TracksSoA.h"
#include "Geometry/CommonTopologies/interface/SimplePixelTopology.h"

// Methods that operate on View and ConstView of the TrackSoA, and cannot be class methods.
template <typename TrackerTraits>
Expand Down Expand Up @@ -170,4 +175,4 @@ namespace pixelTrack {
template struct TracksUtilities<pixelTopology::Phase1>;
template struct TracksUtilities<pixelTopology::Phase2>;

#endif
#endif // DataFormats_TrackSoA_interface_alpaka_TrackUtilities_h
18 changes: 10 additions & 8 deletions DataFormats/TrackSoA/interface/alpaka/TracksSoACollection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
#ifndef DataFormats_Track_interface_alpaka_TracksSoACollection_h
#define DataFormats_Track_interface_alpaka_TracksSoACollection_h
#ifndef DataFormats_TrackSoA_interface_alpaka_TracksSoACollection_h
#define DataFormats_TrackSoA_interface_alpaka_TracksSoACollection_h

#include <type_traits>

#include <cstdint>
#include <alpaka/alpaka.hpp>
#include "HeterogeneousCore/AlpakaInterface/interface/config.h"

#include "DataFormats/Portable/interface/alpaka/PortableCollection.h"
#include "DataFormats/TrackSoA/interface/TracksSoA.h"
#include "DataFormats/TrackSoA/interface/TrackDefinitions.h"
#include "DataFormats/TrackSoA/interface/TracksHost.h"
#include "DataFormats/TrackSoA/interface/TracksDevice.h"
#include "DataFormats/TrackSoA/interface/TracksHost.h"
#include "Geometry/CommonTopologies/interface/SimplePixelTopology.h"
#include "HeterogeneousCore/AlpakaInterface/interface/AssertDeviceMatchesHostCollection.h"
#include "HeterogeneousCore/AlpakaInterface/interface/CopyToHost.h"
#include "HeterogeneousCore/AlpakaInterface/interface/config.h"

// TODO: The class is created via inheritance of the PortableCollection.
// This is generally discouraged, and should be done via composition.
Expand Down Expand Up @@ -49,4 +51,4 @@ ASSERT_DEVICE_MATCHES_HOST_COLLECTION(pixelTrack::TracksSoACollectionPhase1, pix
ASSERT_DEVICE_MATCHES_HOST_COLLECTION(pixelTrack::TracksSoACollectionPhase2, pixelTrack::TracksHostPhase2);
ASSERT_DEVICE_MATCHES_HOST_COLLECTION(pixelTrack::TracksSoACollectionHIonPhase1, pixelTrack::TracksHostHIonPhase1);

#endif // DataFormats_Track_interface_alpaka_TracksSoACollection_h
#endif // DataFormats_TrackSoA_interface_alpaka_TracksSoACollection_h
2 changes: 1 addition & 1 deletion DataFormats/TrackSoA/src/alpaka/classes_cuda.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

#include "DataFormats/Common/interface/DeviceProduct.h"
#include "DataFormats/Common/interface/Wrapper.h"
#include "DataFormats/TrackSoA/interface/TracksDevice.h"
#include "DataFormats/TrackSoA/interface/TracksSoA.h"
#include "DataFormats/TrackSoA/interface/alpaka/TracksSoACollection.h"
#include "DataFormats/TrackSoA/interface/TracksDevice.h"
#include "HeterogeneousCore/AlpakaInterface/interface/config.h"

using namespace pixelTopology;
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/TrackSoA/src/alpaka/classes_rocm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

#include "DataFormats/Common/interface/DeviceProduct.h"
#include "DataFormats/Common/interface/Wrapper.h"
#include "DataFormats/TrackSoA/interface/TracksDevice.h"
#include "DataFormats/TrackSoA/interface/TracksSoA.h"
#include "DataFormats/TrackSoA/interface/alpaka/TracksSoACollection.h"
#include "DataFormats/TrackSoA/interface/TracksDevice.h"
#include "HeterogeneousCore/AlpakaInterface/interface/config.h"

using namespace pixelTopology;
Expand Down
13 changes: 9 additions & 4 deletions DataFormats/TrackSoA/test/alpaka/TrackSoAHeterogeneous_test.dev.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
#include "Geometry/CommonTopologies/interface/SimplePixelTopology.h"
#include <type_traits>

#include <alpaka/alpaka.hpp>

#include "DataFormats/TrackSoA/interface/TrackDefinitions.h"
#include "DataFormats/TrackSoA/interface/alpaka/TracksSoACollection.h"
#include "DataFormats/TrackSoA/interface/TracksDevice.h"
#include "DataFormats/TrackSoA/interface/TracksHost.h"
#include "DataFormats/TrackSoA/interface/alpaka/TracksSoACollection.h"
#include "Geometry/CommonTopologies/interface/SimplePixelTopology.h"
#include "HeterogeneousCore/AlpakaInterface/interface/config.h"

using namespace reco;

Expand All @@ -22,7 +27,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
tracks_view.nTracks() = nTracks;
}

for (int32_t j : elements_with_stride(acc, nTracks)) {
for (int32_t j : uniform_elements(acc, nTracks)) {
tracks_view[j].pt() = (float)j;
tracks_view[j].eta() = (float)j;
tracks_view[j].chi2() = (float)j;
Expand All @@ -45,7 +50,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
if (cms::alpakatools::once_per_grid(acc)) {
ALPAKA_ASSERT(tracks_view.nTracks() == nTracks);
}
for (int32_t j : elements_with_stride(acc, tracks_view.nTracks())) {
for (int32_t j : uniform_elements(acc, tracks_view.nTracks())) {
ALPAKA_ASSERT(abs(tracks_view[j].pt() - (float)j) < .0001);
ALPAKA_ASSERT(abs(tracks_view[j].eta() - (float)j) < .0001);
ALPAKA_ASSERT(abs(tracks_view[j].chi2() - (float)j) < .0001);
Expand Down
26 changes: 21 additions & 5 deletions DataFormats/TrackingRecHitSoA/interface/TrackingRecHitsDevice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,23 @@
#include "DataFormats/Portable/interface/PortableDeviceCollection.h"
#include "DataFormats/TrackingRecHitSoA/interface/TrackingRecHitsHost.h"
#include "DataFormats/TrackingRecHitSoA/interface/TrackingRecHitsSoA.h"
#include "HeterogeneousCore/AlpakaInterface/interface/config.h"

template <typename TrackerTraits, typename TDev>
class TrackingRecHitDevice : public PortableDeviceCollection<TrackingRecHitLayout<TrackerTraits>, TDev> {
public:
using hitSoA = TrackingRecHitSoA<TrackerTraits>;
//Need to decorate the class with the inherited portable accessors being now a template

// Need to decorate the class with the inherited portable accessors being now a template
using PortableDeviceCollection<TrackingRecHitLayout<TrackerTraits>, TDev>::view;
using PortableDeviceCollection<TrackingRecHitLayout<TrackerTraits>, TDev>::const_view;
using PortableDeviceCollection<TrackingRecHitLayout<TrackerTraits>, TDev>::buffer;

TrackingRecHitDevice() = default;

// Constructor which specifies the SoA size
// Constructor which specifies the SoA size, number of BPIX1 hits, and the modules entry points
template <typename TQueue>
explicit TrackingRecHitDevice(uint32_t nHits, int32_t offsetBPIX2, uint32_t const* hitsModuleStart, TQueue queue)
: PortableDeviceCollection<TrackingRecHitLayout<TrackerTraits>, TDev>(nHits, queue) {
explicit TrackingRecHitDevice(TQueue queue, uint32_t nHits, int32_t offsetBPIX2, uint32_t const* hitsModuleStart)
: PortableDeviceCollection<TrackingRecHitLayout<TrackerTraits>, TDev>(nHits, queue), offsetBPIX2_{offsetBPIX2} {
const auto device = alpaka::getDev(queue);

auto start_h = cms::alpakatools::make_host_view(hitsModuleStart, TrackerTraits::numberOfModules + 1);
Expand All @@ -39,6 +39,22 @@ class TrackingRecHitDevice : public PortableDeviceCollection<TrackingRecHitLayou
}

uint32_t nHits() const { return view().metadata().size(); }

int32_t offsetBPIX2() const { return offsetBPIX2_; }

uint32_t const* hitsModuleStart() const { return view().hitsModuleStart().data(); }

// asynchronously update the information cached within the class itself from the information on the device
template <typename TQueue>
void updateFromDevice(TQueue queue) {
auto off_h = cms::alpakatools::make_host_view(offsetBPIX2_);
auto off_d = cms::alpakatools::make_device_view(alpaka::getDev(queue), view().offsetBPIX2());
alpaka::memcpy(queue, off_h, off_d);
}

private:
// offsetBPIX2 is used on host functions so is useful to have it also stored in the class and not only in the layout
int32_t offsetBPIX2_ = 0;
};

#endif // DataFormats_RecHits_interface_TrackingRecHitSoADevice_h
Loading