Refactor track initialization code #240
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sethrj
reviewed
May 15, 2021
src/sim/TrackInitInterface.hh
Outdated
| //// DATA //// | ||
|
|
||
| Items<Primary> primaries; //!< Primary partiicles | ||
| size_type storage_factor = 3; //!< Initializer/parent storage per tracks |
src/sim/TrackInitUtils.cc
Outdated
| { | ||
| CELER_EXPECT(params); | ||
| CELER_EXPECT(*data); |
src/sim/TrackInterface.hh
Outdated
| = ParamsData<Ownership::const_reference, MemSpace::device>; | ||
| using StateDeviceRef = StateData<Ownership::reference, MemSpace::device>; | ||
|
|
||
| #ifndef __CUDA_ARCH__ |
There was a problem hiding this comment.
As of #226 we no longer have to bother with the CUDA_ARCH complier exclusion, to simplify things
There was a problem hiding this comment.
Forgot about that, thanks!
src/sim/detail/InitializeTracks.cu
Outdated
| // most recently added and therefore the ones that still might have a | ||
| // parent they can copy the geometry state from. | ||
| const TrackInitializer& init | ||
| = inits.initializers[ThreadId(inits.initializers.size() - tid.get() - 1)]; |
There was a problem hiding this comment.
Since this uses unsigned integer arithmetic which can overflow, could you check this by inserting:
CELER_ASSERT(tid.get() + 1 <= inits.initializers.size());
and same right before vac_id?
src/sim/detail/InitializeTracks.cu
Outdated
| // Copy the geometry state from the parent for improved | ||
| // performance | ||
| ThreadId parent_id | ||
| = inits.parents[ThreadId(inits.parents.size() - tid.get() - 1)]; |
There was a problem hiding this comment.
Same here -- actually at this point I think you should define a
inline CELER_FUNCTION ThreadId from_back(size_type size, ThreadId cur_thread)and reuse it in the three places (and the assertion can be a CELER_EXPECT at the top of the function)
sethrj
approved these changes
May 15, 2021
mrguilima
pushed a commit
to mrguilima/celeritas
that referenced
this pull request
May 17, 2021
* Use collections for track initializer interface * Separate track initialization data storage from functionality * Template TrackInterface on Ownership and MemSpace and remove State/ParamStore * Address reviewer feedback
sethrj
added
internal
minor
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This converts the rest of the track initialization data to use
Collections and separates the storage of the data from the functionality.