Skip to content

added EXPAND macro to deal with MSVC #149

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
gavinwhetstone merged 1 commit into from
Dec 19, 2025
Merged

added EXPAND macro to deal with MSVC #149

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 27 additions & 24 deletions src/include/macros.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,10 @@
#include <iostream>



// -----------------------------------------
// MACRO for expanding argvs to make MSVC work
// -----------------------------------------
#define EXPAND(x) x


// -----------------------------------------
Expand Down Expand Up @@ -147,7 +150,7 @@

#define \
FOR_ALL(...) \
GET_MACRO(__VA_ARGS__, _13, _12, _11, FOR3D, _9, _8, FOR2D, _6, _5, FOR1D)(__VA_ARGS__)
EXPAND(GET_MACRO(__VA_ARGS__, _13, _12, _11, FOR3D, _9, _8, FOR2D, _6, _5, FOR1D)(__VA_ARGS__))


// the DO_ALL loop
Expand All @@ -170,7 +173,7 @@

#define \
DO_ALL(...) \
GET_MACRO(__VA_ARGS__, _13, _12, _11, DO3D, _9, _8, DO2D, _6, _5, DO1D)(__VA_ARGS__)
EXPAND(GET_MACRO(__VA_ARGS__, _13, _12, _11, DO3D, _9, _8, DO2D, _6, _5, DO1D)(__VA_ARGS__))


// the REDUCE SUM loop
Expand All @@ -195,7 +198,7 @@

#define \
FOR_REDUCE_SUM(...) \
GET_MACRO(__VA_ARGS__, _13, RSUM3D, _11, _10, RSUM2D, _8, _7, RSUM1D)(__VA_ARGS__)
EXPAND(GET_MACRO(__VA_ARGS__, _13, RSUM3D, _11, _10, RSUM2D, _8, _7, RSUM1D)(__VA_ARGS__))


// the REDUCE Product loop
Expand Down Expand Up @@ -224,7 +227,7 @@

#define \
FOR_REDUCE_PRODUCT(...) \
GET_MACRO(__VA_ARGS__, _13, RPROD3D, _11, _10, RPROD2D, _8, _7, RPROD1D)(__VA_ARGS__)
EXPAND(GET_MACRO(__VA_ARGS__, _13, RPROD3D, _11, _10, RPROD2D, _8, _7, RPROD1D)(__VA_ARGS__))


// the DO_REDUCE_SUM loop
Expand All @@ -249,7 +252,7 @@

#define \
DO_REDUCE_SUM(...) \
GET_MACRO(__VA_ARGS__, _13, DO_RSUM3D, _11, _10, DO_RSUM2D, _8, _7, DO_RSUM1D)(__VA_ARGS__)
EXPAND(GET_MACRO(__VA_ARGS__, _13, DO_RSUM3D, _11, _10, DO_RSUM2D, _8, _7, DO_RSUM1D)(__VA_ARGS__))


// the REDUCE MAX loop
Expand All @@ -276,7 +279,7 @@

#define \
FOR_REDUCE_MAX(...) \
GET_MACRO(__VA_ARGS__, _13, RMAX3D, _11, _10, RMAX2D, _8, _7, RMAX1D)(__VA_ARGS__)
EXPAND(GET_MACRO(__VA_ARGS__, _13, RMAX3D, _11, _10, RMAX2D, _8, _7, RMAX1D)(__VA_ARGS__))


// the DO_REDUCE_MAX loop
Expand Down Expand Up @@ -315,7 +318,7 @@

#define \
DO_REDUCE_MAX(...) \
GET_MACRO(__VA_ARGS__, _13, DO_RMAX3D, _11, _10, DO_RMAX2D, _8, _7, DO_RMAX1D)(__VA_ARGS__)
EXPAND(GET_MACRO(__VA_ARGS__, _13, DO_RMAX3D, _11, _10, DO_RMAX2D, _8, _7, DO_RMAX1D)(__VA_ARGS__))



Expand Down Expand Up @@ -355,7 +358,7 @@

#define \
FOR_REDUCE_MIN(...) \
GET_MACRO(__VA_ARGS__, _13, RMIN3D, _11, _10, RMIN2D, _8, _7, RMIN1D)(__VA_ARGS__)
EXPAND(GET_MACRO(__VA_ARGS__, _13, RMIN3D, _11, _10, RMIN2D, _8, _7, RMIN1D)(__VA_ARGS__))


// the DO_REDUCE MIN loop
Expand All @@ -382,7 +385,7 @@

#define \
DO_REDUCE_MIN(...) \
GET_MACRO(__VA_ARGS__, _13, DO_RMIN3D, _11, _10, DO_RMIN2D, _8, _7, DO_RMIN1D)(__VA_ARGS__)
EXPAND(GET_MACRO(__VA_ARGS__, _13, DO_RMIN3D, _11, _10, DO_RMIN2D, _8, _7, DO_RMIN1D)(__VA_ARGS__))



Expand All @@ -406,7 +409,7 @@ Kokkos::parallel_for( \

#define \
FOR_ALL_CLASS(...) \
GET_MACRO(__VA_ARGS__, _13, _12, _11, FORCLASS3D, _9, _8, FORCLASS2D, _6, _5, FORCLASS1D)(__VA_ARGS__)
EXPAND(GET_MACRO(__VA_ARGS__, _13, _12, _11, FORCLASS3D, _9, _8, FORCLASS2D, _6, _5, FORCLASS1D)(__VA_ARGS__))


// the REDUCE SUM loop
Expand All @@ -431,7 +434,7 @@ Kokkos::parallel_reduce( \

#define \
FOR_REDUCE_SUM_CLASS(...) \
GET_MACRO(__VA_ARGS__, _13, RSUMCLASS3D, _11, _10, RSUMCLASS2D, _8, _7, RSUMCLASS1D)(__VA_ARGS__)
EXPAND(GET_MACRO(__VA_ARGS__, _13, RSUMCLASS3D, _11, _10, RSUMCLASS2D, _8, _7, RSUMCLASS1D)(__VA_ARGS__))



Expand Down Expand Up @@ -460,7 +463,7 @@ Kokkos::parallel_reduce( \

#define \
FOR_REDUCE_MAX_CLASS(...) \
GET_MACRO(__VA_ARGS__, _13, RMAXCLASS3D, _11, _10, RMAXCLASS2D, _8, _7, RMAXCLASS1D)(__VA_ARGS__)
EXPAND(GET_MACRO(__VA_ARGS__, _13, RMAXCLASS3D, _11, _10, RMAXCLASS2D, _8, _7, RMAXCLASS1D)(__VA_ARGS__))


// the REDUCE MIN loop with variables in a class
Expand All @@ -487,7 +490,7 @@ Kokkos::parallel_reduce( \

#define \
FOR_REDUCE_MIN_CLASS(...) \
GET_MACRO(__VA_ARGS__, _13, RMINCLASS3D, _11, _10, RMINCLASS2D, _8, _7, RMINCLASS1D)(__VA_ARGS__)
EXPAND(GET_MACRO(__VA_ARGS__, _13, RMINCLASS3D, _11, _10, RMINCLASS2D, _8, _7, RMINCLASS1D)(__VA_ARGS__))

#define \
TEAM_ID \
Expand Down Expand Up @@ -705,7 +708,7 @@ void for_all_delta (int i_start, int i_end, int i_delta,

#define \
FOR_LOOP(...) \
GET_MACRO(__VA_ARGS__, FOR3DLOOPDELTA, _12, _11, FOR3DLOOP, FOR2DLOOPDELTA, _8, FOR2DLOOP, _6, FOR1DLOOPDELTA, FOR1DLOOP)(__VA_ARGS__)
EXPAND(GET_MACRO(__VA_ARGS__, FOR3DLOOPDELTA, _12, _11, FOR3DLOOP, FOR2DLOOPDELTA, _8, FOR2DLOOP, _6, FOR1DLOOPDELTA, FOR1DLOOP)(__VA_ARGS__))


// the DO_ALL loop
Expand Down Expand Up @@ -741,7 +744,7 @@ void for_all_delta (int i_start, int i_end, int i_delta,
[&]( const int (i), const int (j), const int (k) ) {fcn} )
#define \
DO_LOOP(...) \
GET_MACRO(__VA_ARGS__, DO3DLOOPDELTA, _12, _11, DO3DLOOP, DO2DLOOPDELTA, _8, DO2DLOOP, _6, DO1DLOOPDELTA, DO1DLOOP)(__VA_ARGS__)
EXPAND(GET_MACRO(__VA_ARGS__, DO3DLOOPDELTA, _12, _11, DO3DLOOP, DO2DLOOPDELTA, _8, DO2DLOOP, _6, DO1DLOOPDELTA, DO1DLOOP)(__VA_ARGS__))



Expand Down Expand Up @@ -948,7 +951,7 @@ void reduce_prod (int i_start, int i_end,
[&]( const int (i), const int (j), const int (k) ) {fcn} )
#define \
FOR_ALL(...) \
GET_MACRO(__VA_ARGS__, _13, _12, _11, FOR3D, _9, _8, FOR2D, _6, _5, FOR1D)(__VA_ARGS__)
EXPAND(GET_MACRO(__VA_ARGS__, _13, _12, _11, FOR3D, _9, _8, FOR2D, _6, _5, FOR1D)(__VA_ARGS__))


// the DO_ALL loop
Expand All @@ -969,7 +972,7 @@ void reduce_prod (int i_start, int i_end,
[&]( const int (i), const int (j), const int (k) ) {fcn} )
#define \
DO_ALL(...) \
GET_MACRO(__VA_ARGS__, _13, _12, _11, DO3D, _9, _8, DO2D, _6, _5, DO1D)(__VA_ARGS__)
EXPAND(GET_MACRO(__VA_ARGS__, _13, _12, _11, DO3D, _9, _8, DO2D, _6, _5, DO1D)(__VA_ARGS__))


// the REDUCE loops, no kokkos
Expand All @@ -991,7 +994,7 @@ void reduce_prod (int i_start, int i_end,

#define \
FOR_REDUCE_SUM(...) \
GET_MACRO(__VA_ARGS__, _13, RSUM3D, _11, _10, RSUM2D, _8, _7, RSUM1D)(__VA_ARGS__)
EXPAND(GET_MACRO(__VA_ARGS__, _13, RSUM3D, _11, _10, RSUM2D, _8, _7, RSUM1D)(__VA_ARGS__))


// DO_REDUCE_SUM
Expand All @@ -1013,7 +1016,7 @@ void reduce_prod (int i_start, int i_end,

#define \
DO_REDUCE_SUM(...) \
GET_MACRO(__VA_ARGS__, _13, DO_RSUM3D, _11, _10, DO_RSUM2D, _8, _7, DO_RSUM1D)(__VA_ARGS__)
EXPAND(GET_MACRO(__VA_ARGS__, _13, DO_RSUM3D, _11, _10, DO_RSUM2D, _8, _7, DO_RSUM1D)(__VA_ARGS__))


// Reduce max
Expand All @@ -1035,7 +1038,7 @@ void reduce_prod (int i_start, int i_end,

#define \
FOR_REDUCE_MAX(...) \
GET_MACRO(__VA_ARGS__, _13, RMAX3D, _11, _10, RMAX2D, _8, _7, RMAX1D)(__VA_ARGS__)
EXPAND(GET_MACRO(__VA_ARGS__, _13, RMAX3D, _11, _10, RMAX2D, _8, _7, RMAX1D)(__VA_ARGS__))



Expand All @@ -1059,7 +1062,7 @@ void reduce_prod (int i_start, int i_end,

#define \
DO_REDUCE_MAX(...) \
GET_MACRO(__VA_ARGS__, _13, DO_RMAX3D, _11, _10, DO_RMAX2D, _8, _7, DO_RMAX1D)(__VA_ARGS__)
EXPAND(GET_MACRO(__VA_ARGS__, _13, DO_RMAX3D, _11, _10, DO_RMAX2D, _8, _7, DO_RMAX1D)(__VA_ARGS__))


// reduce min
Expand All @@ -1081,7 +1084,7 @@ void reduce_prod (int i_start, int i_end,

#define \
FOR_REDUCE_MIN(...) \
GET_MACRO(__VA_ARGS__, _13, RMIN3D, _11, _10, RMIN2D, _8, _7, RMIN1D)(__VA_ARGS__)
EXPAND(GET_MACRO(__VA_ARGS__, _13, RMIN3D, _11, _10, RMIN2D, _8, _7, RMIN1D)(__VA_ARGS__))


// DO_REDUCE_MIN
Expand All @@ -1103,7 +1106,7 @@ void reduce_prod (int i_start, int i_end,

#define \
DO_REDUCE_MIN(...) \
GET_MACRO(__VA_ARGS__, _13, DO_RMIN3D, _11, _10, DO_RMIN2D, _8, _7, DO_RMIN1D)(__VA_ARGS__)
EXPAND(GET_MACRO(__VA_ARGS__, _13, DO_RMIN3D, _11, _10, DO_RMIN2D, _8, _7, DO_RMIN1D)(__VA_ARGS__))


#endif // if not kokkos
Expand Down