Skip to content

Commit

Permalink
Review partial fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
byjtew committed Feb 16, 2024
1 parent c1457a7 commit ae405a4
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 10 deletions.
10 changes: 5 additions & 5 deletions include/graphblas/reference/compressed_storage.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ namespace grb {
* Performs no safety checking. Performs no (re-)allocations.
*
* @param[out] output The container to copy the coordinates to.
* @param[in] input The container to copy the coordinates from.
* @param[in] nz The number of nonzeroes in the \a other container.
* @param[in] m The index dimension of the \a other container.
* @param[in] k The start position to copy from (inclusive).
* @param[in] end The end position to copy to (exclusive).
* @param[in] input The container to copy the coordinates from.
* @param[in] nz The number of nonzeroes in the \a other container.
* @param[in] m The index dimension of the \a other container.
* @param[in] k The start position to copy from (inclusive).
* @param[in] end The end position to copy to (exclusive).
*
* The copy range is 2nz + m + 1, i.e.,
* -# 0 <= start < 2nz + m + 1
Expand Down
16 changes: 11 additions & 5 deletions include/graphblas/reference/io.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -642,8 +642,10 @@ namespace grb {
*
* \todo Check and, if needed, revise performance semantics.
*/
template< Descriptor descr = descriptors::no_operation,
typename OutputType, typename InputType, typename Coords >
template<
Descriptor descr = descriptors::no_operation,
typename OutputType, typename InputType, typename Coords
>
RC set(
Vector< OutputType, reference, Coords > &x,
const Vector< InputType, reference, Coords > &y,
Expand Down Expand Up @@ -989,11 +991,15 @@ namespace grb {
"if A is a mask, then C must not be a void matrix"
);
static_assert(
A_is_mask ||
( !A_is_mask &&
std::is_convertible< ValueType, OutputType >::value ),
A_is_mask || std::is_convertible< ValueType, OutputType >::value,
"internal::grb::set called with non-matching value types"
);
static_assert(
! A_is_mask ||
! ( descr & descriptors::structural && descr & descriptors::invert_mask ),
"internal::grb::set can not be called with both descriptors::structural "
"and descriptors::invert_mask in the masked variant"
);
NO_CAST_ASSERT(
( !( descr & descriptors::no_casting ) ||
( !A_is_mask && std::is_same< InputType, OutputType >::value ) ),
Expand Down

0 comments on commit ae405a4

Please sign in to comment.