Commit 8d876dce authored by COULAUD Olivier's avatar COULAUD Olivier

Improvements with Intel compiler. Still compilation problem

parent 5eccb5e5
......@@ -74,8 +74,8 @@ using LeafClass = typename OctreeClass::node_t;
using MatrixKernelClass = FInterpMatrixKernelR<FReal>;
using KernelClass = FAdaptChebKernel<FReal, CellClass, ContainerClass, MatrixKernelClass, ORDER>;
//
using FmmClass = FAdaptiveTask<OctreeClass, KernelClass>;
using FmmClassSeq = FAdaptiveSequential<OctreeClass, KernelClass>;
using FmmClass = FAdaptiveTask<OctreeClass, KernelClass>;
using FmmClassSeq = FAdaptiveSequential<OctreeClass, KernelClass>;
namespace FPD = FParameterDefinitions;
namespace FParameterDefinitions {
......@@ -179,6 +179,8 @@ int main(int argc, char* argv[]) {
#ifndef __INTEL_COMPILER
FmmClass algo(&tree, &kernel);
algo.execute(); // FMM algorithm call
#else
std::cerr << " No FMM algorithm with Intel compiler" <<std::endl;
#endif
}
......
......@@ -126,9 +126,10 @@ public:
* \param tree The tree to run over
* \param kernel The kernel to use
*/
FAdaptiveTask(tree_t* tree, kernel_t* kernel) :
_tree(*tree)
FAdaptiveTask(tree_t* tree, kernel_t* kernel) :
_tree(*tree)
{
// Place kernel objects near their threads in memory to avoid NUMA
// latency
#pragma omp parallel
......@@ -140,6 +141,7 @@ public:
#pragma omp barrier
}
}
}
std::string name() const override {
......
......@@ -132,8 +132,9 @@ public:
position, args...);
}
template<typename Position, typename... Args, std::size_t... Is,
std::size_t... Js, typename... Ts >
template<typename Position, typename... Args,
std::size_t... Is,
std::size_t... Js> //, typename... Ts >
void push_impl(inria::index_sequence<Is...>,
inria::index_sequence<Js...>,
const Position& position,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment