diff --git a/Tests/GroupTree/testBlockedUniform.cpp b/Tests/GroupTree/testBlockedUniform.cpp index fb3e288d709ce16530c316415673fd9104ec6c5c..d21b8ac48b3979d71a8c6c9d4b86ea1714247f71 100644 --- a/Tests/GroupTree/testBlockedUniform.cpp +++ b/Tests/GroupTree/testBlockedUniform.cpp @@ -33,6 +33,7 @@ #include "Files/FRandomLoader.hpp" #include "Files/FFmaGenericLoader.hpp" +#include "Core/FCoreCommon.hpp" #include "GroupTree/Core/FGroupSeqAlgorithm.hpp" #include "GroupTree/Core/FGroupTaskAlgorithm.hpp" #ifdef SCALFMM_USE_OMP4 @@ -144,11 +145,20 @@ int main(int argc, char* argv[]){ const MatrixKernelClass MatrixKernel; GroupKernelClass groupkernel(NbLevels, loader.getBoxWidth(), loader.getCenterOfBox(), &MatrixKernel); GroupAlgorithm groupalgo(&groupedTree,&groupkernel); - +#if defined(ONLY_NEAR) + const unsigned operator_to_proceed = FFmmNearField; + std::cout << "<params> fmm: near field\n" ; +#elif defined(ONLY_FAR) + const unsigned operator_to_proceed = FFmmFarField; + std::cout << "<params> fmm: far field\n" ; +#else + const unsigned operator_to_proceed = FFmmNearAndFarFields; + std::cout << "<params> fmm: near and far fields\n" ; +#endif // Extended for Native vs SimGrid makespans comparison timer.tic(); //double start_time = starpu_timing_now(); - groupalgo.execute(); + groupalgo.execute(operator_to_proceed); //double end_time = starpu_timing_now(); std::cout << "Kernel executed in in " << timer.tacAndElapsed() << "s\n"; //std::cout << (end_time - start_time)/1000 << "\n";