Skip to content

575 fix the placement of operations and includes in blas files #111

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

Merged
23 commits merged into from
Oct 25, 2022
Merged

575 fix the placement of operations and includes in blas files #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
31a057a
Move clear from blas1 to io. Also add missing io file in root
Oct 21, 2022
58caae0
Remove unnecessary functions from blas1.hpp
Oct 21, 2022
ae55714
Fix the way NO_CAST_ASSERT and NO_CAST_OP_ASSERT are defined
Oct 21, 2022
7cf7a46
Add missing includes
Oct 21, 2022
7383b0d
Move resize to io.hpp
Oct 21, 2022
1f83d0d
Move set operations to io.hpp
Oct 21, 2022
e087e56
Remove setElement taking a C++ scalar
Oct 21, 2022
4368524
Add base definitions for blas1.hpp
Oct 24, 2022
08b0bc4
Generalize base IO primitives over backend
Oct 24, 2022
3ce0851
Add missing NO_CAST_ASSERT definition in IO
Oct 24, 2022
dbf2337
Place dummy function definitions from blas1 into the base blas1 header
Oct 24, 2022
6dbca5b
Remove masked operation variants from blas1
Oct 24, 2022
6f13b2f
Fix minor code style issues
Oct 24, 2022
3d82d4e
Move size-related operations to IO
Oct 24, 2022
3a1ded1
Remove unnecessary include
Oct 24, 2022
eb776b8
Remove obsolete blas2 base definitions
Oct 25, 2022
28c2e8a
Move nnz definitions from blas2 to io
Oct 25, 2022
7cc47c7
Add base definitions of corresponding ALP primitives into blas2 base
Oct 25, 2022
3490b98
Remove obsolete operation definitions from blas3 base
Oct 25, 2022
424130e
Add base definitions of operations defined in ALP blas3 files
Oct 25, 2022
06b9122
Minor code style fixes in base/blas0
Oct 25, 2022
8e4fb4d
Minor code style fixes
Oct 25, 2022
d4b777d
Add asserts in base functions without an RC return value
Oct 25, 2022
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
52 changes: 33 additions & 19 deletions include/alp/base/blas0.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,12 @@ namespace alp {
const Scalar< InputType1, InputStructure1, implementation > &x,
const Scalar< InputType2, InputStructure2, implementation > &y,
const OP &op = OP(),
const typename std::enable_if<
const std::enable_if_t<
alp::is_operator< OP >::value &&
!alp::is_object< InputType1 >::value &&
!alp::is_object< InputType2 >::value &&
!alp::is_object< OutputType >::value,
void >::type * = NULL
!alp::is_object< OutputType >::value
> * = nullptr
) {
#ifdef _DEBUG
std::cerr << "Selected backend does not implement alp::apply (scalar)\n";
Expand All @@ -167,10 +167,10 @@ namespace alp {
assert( backend_does_not_support_scalar_apply );
#endif

(void)out;
(void)x;
(void)y;
(void)op;
(void) out;
(void) x;
(void) y;
(void) op;

return UNSUPPORTED;
}
Expand Down Expand Up @@ -248,11 +248,18 @@ namespace alp {
class OP,
typename InputType, typename InputStructure,
typename IOType, typename IOStructure,
enum Backend implementation = config::default_backend >
RC foldr( const Scalar< InputType, InputStructure, implementation > &x,
enum Backend implementation = config::default_backend
>
RC foldr(
const Scalar< InputType, InputStructure, implementation > &x,
Scalar< IOType, IOStructure, implementation > &y,
const OP & op = OP(),
const typename std::enable_if< alp::is_operator< OP >::value && ! alp::is_object< InputType >::value && ! alp::is_object< IOType >::value, void >::type * = NULL ) {
const std::enable_if_t<
alp::is_operator< OP >::value &&
! alp::is_object< InputType >::value &&
! alp::is_object< IOType >::value
> * = nullptr
) {

#ifdef _DEBUG
std::cerr << "Selected backend does not implement alp::foldr (scalar)\n";
Expand All @@ -262,9 +269,9 @@ namespace alp {
assert( backend_does_not_support_scalar_foldr );
#endif

(void)x;
(void)y;
(void)op;
(void) x;
(void) y;
(void) op;

return UNSUPPORTED;
}
Expand Down Expand Up @@ -342,11 +349,18 @@ namespace alp {
class OP,
typename InputType, typename InputStructure,
typename IOType, typename IOStructure,
enum Backend implementation = config::default_backend >
RC foldl( Scalar< IOType, IOStructure, implementation > &x,
enum Backend implementation = config::default_backend
>
RC foldl(
Scalar< IOType, IOStructure, implementation > &x,
const Scalar< InputType, InputStructure, implementation > &y,
const OP & op = OP(),
const typename std::enable_if< alp::is_operator< OP >::value && ! alp::is_object< InputType >::value && ! alp::is_object< IOType >::value, void >::type * = NULL ) {
const std::enable_if_t<
alp::is_operator< OP >::value &&
! alp::is_object< InputType >::value &&
! alp::is_object< IOType >::value
> * = nullptr
) {

#ifdef _DEBUG
std::cerr << "Selected backend does not implement alp::foldl (scalar)\n";
Expand All @@ -356,9 +370,9 @@ namespace alp {
assert( backend_does_not_support_scalar_foldl );
#endif

(void)x;
(void)y;
(void)op;
(void) x;
(void) y;
(void) op;

return UNSUPPORTED;
}
Expand Down
Loading