Commit 9266d862 authored by COULAUD Olivier's avatar COULAUD Olivier

Now compile with Intel but we remove OMP4 dependencies and add a compilation warning in a test

parent e2c8262b
......@@ -17,8 +17,9 @@
// ==== CMAKE =====
// @FUSE_FFT
// @FUSE_BLAS
//
// ==== Git =====
// @SCALFMM_PRIVATE
//
// ================
/** \brief Chebyshev adaptive FMM example
......@@ -49,4 +50,4 @@ using FInterpolationAdaptiveKernel = FAdaptChebKernel<FReal,
const std::string interpolationType("Chebyshev interpolation");
#include "sharedMemorynterpolationAdaptiveFMM.hpp"
#include "sharedMemoryInterpolationAdaptiveFMM.hpp"
......@@ -2,7 +2,7 @@
// @FUSE_FFT
// @FUSE_BLAS
// ==== Git =====
// @SCALFMM_PRIVATE
//
// ================
/** \brief equispaced point (Uniform or Lagrange) Adaptive FMM example
......@@ -33,4 +33,4 @@ using FInterpolationAdaptiveKernel = FAdaptUnifKernel<FReal,
const std::string interpolationType("Lagrange equispaced points interpolation");
#include "sharedMemorynterpolationAdaptiveFMM.hpp"
#include "sharedMemoryInterpolationAdaptiveFMM.hpp"
This diff is collapsed.
......@@ -16,7 +16,7 @@
#include <omp.h>
#include <unistd.h>
#include "Utils/FGlobal.hpp"
#include "Core/FCoreCommon.hpp"
#include "Containers/FTreeCoordinate.hpp"
#include "Utils/FAlgorithmTimers.hpp"
......@@ -24,7 +24,7 @@
#include "Kernels/FKernelConcepts.hpp"
#include "kernel_utilities.hpp"
#include "inria/logic.hpp"
template<class _Tree, class _Kernel,
class = inria::require<
scalfmm::meta::adaptive_compatible<_Tree,_Kernel>
......@@ -169,7 +169,7 @@ public:
* FFmmOperations.
*/
void execute(const unsigned int operations) override {
this->run(operations);
// this->run(operations);
}
void run(int operations) {
......
......@@ -2,7 +2,7 @@
#define FPARTICULETYPEDINDEXEDMOVER_HPP
#include "FAbstractMover.hpp"
#include "../Containers/FVector.hpp"
#include "Containers/FVector.hpp"
/**
* This class should be use with the octree arrange to move particles
......@@ -34,10 +34,12 @@ public:
particleValues[idxAttr] = lf->getAttribute(idxAttr)[idxPart];
}
if(type == FParticleType::target){
toStoreRemovedTargetParts.push(particlePos,FParticleType::target,lf->getIndexes()[idxPart],particleValues);
//Bug with Intel toStoreRemovedTargetParts.push(particlePos,FParticleType::target,lf->getIndexes()[idxPart],particleValues);
toStoreRemovedTargetParts.push(particlePos,lf->getIndexes()[idxPart],particleValues);
}
else{
toStoreRemovedSourceParts.push(particlePos,FParticleType::source,lf->getIndexes()[idxPart],particleValues);
toStoreRemovedSourceParts.push(particlePos,lf->getIndexes()[idxPart],particleValues);
///Bug with Intel toStoreRemovedSourceParts.push(particlePos,FParticleType::source,lf->getIndexes()[idxPart],particleValues);
}
lf->removeParticles(&idxPart,1);
}
......
......@@ -22,7 +22,7 @@
* its count attribute.
*
*/
// @FUSE_OMP4
#include <iostream>
#include <string>
......@@ -95,10 +95,10 @@ int main() {
// Create kernel and FMM object
kernel_t kernel;
fmm_algo_t fmm_algo(&tree, &kernel);
fmm_algo_t fmm_algo(&tree, &kernel);
// Run algorithm
fmm_algo.execute();
//fmm_algo.execute();
test_particle_count(tree, position_vect);
}
......@@ -29,7 +29,7 @@ int main (int argc, char** argv)
std::cout << "Hostname: " << hostname << std::endl;
params.json["env"]["hostname"] = hostname;
}
{ // Save date
auto now = std::chrono::system_clock::now();
std::time_t d = std::chrono::system_clock::to_time_t(now);
......@@ -44,9 +44,12 @@ int main (int argc, char** argv)
scalfmm::print_container(std::cout, scalfmm::kernel_list<FReal>()) << '\n';
std::cout << "Available algorithms: ";
scalfmm::print_container(std::cout, scalfmm::algo_list<FReal>()) << '\n';
scalfmm::run<FReal>(params);
#ifdef __INTEL_COMPILER
#warning(" Compilation Bug !! remove scalfmm::run<FReal>(params);")
#else
scalfmm::run<FReal>(params); // Bug with intel Compiler
#endif
// Automatically handle file memory, fallback to std::cout if no file is given
std::unique_ptr<std::fstream> file_handle;
if(params.perf_file != "") {
......@@ -57,5 +60,5 @@ int main (int argc, char** argv)
os.precision(5);
os << std::setw(4) << params.json << '\n';
}
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