Commit de34b700 authored by COULAUD Olivier's avatar COULAUD Olivier

Remove warnings for starpu, mpi. Add scoped enum for OMP4 priorites ans simplify teh code

parent d99e314a
......@@ -893,15 +893,15 @@ private:
const typename node_t::symbolic_data_t& other_node,
const std::size_t n)
{
std::size_t node_m_idx = node.m_idx;
std::size_t other_node_m_idx = other_node.m_idx;
MortonIndex node_m_idx = node.m_idx;
MortonIndex other_node_m_idx = other_node.m_idx;
if(node.depth > other_node.depth) {
node_m_idx >>= ((node.depth - other_node.depth) * node_t::Dim);
} else if(node.depth < other_node.depth) {
other_node_m_idx >>= ((other_node.depth - node.depth) * node_t::Dim);
}
FTreeCoordinate node_offset = FTreeCoordinate(other_node_m_idx) - FTreeCoordinate(node_m_idx);
FTreeCoordinate node_offset = FTreeCoordinate(other_node_m_idx) - FTreeCoordinate(node_m_idx);
// FTreeCoordinate node_offset(FTreeCoordinate(other_node_m_idx) - FTreeCoordinate(node_m_idx));
std::size_t other_node_index = 0;
for(std::size_t i = 0; i < node_t::Dim; ++i) {
other_node_index = other_node_index * (2 * n + 1)
......
......@@ -4,11 +4,11 @@
#include <string>
#include "../Utils/FGlobal.hpp"
#include "../Utils/FPoint.hpp"
#include "../Utils/FMath.hpp"
#include "Utils/FGlobal.hpp"
#include "Utils/FPoint.hpp"
#include "Utils/FMath.hpp"
#include "../Components/FAbstractSerializable.hpp"
#include "Components/FAbstractSerializable.hpp"
/**
* @author Berenger Bramas (berenger.bramas@inria.fr)
......@@ -27,7 +27,7 @@ private:
public:
/** Default constructor (position = {0,0,0})*/
explicit FTreeCoordinate() : point_t() {}
FTreeCoordinate() : point_t() {}
/** Constructor from Morton index */
[[gnu::deprecated]]
......@@ -76,7 +76,13 @@ public:
*/
FTreeCoordinate& operator=(const FTreeCoordinate& other) = default;
[[gnu::deprecated]]
/** Subtraction operator */
friend FTreeCoordinate operator-(FTreeCoordinate lhs, const FTreeCoordinate& rhs) {
FTreeCoordinate sol = lhs;
sol -= rhs;
return sol;
}
[[gnu::deprecated]]
MortonIndex getMortonIndex(const int /*inLevel*/) const {
return getMortonIndex();
}
......
This diff is collapsed.
......@@ -4,14 +4,14 @@
#define FGROUPTASKDEPALGORITHM_HPP
#include "../../Utils/FGlobal.hpp"
#include "../../Core/FCoreCommon.hpp"
#include "../../Utils/FQuickSort.hpp"
#include "../../Containers/FTreeCoordinate.hpp"
#include "../../Utils/FLog.hpp"
#include "../../Utils/FTic.hpp"
#include "Utils/FGlobal.hpp"
#include "Core/FCoreCommon.hpp"
#include "Utils/FQuickSort.hpp"
#include "Containers/FTreeCoordinate.hpp"
#include "Utils/FLog.hpp"
#include "Utils/FTic.hpp"
#include "../../Utils/FTaskTimer.hpp"
#include "Utils/FTaskTimer.hpp"
#include "FOutOfBlockInteraction.hpp"
......@@ -30,7 +30,7 @@
#undef priority_if_supported
#ifdef OPENMP_SUPPORT_PRIORITY
#include "../StarPUUtils/FOmpPriorities.hpp"
#include "GroupTree/StarPUUtils/FOmpPriorities.hpp"
#define priority_if_supported(x) priority(x)
#else
#define priority_if_supported(x)
......
......@@ -17,36 +17,36 @@
#if defined(SCALFMM_STARPU_USE_COMMUTE)
#error StarPU Commute is not supported
#else
#warning StarPU Commute is not enabled
#pragma message(" StarPU Commute is not enabled")
#endif
#endif
#if (STARPU_MAJOR_VERSION >= 1) && (STARPU_MINOR_VERSION >= 2)
#define STARPU_SUPPORT_ARBITER
#else
#warning StarPU Arbiter is not supported
#pragma message( "StarPU Arbiter is not supported")
#endif
#if (STARPU_MAJOR_VERSION >= 1) && (STARPU_MINOR_VERSION >= 2) && !defined(SCALFMM_STARPU_USE_PRIO)
#warning Priorities is not supported
#pragma message(" Priorities is not supported")
#endif
#if (STARPU_MAJOR_VERSION >= 1) && (STARPU_MINOR_VERSION >= 2) && defined(SCALFMM_STARPU_USE_PRIO) && !defined(SCALFMM_STARPU_FORCE_NO_SCHEDULER)
#define STARPU_SUPPORT_SCHEDULER
#else
#warning Scheduler is not supported
#pragma message(" Scheduler is not supported")
#endif
#if (STARPU_MAJOR_VERSION >= 1) && (STARPU_MINOR_VERSION >= 2)
#define STARPU_USE_TASK_NAME
#else
#warning Taskname is not supported
#pragma message("Taskname is not supported")
#endif
#ifdef SCALFMM_STARPU_USE_REDUX
#define STARPU_USE_REDUX
#else
#warning Redux is not enabled
#pragma message( "Redux is not enabled")
#endif
......@@ -56,10 +56,10 @@
#define SCALFMM_ENABLE_CUDA_KERNEL
#else
#if defined(STARPU_USE_CUDA)
#warning CUDA is turned off because it is not supported by ScalFMM.
#pragma( "message CUDA is turned off because it is not supported by ScalFMM.")
#endif
#if defined(SCALFMM_USE_CUDA)
#warning CUDA is turned off because it is not supported by StarPU.
#pragma message(" CUDA is turned off because it is not supported by StarPU.")
#endif
#endif
......@@ -69,10 +69,10 @@
#define SCALFMM_ENABLE_OPENCL_KERNEL
#else
#if defined(STARPU_USE_OPENCL)
#warning OPENCL is turned off because it is not supported by ScalFMM.
#pragma message( "OPENCL is turned off because it is not supported by ScalFMM.")
#endif
#if defined(SCALFMM_USE_OPENCL)
#warning OPENCL is turned off because it is not supported by StarPU.
#pragma message( "OPENCL is turned off because it is not supported by StarPU.")
#endif
#endif
......@@ -80,7 +80,7 @@
#if defined(STARPU_USE_MPI) && defined(SCALFMM_USE_MPI)
#if !defined(SCALFMM_USE_MPI)
#warning Cannot may not link because MPI is needed by starpu.
#pragma(" message Cannot may not link because MPI is needed by starpu.")
#endif
#endif
......
......@@ -5,6 +5,7 @@
// @FUSE_MPI
// @FUSE_STARPU
// A supprimer ou merger Unif et Cheb
#include "Files/FBlockedMpiInterpolation.hpp"
#include "Utils/FGlobal.hpp"
......@@ -44,24 +45,24 @@ int main(int argc, char *argv[]){
FParameterDefinitions::NbParticles,
LocalOptionBlocSize,LocalOptionNoValidate);
using FReal = double;
static const int ORDER = 6;
using GroupContainerClass = FP2PGroupParticleContainer<FReal>;
using MatrixKernelClass = FInterpMatrixKernelR<FReal>;
using GroupCellClass = FChebCell<FReal, ORDER>;
using GroupCellUpClass = typename GroupCellClass::multipole_t;
using GroupCellDownClass = typename GroupCellClass::local_expansion_t;
using GroupCellSymbClass = FSymbolicData;
using kernelClass = FChebSymKernel<FReal,GroupCellClass,GroupContainerClass,MatrixKernelClass,ORDER>;
auto groupedTree = blockedMpiInterpolation::execute_algorithm<
GroupCellClass,
GroupCellUpClass,
GroupCellDownClass,
GroupCellSymbClass,
kernelClass,
MatrixKernelClass
>(argc,argv);
// using FReal = double;
// static const int ORDER = 6;
// using GroupContainerClass = FP2PGroupParticleContainer<FReal>;
// using MatrixKernelClass = FInterpMatrixKernelR<FReal>;
// using GroupCellClass = FChebCell<FReal, ORDER>;
// using GroupCellUpClass = typename GroupCellClass::multipole_t;
// using GroupCellDownClass = typename GroupCellClass::local_expansion_t;
// using GroupCellSymbClass = FSymbolicData;
// using kernelClass = FChebSymKernel<FReal,GroupCellClass,GroupContainerClass,MatrixKernelClass,ORDER>;
// auto groupedTree = blockedMpiInterpolation::execute_algorithm<
// GroupCellClass,
// GroupCellUpClass,
// GroupCellDownClass,
// GroupCellSymbClass,
// kernelClass,
// MatrixKernelClass
// >(argc,argv);
// Validation
......
......@@ -86,9 +86,6 @@ int main(int argc, char* argv[]){
const unsigned int TreeHeight = FParameters::getValue(argc, argv, FParameterDefinitions::OctreeHeight.options, 5);
const unsigned int SubTreeHeight = FParameters::getValue(argc, argv, FParameterDefinitions::OctreeSubHeight.options, 2);
const FSize totalNbParticles = FParameters::getValue(argc,argv,FParameterDefinitions::NbParticles.options, FSize(20));
const FSize NbParticles = getNbParticlesPerNode(mpiComm.global().processCount(), mpiComm.global().processId(), totalNbParticles);
// init particles position and physical value
struct TestParticle{
FPoint<FReal> position;
......@@ -110,6 +107,9 @@ int main(int argc, char* argv[]){
#define LOAD_FILE
#ifndef LOAD_FILE
// open particle file
const FSize totalNbParticles = FParameters::getValue(argc,argv,FParameterDefinitions::NbParticles.options, FSize(20));
const FSize NbParticles = getNbParticlesPerNode(mpiComm.global().processCount(), mpiComm.global().processId(), totalNbParticles);
FRandomLoader<FReal> loader(NbParticles, 1.0, FPoint<FReal>(0,0,0), mpiComm.global().processId());
FAssertLF(loader.isOpen());
......
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