Commit af65d3e4 authored by BRAMAS Berenger's avatar BRAMAS Berenger

make it compile 100 percent

parent ded00ff6
......@@ -44,6 +44,7 @@
#include "FP2PExclusion.hpp"
#include <memory>
#include <vector>
/**
* @author Berenger Bramas (berenger.bramas@inria.fr)
......
......@@ -1125,7 +1125,7 @@ protected:
MPI_Request*const requestsSize = new MPI_Request[8];
MPI_Status*const statusSize = new MPI_Status[8];
FMpiBufferWriter sendBuffer(comm.getComm());
FMpiBufferWriter sendBuffer;
FMpiBufferReader recvBuffer;
int righestProcToSendTo = nbProcess - 1;
......
......@@ -753,10 +753,12 @@ struct starpu_sched_policy _starpu_sched_heteroprio_policy_build(){
policy.pop_every_task = NULL;
policy.policy_name = "heteroprio";
policy.policy_description = "heteroprio policy from scalfmm";
#if (STARPU_MAJOR_VERSION >= 1) && (STARPU_MINOR_VERSION >= 3)
#ifdef STARPU_HAVE_HWLOC
policy.worker_type = STARPU_WORKER_TREE;
#else
policy.worker_type = STARPU_WORKER_LIST;
#endif
#endif
return policy;
}
......
......@@ -39,6 +39,8 @@
#include "../../Src/Utils/FParameterNames.hpp"
#include "../../Src/Utils/FAca.hpp"
/**
* In this file we show how to use octree
*/
......@@ -194,7 +196,7 @@ int main(int argc, char* argv[])
if (FPoint<FReal>(ccx-ccy).norm() > FReal(3.5)) {
FChebTensor<FReal,ORDER>::setRoots(ccy, cw, rootsY);
EntryComputer<FReal,MatrixKernelClass> Computer(&MatrixKernel,nnodes, rootsX, nnodes, rootsY);
pACA(Computer, nnodes, nnodes, epsilon, U, V, rank);
FAca::pACA(Computer, nnodes, nnodes, epsilon, U, V, rank);
//std::cout << "- Compress " << ccy << "\tof width " << cw << " to rank " << rank << std::endl;
all_counter++;
......@@ -218,7 +220,7 @@ int main(int argc, char* argv[])
if (FPoint<FReal>(ccx-ccy).norm() > FReal(3.5)) {
FChebTensor<FReal,ORDER>::setRoots(ccy, cw, rootsY);
EntryComputer<FReal,MatrixKernelClass> Computer(&MatrixKernel,nnodes, rootsX, nnodes, rootsY);
pACA(Computer, nnodes, nnodes, epsilon, U, V, rank);
FAca::pACA(Computer, nnodes, nnodes, epsilon, U, V, rank);
//std::cout << "- Compress " << ccy << "\tof width " << cw << " to rank " << rank << std::endl;
ccounter++;
......@@ -234,7 +236,7 @@ int main(int argc, char* argv[])
else {
FChebTensor<FReal,ORDER>::setRoots(cpy, pw, rootsY);
EntryComputer<FReal,MatrixKernelClass> Computer(&MatrixKernel,nnodes, rootsX, nnodes, rootsY);
pACA(Computer, nnodes, nnodes, epsilon, U, V, rank);
FAca::pACA(Computer, nnodes, nnodes, epsilon, U, V, rank);
//std::cout << "- Compress " << cpy << "\tof width " << pw << " to rank " << rank << std::endl;
pcounter++;
......
......@@ -54,6 +54,7 @@
//#include "Core/FFmmAlgorithmThread.hpp"
//#include "Core/FFmmAlgorithmTask.hpp"
#include "../../Src/Utils/FAca.hpp"
#include "Utils/FParameterNames.hpp"
......
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