Check variadic pattern arguments at compile time #356
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,8 @@ | ||
| #ifndef DASH__INTERNAL__PATTERN_ARGUMENTS_H_ | ||
| #define DASH__INTERNAL__PATTERN_ARGUMENTS_H_ | ||
|
|
||
| #include <utility> | ||
|
|
||
| #include <dash/Types.h> | ||
| #include <dash/Team.h> | ||
| #include <dash/Dimensional.h> | ||
|
|
@@ -25,7 +27,7 @@ template< | |
| dim_t NumDimensions, | ||
| typename IndexType = dash::default_index_t> | ||
| class PatternArguments { | ||
| public: | ||
| /// Derive size type from given signed index / ptrdiff type | ||
| typedef typename std::make_unsigned<IndexType>::type | ||
| SizeType; | ||
|
|
@@ -51,12 +53,6 @@ class PatternArguments { | |
| ViewSpec_t _viewspec; | ||
| /// Team containing all units to which pattern elements are mapped | ||
| Team * _team = nullptr; | ||
|
|
||
| public: | ||
| /** | ||
|
|
@@ -71,27 +67,14 @@ class PatternArguments { | |
| */ | ||
| template<typename ... Args> | ||
| PatternArguments(Args && ... args) { | ||
| // Parse argument list: | ||
| parse<0, 0, 0, 0>(std::forward<Args>(args)...); | ||
| } | ||
|
|
||
|
|
||
| public: | ||
|
|
||
|
|
||
| bool is_tiled() const { | ||
| for (auto d = 0; d < NumDimensions; ++d) { | ||
| if (_distspec[d].is_tiled()) { | ||
|
|
@@ -121,72 +104,163 @@ class PatternArguments { | |
| } | ||
|
|
||
| private: | ||
| /* | ||
| * Match for up to \c NumDimensions extent value of type SizeType. | ||
| * | ||
| * \tparam ArgcSize The number of arguments describing the extents of the | ||
| * pattern parsed so far. | ||
| * Set to -1 if a \c SizeSpec is encountered. | ||
| * \tparam ArgcDist The number of arguments describing the distribution of | ||
| * the pattern parsed so far. | ||
| * Set to -1 if a \c DistributionSpec is encountered. | ||
| * \tparam ArgcTeam The number of arguments describing the team/unit | ||
| * distribution of the pattern parsed so far. | ||
| * Set to -1 if a \c TeamSpec is encountered. | ||
| */ | ||
| template< | ||
| int ArgcSize, | ||
| int ArgcDist, | ||
| int ArgcTeam, | ||
| int ArgcTeamSpec, | ||
| typename ... Args> | ||
| void parse(SizeType extent, Args && ... args) { | ||
| static_assert(ArgcSize >= 0, "Cannot mix size and SizeSpec definition" | ||
| "in variadic pattern constructor!"); | ||
| DASH_LOG_TRACE("PatternArguments.check(extent)", extent); | ||
| static_assert(ArgcSize < NumDimensions, "Number of size specifier exceeds" | ||
| "the number of dimensions in variadic pattern constructor!"); | ||
| DASH_LOG_TRACE("PatternArguments.check(extent)", extent); | ||
| _sizespec.resize(ArgcSize, extent); | ||
| parse<ArgcSize+1, ArgcDist, ArgcTeam, | ||
| ArgcTeamSpec>(std::forward<Args>(args)...); | ||
| } | ||
|
|
||
| /* | ||
| * Match for one optional parameter specifying the size (extents). | ||
| */ | ||
| template< | ||
| int ArgcSize, | ||
| int ArgcDist, | ||
| int ArgcTeam, | ||
| int ArgcTeamSpec, | ||
| typename ... Args> | ||
| void parse(const SizeSpec_t & sizeSpec, Args && ... args) { | ||
| static_assert(ArgcSize == 0, "Cannot mix size and SizeSpec definition" | ||
| "in variadic pattern constructor!"); | ||
| DASH_LOG_TRACE("PatternArguments.check(sizeSpec)"); | ||
| _sizespec = sizeSpec; | ||
| parse<-1, ArgcDist, ArgcTeam, | ||
| ArgcTeamSpec>(std::forward<Args>(args)...); | ||
| } | ||
|
|
||
| /* | ||
| * Match for \c TeamSpec describing the distribution among the units | ||
| * in the team. | ||
| */ | ||
| template< | ||
| int ArgcSize, | ||
| int ArgcDist, | ||
| int ArgcTeam, | ||
| int ArgcTeamSpec, | ||
| typename ... Args> | ||
| void parse(const TeamSpec_t & teamSpec, Args && ... args) { | ||
| static_assert(ArgcTeamSpec == 0, "Cannot specify TeamSpec twice in " | ||
| "variadic pattern constructor!"); | ||
| DASH_LOG_TRACE("PatternArguments.check(teamSpec)"); | ||
| // TODO: there is no way to check whether this TeamSpec | ||
| // was created from the team provided in the variadic arguments. | ||
| _teamspec = teamSpec; | ||
| parse<ArgcSize, ArgcDist, ArgcTeam, 1>(std::forward<Args>(args)...); | ||
| } | ||
|
|
||
| /* | ||
| * Match for one optional parameter specifying the team. | ||
| */ | ||
| template< | ||
| int ArgcSize, | ||
| int ArgcDist, | ||
| int ArgcTeam, | ||
| int ArgcTeamSpec, | ||
| typename ... Args> | ||
| void parse(dash::Team & team, Args && ... args) { | ||
| static_assert(!(ArgcTeam > 0), | ||
| "Cannot specify Team twice in variadic " | ||
| "pattern constructor!"); | ||
| DASH_LOG_TRACE("PatternArguments.check(team)"); | ||
| // assign team, TeamSpec will be created when parsing is finished | ||
| // and no TeamSpec has been found. | ||
| _team = &team; | ||
| parse<ArgcSize, ArgcDist, 1, | ||
| ArgcTeamSpec>(std::forward<Args>(args)...); | ||
| } | ||
|
|
||
| /* | ||
| * Match for one optional parameter specifying the distribution. | ||
| */ | ||
| template< | ||
| int ArgcSize, | ||
| int ArgcDist, | ||
| int ArgcTeam, | ||
| int ArgcTeamSpec, | ||
| typename ... Args> | ||
| void parse(const DistributionSpec_t & ds, Args && ... args) { | ||
| static_assert(ArgcDist == 0, "Cannot mix DistributionSpec and inidividual" | ||
| "distributions in variadic pattern constructor!"); | ||
| DASH_LOG_TRACE("PatternArguments.check(distSpec)"); | ||
| _distspec = ds; | ||
| parse<ArgcSize, -1, ArgcTeam, | ||
| ArgcTeam>(std::forward<Args>(args)...); | ||
|
There was a problem hiding this comment. Is the use of |
||
| } | ||
|
|
||
| /* | ||
| * Match for up to \c NumDimensions optional parameters | ||
| * specifying the distribution. | ||
| */ | ||
| template< | ||
| int ArgcSize, | ||
| int ArgcDist, | ||
| int ArgcTeam, | ||
| int ArgcTeamSpec, | ||
| typename ... Args> | ||
| void parse(const Distribution & ds, Args && ... args) { | ||
| static_assert(!(ArgcDist < 0), "Cannot mix DistributionSpec and " | ||
| "inidividual distributions in variadic pattern constructor!"); | ||
| static_assert(ArgcDist < NumDimensions, "Number of distribution specifier" | ||
| " exceeds the number of dimensions in variadic pattern constructor!"); | ||
| DASH_LOG_TRACE("PatternArguments.check(dist)"); | ||
| _distspec[ArgcDist] = ds; | ||
| parse<ArgcSize, ArgcDist+1, ArgcTeam, | ||
| ArgcTeam>(std::forward<Args>(args)...); | ||
|
|
||
| } | ||
|
|
||
| /** | ||
| * Stop recursion when all arguments are processed. | ||
| */ | ||
| template< | ||
| int ArgcSize, | ||
| int ArgcDist, | ||
| int ArgcTeam, | ||
| int ArgcTeamSpec> | ||
| void parse() { | ||
| static_assert(!(ArgcDist > 0 && ArgcDist != NumDimensions), | ||
| "Incomplete distribution specification in " | ||
| "variadic pattern constructor!"); | ||
|
|
||
| static_assert(!(ArgcSize > 0 && ArgcSize != NumDimensions), | ||
| "Incomplete size specification in " | ||
| "variadic pattern constructor!"); | ||
|
|
||
| /* | ||
| * TODO: we have no way to statically check whether a TeamSpec was created | ||
| * using the team specified by the user. | ||
| */ | ||
| if (ArgcTeam && !ArgcTeamSpec) { | ||
| _teamspec = TeamSpec_t(_distspec, *_team); | ||
| } | ||
|
There was a problem hiding this comment. I think it is possible to return without if(!ArgcTeam) {
_team = &dash::Team::All()
}
if(!ArgcTeamSpec) {
_teamspec = TeamSpec_t(_distspec, *_team);
}I'm not sure about the use cases of this constructor, There was a problem hiding this comment. The |
||
|
|
||
| check_tile_constraints(); | ||
| } | ||
|
|
||
| /// Check pattern constraints for tile | ||
| void check_tile_constraints() const { | ||
| bool has_tile = false; | ||
|
|
@@ -197,20 +271,22 @@ class PatternArguments { | |
| if (_distspec.dim(i).type != _distspec.dim(i+1).type) | ||
| invalid = true; | ||
| } | ||
| if (has_tile) { | ||
| if (invalid) { | ||
| DASH_THROW(dash::exception::InvalidArgument, | ||
| "Pattern arguments invalid: Mixed distribution types"); | ||
| } | ||
|
|
||
| for (auto i = 0; i < NumDimensions; i++) { | ||
| DASH_ASSERT_ALWAYS( | ||
| _sizespec.extent(i) % (_distspec.dim(i).blocksz) | ||
| == 0); | ||
| } | ||
| } | ||
| } | ||
| }; | ||
|
|
||
|
|
||
| } // namespace internal | ||
| } // namespace dash | ||
|
|
||
|
|
||
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why public?