Commit 737e0443 authored by Quentin Khan's avatar Quentin Khan

Move adaptive implementation from Adaptive/newto Adaptive

parent ceeacf49
......@@ -48,7 +48,7 @@
#include "Kernels/Interpolation/FInterpMatrixKernel.hpp"
#include "Kernels/Chebyshev/FChebCell.hpp"
#include "Adaptive/new/FAdaptChebKernel.hpp"
#include "Adaptive/FAdaptChebKernel.hpp"
#include "Components/FSimpleLeaf.hpp"
#include "Kernels/P2P/FP2PParticleContainerIndexed.hpp"
......@@ -56,9 +56,9 @@
#include "Utils/FParameters.hpp"
#include "Utils/FParameterNames.hpp"
#include "Adaptive/new/FAdaptiveSequential.hpp"
#include "Adaptive/new/FAdaptiveTask.hpp"
#include "Adaptive/new/FTree.hpp"
#include "Adaptive/FAdaptiveSequential.hpp"
#include "Adaptive/FAdaptiveTask.hpp"
#include "Adaptive/FTree.hpp"
// Types definition
......
......@@ -48,7 +48,7 @@
#include "Kernels/Interpolation/FInterpMatrixKernel.hpp"
#include "Kernels/Uniform/FUnifCell.hpp"
#include "Adaptive/new/FAdaptUnifKernel.hpp"
#include "Adaptive/FAdaptUnifKernel.hpp"
#include "Components/FSimpleLeaf.hpp"
#include "Kernels/P2P/FP2PParticleContainerIndexed.hpp"
......@@ -56,10 +56,10 @@
#include "Utils/FParameters.hpp"
#include "Utils/FParameterNames.hpp"
#include "Adaptive/new/FAdaptiveSequential.hpp"
#include "Adaptive/new/FAdaptiveTask.hpp"
#include "Adaptive/new/FAdaptiveStarPU.hpp"
#include "Adaptive/new/FTree.hpp"
#include "Adaptive/FAdaptiveSequential.hpp"
#include "Adaptive/FAdaptiveTask.hpp"
#include "Adaptive/FAdaptiveStarPU.hpp"
#include "Adaptive/FTree.hpp"
// Types definition
......
......@@ -27,7 +27,7 @@
#include "Components/FParticleType.hpp"
#include "Components/FBasicParticle.hpp"
#include "Adaptive/new/FVariadicParticleContainer.hpp"
#include "Adaptive/FVariadicParticleContainer.hpp"
#include "Utils/variadic_container.hpp"
#include "Utils/FAlignedAllocator.hpp"
......
#ifndef SCALFMM_ADAPTIVE_DUMMY_TREE_
#define SCALFMM_ADAPTIVE_DUMMY_TREE_
#include "Adaptive/new/FNode.hpp"
#include "Adaptive/FNode.hpp"
namespace scalfmm {
namespace tests {
......
......@@ -22,10 +22,10 @@
#include "Components/FBasicParticle.hpp"
#include "Adaptive/new/FAdaptiveSequential.hpp"
#include "Adaptive/new/FTree.hpp"
#include "Adaptive/FAdaptiveSequential.hpp"
#include "Adaptive/FTree.hpp"
#include "Adaptive/new/FVariadicParticleContainer.hpp"
#include "Adaptive/FVariadicParticleContainer.hpp"
#include "FCountKernel.hpp"
......
......@@ -32,10 +32,10 @@
#include "Components/FBasicParticle.hpp"
#include "Adaptive/new/FAdaptiveTask.hpp"
#include "Adaptive/new/FTree.hpp"
#include "Adaptive/FAdaptiveTask.hpp"
#include "Adaptive/FTree.hpp"
#include "Adaptive/new/FVariadicParticleContainer.hpp"
#include "Adaptive/FVariadicParticleContainer.hpp"
#include "FCountKernel.hpp"
......
......@@ -6,7 +6,7 @@
#include "Utils/FPoint.hpp"
#include "Utils/FConstFuncs.hpp"
#include "Adaptive/new/FBox.hpp"
#include "Adaptive/FBox.hpp"
namespace scalfmm {
namespace tests {
......
......@@ -26,10 +26,10 @@
#include "Components/FSimpleLeaf.hpp"
#include "Components/FBasicParticle.hpp"
#include "Adaptive/new/FVariadicParticleContainer.hpp"
#include "Adaptive/FVariadicParticleContainer.hpp"
#include "Adaptive/new/FTree.hpp"
#include "Adaptive/new/FAdaptiveTask.hpp"
#include "Adaptive/FTree.hpp"
#include "Adaptive/FAdaptiveTask.hpp"
#include "Files/FFmaGenericLoader.hpp"
......
......@@ -4,9 +4,9 @@
#include "test_Abstract.hpp"
#include "MockParticle.hpp"
#include "Adaptive/new/FTree.hpp"
#include "Adaptive/new/FNode.hpp"
#include "Adaptive/new/FInOrderNodeIterator.hpp"
#include "Adaptive/FTree.hpp"
#include "Adaptive/FNode.hpp"
#include "Adaptive/FInOrderNodeIterator.hpp"
#include "Utils/make_unique.hpp"
......
......@@ -8,8 +8,8 @@
#include "DummyTree.hpp"
#include "Adaptive/new/FNode.hpp"
#include "Adaptive/new/FTree.hpp"
#include "Adaptive/FNode.hpp"
#include "Adaptive/FTree.hpp"
#include "Files/FFmaGenericLoader.hpp"
......
......@@ -3,9 +3,9 @@
#include "test_Abstract.hpp"
#include "MockParticle.hpp"
#include "Adaptive/new/FTree.hpp"
#include "Adaptive/new/FNode.hpp"
#include "Adaptive/new/FNodeIterator.hpp"
#include "Adaptive/FTree.hpp"
#include "Adaptive/FNode.hpp"
#include "Adaptive/FNodeIterator.hpp"
#include "Utils/make_unique.hpp"
......
......@@ -4,9 +4,9 @@
#include "test_Abstract.hpp"
#include "MockParticle.hpp"
#include "Adaptive/new/FTree.hpp"
#include "Adaptive/new/FNode.hpp"
#include "Adaptive/new/FPrePostOrderNodeIterator.hpp"
#include "Adaptive/FTree.hpp"
#include "Adaptive/FNode.hpp"
#include "Adaptive/FPrePostOrderNodeIterator.hpp"
#include "Utils/make_unique.hpp"
......
......@@ -4,9 +4,9 @@
#include "test_Abstract.hpp"
#include "MockParticle.hpp"
#include "Adaptive/new/FTree.hpp"
#include "Adaptive/new/FNode.hpp"
#include "Adaptive/new/FPrePostOrderNodeIterator.hpp"
#include "Adaptive/FTree.hpp"
#include "Adaptive/FNode.hpp"
#include "Adaptive/FPrePostOrderNodeIterator.hpp"
#include "Utils/make_unique.hpp"
......
......@@ -3,8 +3,8 @@
#include "test_Abstract.hpp"
#include "MockParticle.hpp"
#include "Adaptive/new/FNode.hpp"
#include "Adaptive/new/FTree.hpp"
#include "Adaptive/FNode.hpp"
#include "Adaptive/FTree.hpp"
#define BOX_SIDE_LEN 100
......
......@@ -18,11 +18,11 @@
#include "Utils/FOstreamTuple.hpp"
#include "Utils/FPoint.hpp"
#include "Adaptive/new/FAdaptiveSequential.hpp"
#include "Adaptive/new/FTree.hpp"
#include "Adaptive/new/FUnifFlopsKernel.hpp"
#include "Adaptive/FAdaptiveSequential.hpp"
#include "Adaptive/FTree.hpp"
#include "Adaptive/FUnifFlopsKernel.hpp"
#include "Adaptive/new/FVariadicParticleContainer.hpp"
#include "Adaptive/FVariadicParticleContainer.hpp"
#include "Kernels/Generic/FGenericData.hpp"
......
......@@ -4,7 +4,7 @@
#include "test_Abstract.hpp"
#include "Utils/FConstFuncs.hpp"
#include "Adaptive/new/FZCurve.hpp"
#include "Adaptive/FZCurve.hpp"
namespace scalfmm {
namespace tests {
......
......@@ -41,7 +41,7 @@ struct algo_descriptor {
// Sequential adaptive FMM algorithm descriptor //
#include "Adaptive/new/FAdaptiveSequential.hpp"
#include "Adaptive/FAdaptiveSequential.hpp"
template<typename FReal> struct algo_descriptor<FReal, 0> {
constexpr static const char* name = "adaptive-sequential";
......@@ -67,7 +67,7 @@ template<typename FReal> struct algo_descriptor<FReal, 0> {
// Task adaptive FMM algorithm ///////////////////
#include "Adaptive/new/FAdaptiveTask.hpp"
#include "Adaptive/FAdaptiveTask.hpp"
template<typename FReal> struct algo_descriptor<FReal, 1> {
constexpr static const char* name = "adaptive-task";
......@@ -245,7 +245,7 @@ template<typename FReal> struct algo_descriptor<FReal, 6> {
// StarPU adaptive fmm algorithm
#include "Adaptive/new/FAdaptiveStarPU.hpp"
#include "Adaptive/FAdaptiveStarPU.hpp"
template<typename FReal> struct algo_descriptor<FReal, 7> {
constexpr static const char* name = "adaptive-starpu";
......
......@@ -45,7 +45,7 @@ struct kernel_descriptor {
#include "Kernels/Interpolation/FInterpMatrixKernel.hpp"
#include "Kernels/Uniform/FUnifCell.hpp"
#include "Adaptive/new/FAdaptUnifKernel.hpp"
#include "Adaptive/FAdaptUnifKernel.hpp"
/**
* \brief Lagrange kernel descriptor specialisation
......@@ -87,7 +87,7 @@ struct kernel_descriptor<FReal, 0> {
// Chebyshev kernel descriptor ///////////////////
#include "Kernels/Chebyshev/FChebCell.hpp"
#include "Adaptive/new/FAdaptChebKernel.hpp"
#include "Adaptive/FAdaptChebKernel.hpp"
template<typename FReal> struct kernel_descriptor<FReal, 1> {
enum : bool {disabled = false};
......
......@@ -31,7 +31,7 @@ struct tree_descriptor {
// Shared memory adaptive tree descriptor ////////
#include "Adaptive/new/FTree.hpp"
#include "Adaptive/FTree.hpp"
template<typename FReal>
struct adaptive_tree_descriptor {
......
......@@ -31,77 +31,77 @@ namespace scalfmm {
namespace args {
struct TreeHeight : tcli::required_tag {
tcli::str_vec flags = {"--height", "-H"};
struct TreeHeight : inria::tcli::required_tag {
inria::tcli::str_vec flags = {"--height", "-H"};
const char* description = "Tree height (or initial height in case of an adaptive tree).";
using type = int;
};
struct SubTreeHeight {
tcli::str_vec flags = {"--sub-height", "-sh"};
inria::tcli::str_vec flags = {"--sub-height", "-sh"};
const char* description = "Subtree height, relevant for uniform algorithms.";
using type = int;
type def = 2;
};
struct ThreadCount {
tcli::str_vec flags = {"--threads", "-t"};
inria::tcli::str_vec flags = {"--threads", "-t"};
const char* description = "Maximum thread count to be used.";
using type = int;
type def = 1;
};
struct File : tcli::required_tag {
tcli::str_vec flags = {"--input-file", "-fin"};
struct File : inria::tcli::required_tag {
inria::tcli::str_vec flags = {"--input-file", "-fin"};
const char* description = "Input filename (.fma or .bfma).";
using type = std::string;
};
struct PerfFile {
tcli::str_vec flags = {"--perf-file"};
inria::tcli::str_vec flags = {"--perf-file"};
const char* description = "Performance output filename (json formated).";
using type = std::string;
};
struct Algo : tcli::required_tag {
struct Algo : inria::tcli::required_tag {
std::stringstream sstr{};
tcli::str_vec flags = {"--algo"};
inria::tcli::str_vec flags = {"--algo"};
std::string description = "Algorithm to use. One of "
+ (scalfmm::print_container(sstr, scalfmm::algo_list<FReal>()), sstr.str()) + '.';
using type = std::string;
};
struct Kernel : tcli::required_tag {
struct Kernel : inria::tcli::required_tag {
std::stringstream sstr;
tcli::str_vec flags = {"--kernel"};
inria::tcli::str_vec flags = {"--kernel"};
std::string description = "Kernel to use. One of "
+ (scalfmm::print_container(sstr, scalfmm::kernel_list<FReal>()), sstr.str()) + '.';
using type = std::string;
};
struct AdaptiveDensity : tcli::required_tag {
tcli::str_vec flags = {"--density", "-d"};
struct AdaptiveDensity : inria::tcli::required_tag {
inria::tcli::str_vec flags = {"--density", "-d"};
const char* description = "Particle per leaf limit for the adaptive algirithms.";
using type = int;
};
struct OpenMPChunkSize {
tcli::str_vec flags = {"--chunk-size"};
inria::tcli::str_vec flags = {"--chunk-size"};
const char* description = "OpenMP chunk size for uniform dynamic algorithm.";
using type = int;
type def = 0;
};
struct Checksum : tcli::flag_tag {
tcli::str_vec flags = {"--checksum", "--no-checksum"};
struct Checksum : inria::tcli::flag_tag {
inria::tcli::str_vec flags = {"--checksum", "--no-checksum"};
const char* description = "Compute some values to compare different executions.";
};
auto cli = tcli::make_parser(
auto cli = inria::tcli::make_parser(
TreeHeight{}, SubTreeHeight{}, ThreadCount{},
File{}, PerfFile{}, Algo{}, Kernel{},
AdaptiveDensity{}, OpenMPChunkSize{}, Checksum{}, tcli::help{});
AdaptiveDensity{}, OpenMPChunkSize{}, Checksum{}, inria::tcli::help{});
}
......
......@@ -12,7 +12,7 @@
#include "Components/FBasicParticle.hpp"
#include "Adaptive/new/FVariadicParticleContainer.hpp"
#include "Adaptive/FVariadicParticleContainer.hpp"
namespace sd = scalfmm::details;
......
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