From 15db427b53222286921db868bcd3e17228185b98 Mon Sep 17 00:00:00 2001
From: bramas <berenger.bramas@inria.fr>
Date: Thu, 4 Sep 2014 13:39:28 +0200
Subject: [PATCH] Remove FTrace (files and compilation system) because it has
not been updated and is not maintained
---
CMakeLists.txt | 12 +-
Src/AdaptiveTree/FAdaptChebSymKernel.hpp | 2 +-
Src/AdaptiveTree/FAdaptSeqAlgorithm.hpp | 22 +-
Src/AdaptiveTree/FAdaptUnifKernel.hpp | 2 +-
Src/Components/FTestKernels.hpp | 2 +-
Src/Core/FFmmAlgorithm.hpp | 10 +-
Src/Core/FFmmAlgorithmPeriodic.hpp | 10 +-
Src/Core/FFmmAlgorithmSectionTask.hpp | 10 +-
Src/Core/FFmmAlgorithmTask.hpp | 8 +-
Src/Core/FFmmAlgorithmThread.hpp | 8 +-
Src/Core/FFmmAlgorithmThreadProc.hpp | 2 +-
Src/Core/FFmmAlgorithmThreadProcPeriodic.hpp | 2 +-
Src/Core/FFmmAlgorithmThreadTsm.hpp | 11 +-
Src/Core/FFmmAlgorithmTsm.hpp | 7 +-
Src/Files/FMpiTreeBuilder.hpp | 4 +-
Src/Kernels/Chebyshev/FAbstractChebKernel.hpp | 2 +-
Src/Kernels/Chebyshev/FChebFlopsSymKernel.hpp | 2 +-
Src/Kernels/Chebyshev/FChebKernel.hpp | 2 +-
Src/Kernels/Chebyshev/FChebSymKernel.hpp | 2 +-
.../Chebyshev/FChebSymTensorialKernel.hpp | 2 +-
.../Chebyshev/FChebTensorialKernel.hpp | 2 +-
.../Spherical/FAbstractSphericalKernel.hpp | 2 +-
Src/Kernels/Uniform/FAbstractUnifKernel.hpp | 2 +-
Src/Kernels/Uniform/FUnifDenseKernel.hpp | 2 +-
Src/Kernels/Uniform/FUnifKernel.hpp | 2 +-
Src/Kernels/Uniform/FUnifSymKernel.hpp | 2 +-
Src/Kernels/Uniform/FUnifTensorialKernel.hpp | 2 +-
Src/ScalFmmConfig.h.cmake | 8 -
Src/Utils/FBitonicSort.hpp | 3 +-
Src/Utils/FQuickSort.hpp | 2 +-
Src/Utils/FTrace.cpp | 25 --
Src/Utils/FTrace.hpp | 230 ------------------
Tests/Kernels/testSphericalProcAlgorithm.cpp | 1 -
Tests/noDist/testSphericalBlasBlockProc.cpp | 2 -
Tests/noDist/testSphericalBlasProc.cpp | 1 -
35 files changed, 35 insertions(+), 373 deletions(-)
delete mode 100755 Src/Utils/FTrace.cpp
delete mode 100755 Src/Utils/FTrace.hpp
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7bc37eaec..0de5e1ec4 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,7 +44,6 @@ MESSAGE(STATUS " CXX ${CMAKE_CXX_COMPILER_ID}" )
# Options
OPTION( ScalFMM_USE_BLAS "Set to ON to build ScaFMM with BLAS" OFF )
OPTION( ScalFMM_USE_FFT "Set to ON to build ScaFMM with FFTW" OFF )
-OPTION( ScalFMM_USE_TRACE "Set to ON to print trace or use itac trace" OFF )
OPTION( ScalFMM_BUILD_TESTS "Set to ON to build functionalities Tests" OFF )
OPTION( ScalFMM_BUILD_UTESTS "Set to ON to build UTests" OFF )
OPTION( ScalFMM_BUILD_DEBUG "Set to ON to build in Debug" OFF )
@@ -162,16 +161,7 @@ if( ScalFMM_ATTACHE_SOURCE )
# ADD_DEFINITIONS(-g)
SET(ScaLFMM_CXX_FLAGS "${ScaLFMM_CXX_FLAGS} -g")
endif(ScalFMM_ATTACHE_SOURCE)
-##############################################################################
-# Trace #
-##############################################################################
-MESSAGE( STATUS "ScalFMM_USE_TRACE = ${ScalFMM_USE_TRACE}" )
-if( ScalFMM_USE_TRACE )
- OPTION( ScalFMM_USE_ITAC "Set to ON to use itac trace" OFF )
- if( ScaLFMM_USE_ITAC )
- ADD_DEFINITIONS(-I$VT_ROOT/include -trace)
- endif()
-endif()
+
##############################################################################
# Blas option #
##############################################################################
diff --git a/Src/AdaptiveTree/FAdaptChebSymKernel.hpp b/Src/AdaptiveTree/FAdaptChebSymKernel.hpp
index eea36754d..3e465abc1 100755
--- a/Src/AdaptiveTree/FAdaptChebSymKernel.hpp
+++ b/Src/AdaptiveTree/FAdaptChebSymKernel.hpp
@@ -16,7 +16,7 @@
// ===================================================================================
#include "Utils/FGlobal.hpp"
-#include "Utils/FTrace.hpp"
+
#include "Utils/FPoint.hpp"
#include "Adaptative/FAdaptiveCell.hpp"
diff --git a/Src/AdaptiveTree/FAdaptSeqAlgorithm.hpp b/Src/AdaptiveTree/FAdaptSeqAlgorithm.hpp
index 50d109ec5..12420f99c 100755
--- a/Src/AdaptiveTree/FAdaptSeqAlgorithm.hpp
+++ b/Src/AdaptiveTree/FAdaptSeqAlgorithm.hpp
@@ -20,7 +20,7 @@
#include "Utils/FGlobal.hpp"
#include "Utils/FAssert.hpp"
#include "Utils/FLog.hpp"
-#include "Utils/FTrace.hpp"
+
#include "Utils/FTic.hpp"
#include "Containers/FOctree.hpp"
@@ -70,9 +70,7 @@ public:
* To execute the fmm algorithm
* Call this function to run the complete algorithm
*/
- void execute(const unsigned operationsToProceed = FFmmNearAndFarFields){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
-
+ void execute(const unsigned operationsToProceed = FFmmNearAndFarFields){
if(operationsToProceed & FFmmP2M) bottomPass();
if(operationsToProceed & FFmmM2M) upwardPass();
@@ -90,8 +88,7 @@ private:
/////////////////////////////////////////////////////////////////////////////
/** P2M */
- void bottomPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
+ void bottomPass(){
FLOG( FLog::Controller.write("\tStart Bottom Pass\n").write(FLog::Flush) );
FLOG(FTic counterTime);
FLOG(FTic computationCounter);
@@ -125,8 +122,7 @@ private:
/////////////////////////////////////////////////////////////////////////////
/** M2M */
- void upwardPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
+ void upwardPass(){
FLOG( FLog::Controller.write("\tStart Upward Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime);
FLOG(FTic computationCounter);
@@ -205,9 +201,7 @@ private:
/////////////////////////////////////////////////////////////////////////////
/** M2L */
- void transferPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
-
+ void transferPass(){
FLOG( FLog::Controller.write("\tStart Downward Pass (M2L)\n").write(FLog::Flush); );
FLOG(FTic counterTime);
FLOG(FTic computationCounter);
@@ -299,8 +293,7 @@ private:
/////////////////////////////////////////////////////////////////////////////
/** L2L */
- void downardPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
+ void downardPass(){
FLOG( FLog::Controller.write("\tStart Downward Pass (L2L)\n").write(FLog::Flush); );
FLOG(FTic counterTime);
FLOG(FTic computationCounter );
@@ -360,8 +353,7 @@ private:
/////////////////////////////////////////////////////////////////////////////
/** P2P */
- void directPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
+ void directPass(){
FLOG( FLog::Controller.write("\tStart Direct Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime);
FLOG(FTic computationCounterL2P);
diff --git a/Src/AdaptiveTree/FAdaptUnifKernel.hpp b/Src/AdaptiveTree/FAdaptUnifKernel.hpp
index cd3c021a4..5bd70ae31 100755
--- a/Src/AdaptiveTree/FAdaptUnifKernel.hpp
+++ b/Src/AdaptiveTree/FAdaptUnifKernel.hpp
@@ -16,7 +16,7 @@
// ===================================================================================
#include "Utils/FGlobal.hpp"
-#include "Utils/FTrace.hpp"
+
#include "Utils/FPoint.hpp"
#include "Adaptative/FAdaptiveCell.hpp"
diff --git a/Src/Components/FTestKernels.hpp b/Src/Components/FTestKernels.hpp
index bed6b0486..c705f0a1b 100755
--- a/Src/Components/FTestKernels.hpp
+++ b/Src/Components/FTestKernels.hpp
@@ -22,7 +22,7 @@
#include "FAbstractKernels.hpp"
#include "../Containers/FOctree.hpp"
#include "../Utils/FGlobal.hpp"
-#include "../Utils/FTrace.hpp"
+
/**
diff --git a/Src/Core/FFmmAlgorithm.hpp b/Src/Core/FFmmAlgorithm.hpp
index f180110d0..cc275c215 100755
--- a/Src/Core/FFmmAlgorithm.hpp
+++ b/Src/Core/FFmmAlgorithm.hpp
@@ -20,7 +20,7 @@
#include "../Utils/FGlobal.hpp"
#include "../Utils/FAssert.hpp"
#include "../Utils/FLog.hpp"
-#include "../Utils/FTrace.hpp"
+
#include "../Utils/FTic.hpp"
#include "../Containers/FOctree.hpp"
@@ -71,8 +71,6 @@ public:
* Call this function to run the complete algorithm
*/
void execute(const unsigned operationsToProceed = FFmmNearAndFarFields){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
-
if(operationsToProceed & FFmmP2M) bottomPass();
if(operationsToProceed & FFmmM2M) upwardPass();
@@ -91,7 +89,6 @@ private:
/** P2M */
void bottomPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Bottom Pass\n").write(FLog::Flush) );
FLOG(FTic counterTime);
FLOG(FTic computationCounter);
@@ -118,7 +115,6 @@ private:
/** M2M */
void upwardPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Upward Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime);
FLOG(FTic computationCounter);
@@ -160,8 +156,6 @@ private:
/** M2L */
void transferPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
-
FLOG( FLog::Controller.write("\tStart Downward Pass (M2L)\n").write(FLog::Flush); );
FLOG(FTic counterTime);
FLOG(FTic computationCounter);
@@ -204,7 +198,6 @@ private:
/** L2L */
void downardPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Downward Pass (L2L)\n").write(FLog::Flush); );
FLOG(FTic counterTime);
FLOG(FTic computationCounter );
@@ -244,7 +237,6 @@ private:
/** P2P */
void directPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Direct Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime);
FLOG(FTic computationCounterL2P);
diff --git a/Src/Core/FFmmAlgorithmPeriodic.hpp b/Src/Core/FFmmAlgorithmPeriodic.hpp
index f56b53d98..8ffa9e482 100755
--- a/Src/Core/FFmmAlgorithmPeriodic.hpp
+++ b/Src/Core/FFmmAlgorithmPeriodic.hpp
@@ -6,7 +6,7 @@
#include "../Utils/FGlobalPeriodic.hpp"
#include "../Utils/FAssert.hpp"
#include "../Utils/FLog.hpp"
-#include "../Utils/FTrace.hpp"
+
#include "../Utils/FTic.hpp"
#include "../Utils/FMemUtils.hpp"
@@ -69,7 +69,6 @@ public:
*/
void execute(const unsigned operationsToProceed = FFmmNearAndFarFields){
FAssertLF(kernels, "kernels cannot be null");
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
if(operationsToProceed & FFmmP2M) bottomPass();
@@ -93,7 +92,6 @@ public:
/** P2M */
void bottomPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Bottom Pass\n").write(FLog::Flush) );
FLOG(FTic counterTime);
FLOG(FTic computationCounter);
@@ -120,7 +118,6 @@ public:
/** M2M */
void upwardPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Upward Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime);
FLOG(FTic computationCounter);
@@ -161,8 +158,6 @@ public:
/** M2L L2L */
void transferPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
-
FLOG( FLog::Controller.write("\tStart Downward Pass (M2L)\n").write(FLog::Flush); );
FLOG(FTic counterTime);
FLOG(FTic computationCounter);
@@ -201,7 +196,6 @@ public:
void downardPass(){ // second L2L
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Downward Pass (L2L)\n").write(FLog::Flush); );
FLOG(FTic counterTime);
FLOG(FTic computationCounter );
@@ -239,7 +233,6 @@ public:
/** P2P */
void directPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Direct Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime);
FLOG(FTic computationCounterL2P);
@@ -513,7 +506,6 @@ public:
* Finally the L2L
*/
void processPeriodicLevels(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Periodic Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime);
diff --git a/Src/Core/FFmmAlgorithmSectionTask.hpp b/Src/Core/FFmmAlgorithmSectionTask.hpp
index e044bb8fe..99c14d5cd 100755
--- a/Src/Core/FFmmAlgorithmSectionTask.hpp
+++ b/Src/Core/FFmmAlgorithmSectionTask.hpp
@@ -20,7 +20,7 @@
#include "../Utils/FGlobal.hpp"
#include "../Utils/FAssert.hpp"
#include "../Utils/FLog.hpp"
-#include "../Utils/FTrace.hpp"
+
#include "../Utils/FTic.hpp"
#include "../Containers/FOctree.hpp"
@@ -84,7 +84,6 @@ public:
* Call this function to run the complete algorithm
*/
void execute(const unsigned operationsToProceed = FFmmNearAndFarFields){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
#pragma omp parallel
{
@@ -119,7 +118,6 @@ private:
/** P2M */
void bottomPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Bottom Pass\n").write(FLog::Flush) );
FLOG(FTic counterTime);
@@ -148,7 +146,6 @@ private:
/** M2M */
void upwardPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Upward Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime);
@@ -189,8 +186,6 @@ private:
/** M2L L2L */
void transferPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
-
FLOG( FLog::Controller.write("\tStart Downward Pass (M2L)\n").write(FLog::Flush); );
FLOG(FTic counterTime);
@@ -241,7 +236,6 @@ private:
/////////////////////////////////////////////////////////////////////////////
void downardPass(){ // second L2L
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Downward Pass (L2L)\n").write(FLog::Flush); );
FLOG(FTic counterTime);
@@ -280,7 +274,6 @@ private:
/** P2P */
void directPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Direct Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime);
FLOG(FTic computationCounter);
@@ -330,7 +323,6 @@ private:
}
void L2PPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart L2P Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime);
diff --git a/Src/Core/FFmmAlgorithmTask.hpp b/Src/Core/FFmmAlgorithmTask.hpp
index 8419122c1..176eeea24 100755
--- a/Src/Core/FFmmAlgorithmTask.hpp
+++ b/Src/Core/FFmmAlgorithmTask.hpp
@@ -20,7 +20,7 @@
#include "../Utils/FGlobal.hpp"
#include "../Utils/FAssert.hpp"
#include "../Utils/FLog.hpp"
-#include "../Utils/FTrace.hpp"
+
#include "../Utils/FTic.hpp"
#include "../Containers/FOctree.hpp"
@@ -84,7 +84,6 @@ public:
* Call this function to run the complete algorithm
*/
void execute(const unsigned operationsToProceed = FFmmNearAndFarFields){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
if(operationsToProceed & FFmmP2M) bottomPass();
@@ -104,7 +103,6 @@ private:
/** P2M */
void bottomPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Bottom Pass\n").write(FLog::Flush) );
FLOG(FTic counterTime);
@@ -138,7 +136,6 @@ private:
/** M2M */
void upwardPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Upward Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime);
@@ -185,7 +182,6 @@ private:
/** M2L L2L */
void transferPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Downward Pass (M2L)\n").write(FLog::Flush); );
FLOG(FTic counterTime);
@@ -241,7 +237,6 @@ private:
/////////////////////////////////////////////////////////////////////////////
void downardPass(){ // second L2L
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Downward Pass (L2L)\n").write(FLog::Flush); );
FLOG(FTic counterTime);
@@ -286,7 +281,6 @@ private:
/** P2P */
void directPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Direct Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime);
FLOG(FTic computationCounter);
diff --git a/Src/Core/FFmmAlgorithmThread.hpp b/Src/Core/FFmmAlgorithmThread.hpp
index d8118067b..683c3f74b 100755
--- a/Src/Core/FFmmAlgorithmThread.hpp
+++ b/Src/Core/FFmmAlgorithmThread.hpp
@@ -19,7 +19,7 @@
#include "../Utils/FAssert.hpp"
#include "../Utils/FLog.hpp"
-#include "../Utils/FTrace.hpp"
+
#include "../Utils/FTic.hpp"
#include "../Utils/FGlobal.hpp"
@@ -92,7 +92,6 @@ public:
* Call this function to run the complete algorithm
*/
void execute(const unsigned operationsToProceed = FFmmNearAndFarFields){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
for(int idxShape = 0 ; idxShape < SizeShape ; ++idxShape){
this->shapeLeaf[idxShape] = 0;
@@ -132,7 +131,6 @@ private:
/** P2M */
void bottomPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Bottom Pass\n").write(FLog::Flush) );
FLOG(FTic counterTime);
@@ -169,7 +167,6 @@ private:
/** M2M */
void upwardPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Upward Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime);
FLOG(FTic computationCounter);
@@ -220,7 +217,6 @@ private:
/** M2L L2L */
void transferPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Downward Pass (M2L)\n").write(FLog::Flush); );
FLOG(FTic counterTime);
@@ -269,7 +265,6 @@ private:
/////////////////////////////////////////////////////////////////////////////
void downardPass(){ // second L2L
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Downward Pass (L2L)\n").write(FLog::Flush); );
FLOG(FTic counterTime);
@@ -318,7 +313,6 @@ private:
/** P2P */
void directPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Direct Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime);
FLOG(FTic computationCounter);
diff --git a/Src/Core/FFmmAlgorithmThreadProc.hpp b/Src/Core/FFmmAlgorithmThreadProc.hpp
index a58590fb1..60ec601fd 100644
--- a/Src/Core/FFmmAlgorithmThreadProc.hpp
+++ b/Src/Core/FFmmAlgorithmThreadProc.hpp
@@ -21,7 +21,7 @@
//
#include "../Utils/FAssert.hpp"
#include "../Utils/FLog.hpp"
-#include "../Utils/FTrace.hpp"
+
#include "../Utils/FTic.hpp"
#include "../Utils/FGlobal.hpp"
diff --git a/Src/Core/FFmmAlgorithmThreadProcPeriodic.hpp b/Src/Core/FFmmAlgorithmThreadProcPeriodic.hpp
index ee0e1066f..0eee73e3c 100755
--- a/Src/Core/FFmmAlgorithmThreadProcPeriodic.hpp
+++ b/Src/Core/FFmmAlgorithmThreadProcPeriodic.hpp
@@ -19,7 +19,7 @@
#include "../Utils/FAssert.hpp"
#include "../Utils/FLog.hpp"
-#include "../Utils/FTrace.hpp"
+
#include "../Utils/FTic.hpp"
#include "../Utils/FGlobal.hpp"
#include "../Utils/FMemUtils.hpp"
diff --git a/Src/Core/FFmmAlgorithmThreadTsm.hpp b/Src/Core/FFmmAlgorithmThreadTsm.hpp
index 317001c7c..f1c212f4d 100755
--- a/Src/Core/FFmmAlgorithmThreadTsm.hpp
+++ b/Src/Core/FFmmAlgorithmThreadTsm.hpp
@@ -19,7 +19,7 @@
#include "../Utils/FAssert.hpp"
#include "../Utils/FLog.hpp"
-#include "../Utils/FTrace.hpp"
+
#include "../Utils/FTic.hpp"
#include "../Utils/FGlobal.hpp"
@@ -88,8 +88,6 @@ public:
* Call this function to run the complete algorithm
*/
void execute(const unsigned operationsToProceed = FFmmNearAndFarFields){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
-
// Count leaf
int numberOfLeafs = 0;
typename OctreeClass::Iterator octreeIterator(tree);
@@ -118,7 +116,6 @@ public:
/** P2M */
void bottomPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Bottom Pass\n").write(FLog::Flush) );
FLOG( FTic counterTime );
@@ -159,7 +156,6 @@ public:
/** M2M */
void upwardPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Upward Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime);
FLOG(FTic computationCounter);
@@ -220,8 +216,6 @@ public:
/** M2L */
void transferPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
-
FLOG( FLog::Controller.write("\tStart Downward Pass (M2L)\n").write(FLog::Flush); );
FLOG(FTic counterTime);
FLOG(FTic computationCounter);
@@ -283,8 +277,6 @@ public:
/* L2L */
void downardPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
-
FLOG( FLog::Controller.write("\tStart Downward Pass (L2L)\n").write(FLog::Flush); );
FLOG(FTic counterTime);
FLOG(FTic computationCounter);
@@ -339,7 +331,6 @@ public:
/** P2P */
void directPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Direct Pass\n").write(FLog::Flush); );
FLOG(FTic counterTime);
diff --git a/Src/Core/FFmmAlgorithmTsm.hpp b/Src/Core/FFmmAlgorithmTsm.hpp
index 86df966b4..63abd81fb 100755
--- a/Src/Core/FFmmAlgorithmTsm.hpp
+++ b/Src/Core/FFmmAlgorithmTsm.hpp
@@ -19,7 +19,7 @@
#include "../Utils/FAssert.hpp"
#include "../Utils/FLog.hpp"
-#include "../Utils/FTrace.hpp"
+
#include "../Utils/FTic.hpp"
#include "../Containers/FOctree.hpp"
@@ -73,7 +73,6 @@ public:
* Call this function to run the complete algorithm
*/
void execute(const unsigned operationsToProceed = FFmmNearAndFarFields){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
if(operationsToProceed & FFmmP2M) bottomPass();
@@ -88,7 +87,6 @@ public:
/** P2M */
void bottomPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Bottom Pass\n").write(FLog::Flush) );
FLOG( counterTime.tic() );
FLOG( double totalComputation = 0 );
@@ -121,7 +119,6 @@ public:
/** M2M */
void upwardPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Upward Pass\n").write(FLog::Flush); );
FLOG( counterTime.tic() );
FLOG( double totalComputation = 0 );
@@ -176,7 +173,6 @@ public:
/** M2L */
void transferPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Downward Pass (M2L)\n").write(FLog::Flush); );
FLOG( counterTime.tic() );
FLOG( double totalComputation = 0 );
@@ -281,7 +277,6 @@ public:
/** P2P */
void directPass(){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
FLOG( FLog::Controller.write("\tStart Direct Pass\n").write(FLog::Flush); );
FLOG( counterTime.tic() );
FLOG( double totalComputation = 0 );
diff --git a/Src/Files/FMpiTreeBuilder.hpp b/Src/Files/FMpiTreeBuilder.hpp
index 2308eed30..3067d553d 100755
--- a/Src/Files/FMpiTreeBuilder.hpp
+++ b/Src/Files/FMpiTreeBuilder.hpp
@@ -21,7 +21,7 @@
#include "../Utils/FBitonicSort.hpp"
#include "../Utils/FMemUtils.hpp"
-#include "../Utils/FTrace.hpp"
+
#include "../Containers/FVector.hpp"
#include "../BalanceTree/FLeafBalance.hpp"
@@ -167,7 +167,6 @@ public:
static void MergeSplitedLeaves(const FMpi::FComm& communicator, IndexedParticle* workingArray, FSize* workingSize,
FSize ** leavesOffsetInParticles, ParticleClass** particlesArrayInLeafOrder, FSize* const leavesSize){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Loader to Tree" , __FILE__ , __LINE__) );
const int myRank = communicator.processId();
const int nbProcs = communicator.processCount();
@@ -324,7 +323,6 @@ public:
const FSize leavesOffsetInParticles[], const ParticleClass particlesArrayInLeafOrder[],
const FSize currentNbLeaves,
const FSize currentNbParts, FAbstractBalanceAlgorithm * balancer){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Loader to Tree" , __FILE__ , __LINE__) );
const int myRank = communicator.processId();
const int nbProcs = communicator.processCount();
diff --git a/Src/Kernels/Chebyshev/FAbstractChebKernel.hpp b/Src/Kernels/Chebyshev/FAbstractChebKernel.hpp
index 68879728e..2d7a46816 100755
--- a/Src/Kernels/Chebyshev/FAbstractChebKernel.hpp
+++ b/Src/Kernels/Chebyshev/FAbstractChebKernel.hpp
@@ -17,7 +17,7 @@
#define FABSTRACTCHEBKERNEL_HPP
#include "../../Utils/FGlobal.hpp"
-#include "../../Utils/FTrace.hpp"
+
#include "../../Utils/FSmartPointer.hpp"
#include "../../Components/FAbstractKernels.hpp"
diff --git a/Src/Kernels/Chebyshev/FChebFlopsSymKernel.hpp b/Src/Kernels/Chebyshev/FChebFlopsSymKernel.hpp
index cfd9720fe..f02ffacf9 100755
--- a/Src/Kernels/Chebyshev/FChebFlopsSymKernel.hpp
+++ b/Src/Kernels/Chebyshev/FChebFlopsSymKernel.hpp
@@ -19,7 +19,7 @@
#include <stdexcept>
#include "../../Utils/FGlobal.hpp"
-#include "../../Utils/FTrace.hpp"
+
#include "../../Utils/FSmartPointer.hpp"
#include "../../Components/FAbstractKernels.hpp"
diff --git a/Src/Kernels/Chebyshev/FChebKernel.hpp b/Src/Kernels/Chebyshev/FChebKernel.hpp
index 6dbd31849..ab37a9e25 100755
--- a/Src/Kernels/Chebyshev/FChebKernel.hpp
+++ b/Src/Kernels/Chebyshev/FChebKernel.hpp
@@ -17,7 +17,7 @@
#define FCHEBKERNEL_HPP
#include "../../Utils/FGlobal.hpp"
-#include "../../Utils/FTrace.hpp"
+
#include "../../Utils/FSmartPointer.hpp"
#include "./FAbstractChebKernel.hpp"
diff --git a/Src/Kernels/Chebyshev/FChebSymKernel.hpp b/Src/Kernels/Chebyshev/FChebSymKernel.hpp
index df3394853..52c7500d4 100755
--- a/Src/Kernels/Chebyshev/FChebSymKernel.hpp
+++ b/Src/Kernels/Chebyshev/FChebSymKernel.hpp
@@ -16,7 +16,7 @@
// ===================================================================================
#include "Utils/FGlobal.hpp"
-#include "Utils/FTrace.hpp"
+
#include "Utils/FSmartPointer.hpp"
#include "FAbstractChebKernel.hpp"
diff --git a/Src/Kernels/Chebyshev/FChebSymTensorialKernel.hpp b/Src/Kernels/Chebyshev/FChebSymTensorialKernel.hpp
index 3072778eb..34b29b0ab 100755
--- a/Src/Kernels/Chebyshev/FChebSymTensorialKernel.hpp
+++ b/Src/Kernels/Chebyshev/FChebSymTensorialKernel.hpp
@@ -3,7 +3,7 @@
// [--License--]
#include "../../Utils/FGlobal.hpp"
-#include "../../Utils/FTrace.hpp"
+
#include "../../Utils/FSmartPointer.hpp"
#include "./FAbstractChebKernel.hpp"
diff --git a/Src/Kernels/Chebyshev/FChebTensorialKernel.hpp b/Src/Kernels/Chebyshev/FChebTensorialKernel.hpp
index dcf24d479..02906a979 100755
--- a/Src/Kernels/Chebyshev/FChebTensorialKernel.hpp
+++ b/Src/Kernels/Chebyshev/FChebTensorialKernel.hpp
@@ -17,7 +17,7 @@
#define FCHEBTENSORIALKERNEL_HPP
#include "../../Utils/FGlobal.hpp"
-#include "../../Utils/FTrace.hpp"
+
#include "../../Utils/FSmartPointer.hpp"
#include "./FAbstractChebKernel.hpp"
diff --git a/Src/Kernels/Spherical/FAbstractSphericalKernel.hpp b/Src/Kernels/Spherical/FAbstractSphericalKernel.hpp
index 08bd2a776..93e3559ee 100755
--- a/Src/Kernels/Spherical/FAbstractSphericalKernel.hpp
+++ b/Src/Kernels/Spherical/FAbstractSphericalKernel.hpp
@@ -20,7 +20,7 @@
#include "../../Components/FAbstractKernels.hpp"
#include "../../Utils/FGlobal.hpp"
-#include "../../Utils/FTrace.hpp"
+
#include "../../Utils/FMemUtils.hpp"
#include "../../Utils/FSmartPointer.hpp"
#include "../../Utils/FPoint.hpp"
diff --git a/Src/Kernels/Uniform/FAbstractUnifKernel.hpp b/Src/Kernels/Uniform/FAbstractUnifKernel.hpp
index 889d2b716..3ce311df5 100644
--- a/Src/Kernels/Uniform/FAbstractUnifKernel.hpp
+++ b/Src/Kernels/Uniform/FAbstractUnifKernel.hpp
@@ -17,7 +17,7 @@
#define FABSTRACTUNIFKERNEL_HPP
#include "../../Utils/FGlobal.hpp"
-#include "../../Utils/FTrace.hpp"
+
#include "../../Utils/FSmartPointer.hpp"
#include "../../Components/FAbstractKernels.hpp"
diff --git a/Src/Kernels/Uniform/FUnifDenseKernel.hpp b/Src/Kernels/Uniform/FUnifDenseKernel.hpp
index 95a9e3269..95aa4d447 100644
--- a/Src/Kernels/Uniform/FUnifDenseKernel.hpp
+++ b/Src/Kernels/Uniform/FUnifDenseKernel.hpp
@@ -17,7 +17,7 @@
#define FUNIFDENSEKERNEL_HPP
#include "../../Utils/FGlobal.hpp"
-#include "../../Utils/FTrace.hpp"
+
#include "../../Utils/FSmartPointer.hpp"
#include "./FAbstractUnifKernel.hpp"
diff --git a/Src/Kernels/Uniform/FUnifKernel.hpp b/Src/Kernels/Uniform/FUnifKernel.hpp
index a4893b70b..31b0b4914 100644
--- a/Src/Kernels/Uniform/FUnifKernel.hpp
+++ b/Src/Kernels/Uniform/FUnifKernel.hpp
@@ -17,7 +17,7 @@
#define FUNIFKERNEL_HPP
#include "../../Utils/FGlobal.hpp"
-#include "../../Utils/FTrace.hpp"
+
#include "../../Utils/FSmartPointer.hpp"
#include "./FAbstractUnifKernel.hpp"
diff --git a/Src/Kernels/Uniform/FUnifSymKernel.hpp b/Src/Kernels/Uniform/FUnifSymKernel.hpp
index 07f65fc85..e42e79c8c 100755
--- a/Src/Kernels/Uniform/FUnifSymKernel.hpp
+++ b/Src/Kernels/Uniform/FUnifSymKernel.hpp
@@ -17,7 +17,7 @@
#define FUNIFSYMKERNEL_HPP
#include "../../Utils/FGlobal.hpp"
-#include "../../Utils/FTrace.hpp"
+
#include "../../Utils/FSmartPointer.hpp"
// Originally in M2LHandler but transferred to the kernel for the symmetric version
diff --git a/Src/Kernels/Uniform/FUnifTensorialKernel.hpp b/Src/Kernels/Uniform/FUnifTensorialKernel.hpp
index 4fa6e3ad8..84aa4e564 100644
--- a/Src/Kernels/Uniform/FUnifTensorialKernel.hpp
+++ b/Src/Kernels/Uniform/FUnifTensorialKernel.hpp
@@ -17,7 +17,7 @@
#define FUNIFTENSORIALKERNEL_HPP
#include "../../Utils/FGlobal.hpp"
-#include "../../Utils/FTrace.hpp"
+
#include "../../Utils/FSmartPointer.hpp"
#include "./FAbstractUnifKernel.hpp"
diff --git a/Src/ScalFmmConfig.h.cmake b/Src/ScalFmmConfig.h.cmake
index 58e581659..0eca4c9bb 100755
--- a/Src/ScalFmmConfig.h.cmake
+++ b/Src/ScalFmmConfig.h.cmake
@@ -42,14 +42,6 @@
#cmakedefine ScalFMM_USE_MPI
-///////////////////////////////////////////////////////
-// Trace & Itac
-///////////////////////////////////////////////////////
-
-#cmakedefine ScalFMM_USE_TRACE
-#cmakedefine ScalFMM_USE_ITAC
-#cmakedefine ScalFMM_USE_EZTRACE
-
///////////////////////////////////////////////////////
// Memory trace
///////////////////////////////////////////////////////
diff --git a/Src/Utils/FBitonicSort.hpp b/Src/Utils/FBitonicSort.hpp
index d6635ba62..ae33003d5 100755
--- a/Src/Utils/FBitonicSort.hpp
+++ b/Src/Utils/FBitonicSort.hpp
@@ -19,7 +19,7 @@
#include <cstdlib>
#include <cmath>
-#include "FTrace.hpp"
+
#include "FMpi.hpp"
#include "FQuickSort.hpp"
#include "FAssert.hpp"
@@ -144,7 +144,6 @@ public:
endfor
*/
static void Sort(SortType array[], const IndexType size, const FMpi::FComm& comm){
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Bitonic" , __FILE__ , __LINE__) );
const int np = comm.processCount();
const int rank = comm.processId();
diff --git a/Src/Utils/FQuickSort.hpp b/Src/Utils/FQuickSort.hpp
index 65bde87e6..009dfd239 100755
--- a/Src/Utils/FQuickSort.hpp
+++ b/Src/Utils/FQuickSort.hpp
@@ -25,7 +25,7 @@
#include "FGlobal.hpp"
#include "FMemUtils.hpp"
-#include "FTrace.hpp"
+
/** This class is parallel quick sort
* It hold a mpi version
diff --git a/Src/Utils/FTrace.cpp b/Src/Utils/FTrace.cpp
deleted file mode 100755
index a4dc61938..000000000
--- a/Src/Utils/FTrace.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-// ===================================================================================
-// Copyright ScalFmm 2011 INRIA, Olivier Coulaud, Berenger Bramas, Matthias Messner
-// olivier.coulaud@inria.fr, berenger.bramas@inria.fr
-// This software is a computer program whose purpose is to compute the FMM.
-//
-// This software is governed by the CeCILL-C and LGPL licenses and
-// abiding by the rules of distribution of free software.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public and CeCILL-C Licenses for more details.
-// "http://www.cecill.info".
-// "http://www.gnu.org/licenses".
-// ===================================================================================
-#include "FTrace.hpp"
-#ifdef ScalFMM_USE_TRACE
-
-#if !defined (ScalFMM_USE_ITAC) && !defined (ScalFMM_USE_EZTRACE)
-int FTrace::Deep = 0;
-FTic FTrace::TimeSinceBegining;
-#endif
-
-#endif // ScalFMM_USE_TRACE
-
diff --git a/Src/Utils/FTrace.hpp b/Src/Utils/FTrace.hpp
deleted file mode 100755
index 7429b21fd..000000000
--- a/Src/Utils/FTrace.hpp
+++ /dev/null
@@ -1,230 +0,0 @@
-// ===================================================================================
-// Copyright ScalFmm 2011 INRIA
-// olivier.coulaud@inria.fr, berenger.bramas@inria.fr
-// This software is a computer program whose purpose is to compute the FMM.
-//
-// This software is governed by the CeCILL-C and LGPL licenses and
-// abiding by the rules of distribution of free software.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public and CeCILL-C Licenses for more details.
-// "http://www.cecill.info".
-// "http://www.gnu.org/licenses".
-// ===================================================================================
-#ifndef FTRACE_HPP
-#define FTRACE_HPP
-
-
-#include "FGlobal.hpp"
-
-/**
-* @author Berenger Bramas (berenger.bramas@inria.fr)
-* @class FTrace
-* Please read the license
-*
-* This class is used to print trace data during processing.
-* You have to use the FTRACE macro as shown in the example.
-*
-* <code>
-* FTRACE( FTrace::FRegion regionTrace("Sub part of function", __FUNCTION__ , __FILE__ , __LINE__) );
-* ...
-* FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Fmm" , __FILE__ , __LINE__) );
-* </code>
-*/
-
-#ifndef ScalFMM_USE_TRACE
-
- #define FTRACE( X )
-
- class FTrace {
- public:
- class FRegion {
- public:
- FRegion(const char*, const char*, const char* = nullptr, const int = 0){}
- void end(){}
- };
- class FFunction {
- public:
- FFunction(const char*, const char*, const char* = nullptr, const int = 0){}
- };
- };
-
-
-#else
-
- #define FTRACE( X ) X
-
- #ifdef ScalFMM_USE_ITAC
-
- #include <VT.h>
-
- class FTrace {
- public:
- class FRegion {
- VT_Region region;
- public:
- FRegion(const char*const regionName, const char*const className)
- : region( regionName, className) {}
- FRegion(const char*const regionName, const char*const className, const char* const file, const int line)
- : region( regionName, className, file, line ) {}
- void end(){
- region.end();
- }
- };
-
- class FFunction {
- VT_Function function;
- public:
- FFunction(const char*const functionName, const char*const className)
- : function( functionName, className) {}
- FFunction(const char*const functionName, const char*const className, const char* const file, const int line)
- : function( functionName, className, file, line ) {}
- };
- };
-
- #else
- #ifdef ScalFMM_USE_EZTRACE
-
- #include <eztrace.h>
-
- class FTrace {
- static const unsigned IdModule = 0xCC00; // must be between 0x1000 and 0xff00
- static unsigned BuildMask(const char* phrase){
- unsigned mask = 0;
- if(phrase){
- while( *phrase ){
- mask = (mask<<1) ^ (*phrase++) ^ ((mask>>15)&1);
- }
- }
- return ((mask & 0xFF) | IdModule) & ~0x2; // 0x[IdModule][Mask] last bits has to 01
- }
- public:
- class FRegion {
- const unsigned mask;
- bool hadFinished;
- public:
- FRegion(const char*const regionName, const char*const className)
- : mask(BuildMask(regionName)), hadFinished(false) {
- EZTRACE_EVENT2(mask, regionName, className);
- }
- FRegion(const char*const regionName, const char*const className, const char* const file, const int line)
- : mask(BuildMask(regionName)), hadFinished(false) {
- EZTRACE_EVENT4(mask, regionName, className, file, line);
- }
- ~FRegion(){
- end();
- }
- void end(){
- if( !hadFinished ){
- hadFinished = true;
- EZTRACE_EVENT0(mask^0x3);
- }
- }
- };
-
- class FFunction {
- const unsigned mask;
- public:
- FFunction(const char*const functionName, const char*const className)
- : mask(BuildMask(functionName)) {
- EZTRACE_EVENT2(mask, functionName, className);
- }
- FFunction(const char*const functionName, const char*const className, const char* const file, const int line)
- : mask(BuildMask(functionName)) {
- EZTRACE_EVENT4(mask, functionName, className, file, line);
- }
- ~FFunction(){
- EZTRACE_EVENT0(mask^0x3);
- }
- };
- };
-
- #else
-
- #include <iostream>
- #include <iomanip>
-
- #include "FTic.hpp"
-
- class FTrace{
- static int Deep;
- static FTic TimeSinceBegining;
-
- static void PrintTab(){
- std::cout << "{" << std::setw( 6 ) << TimeSinceBegining.tacAndElapsed() << "s} ";
- for(int idxDeep = 0 ; idxDeep < Deep ; ++idxDeep){
- std::cout << '\t';
- }
- }
-
- public:
- class FRegion {
- bool closed;
- void close(){
- if(!closed){
- closed = true;
- --FTrace::Deep;
- }
- }
- public:
- FRegion(const char*const regionName, const char*const className)
- : closed(false) {
- FTrace::PrintTab();
- std::cout << "@Region: " << regionName << " (" << className << ")\n";
- ++FTrace::Deep;
- }
- FRegion(const char*const regionName, const char*const className, const char* const file, const int line)
- : closed(false) {
- FTrace::PrintTab();
- std::cout << "@Region: " << regionName << " (" << className << ")" << " -- line " << line << " file " << file << "\n";
- ++FTrace::Deep;
- }
- ~FRegion(){
- close();
- }
- void end(){
- close();
- }
- };
-
- class FFunction {
- bool closed;
- void close(){
- if(!closed){
- closed = true;
- --FTrace::Deep;
- }
- }
- public:
- FFunction(const char*const functionName, const char*const className)
- : closed(false){
- FTrace::PrintTab();
- std::cout << "@Function: " << functionName << " (" << className << ")\n";
- ++FTrace::Deep;
- }
- FFunction(const char*const functionName, const char*const className, const char* const file, const int line)
- : closed(false) {
- FTrace::PrintTab();
- std::cout << "@Function: " << functionName << " (" << className << ")" << " -- line " << line << " file " << file << "\n";
- ++FTrace::Deep;
- }
- ~FFunction(){
- close();
- }
- };
-
- friend class FRegion;
- friend class FFunction;
- };
-
- #endif //ScalFMM_USE_EZTRACE
-
- #endif //ScalFMM_USE_ITAC
-
-#endif //ScalFMM_USE_TRACE
-
-#endif //FTRACE_HPP
-
-
diff --git a/Tests/Kernels/testSphericalProcAlgorithm.cpp b/Tests/Kernels/testSphericalProcAlgorithm.cpp
index 40d8497f1..abce40c51 100755
--- a/Tests/Kernels/testSphericalProcAlgorithm.cpp
+++ b/Tests/Kernels/testSphericalProcAlgorithm.cpp
@@ -337,7 +337,6 @@ int main(int argc, char ** argv){
std::cout << "Done " << "(@Algorithm = " << counter.elapsed() << "s)." << std::endl;
{ // get sum forces&potential
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Sum Result" , __FILE__ , __LINE__) );
FReal potential = 0;
FReal fx = 0.0, fy = 0.0, fz = 0.0;
diff --git a/Tests/noDist/testSphericalBlasBlockProc.cpp b/Tests/noDist/testSphericalBlasBlockProc.cpp
index c6f15f408..6949d219a 100644
--- a/Tests/noDist/testSphericalBlasBlockProc.cpp
+++ b/Tests/noDist/testSphericalBlasBlockProc.cpp
@@ -172,8 +172,6 @@ int main(int argc, char ** argv){
std::cout << "Done " << "(@Algorithm = " << counter.elapsed() << "s)." << std::endl;
{ // get sum forces&potential
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Sum Result" , __FILE__ , __LINE__) );
-
FReal potential = 0;
FReal fx = 0.0, fy = 0.0, fz = 0.0;
diff --git a/Tests/noDist/testSphericalBlasProc.cpp b/Tests/noDist/testSphericalBlasProc.cpp
index 3365cad92..1c3f39640 100644
--- a/Tests/noDist/testSphericalBlasProc.cpp
+++ b/Tests/noDist/testSphericalBlasProc.cpp
@@ -172,7 +172,6 @@ int main(int argc, char ** argv){
std::cout << "Done " << "(@Algorithm = " << counter.elapsed() << "s)." << std::endl;
{ // get sum forces&potential
- FTRACE( FTrace::FFunction functionTrace(__FUNCTION__, "Sum Result" , __FILE__ , __LINE__) );
FReal potential = 0;
FReal fx = 0.0, fy = 0.0, fz = 0.0;
--
GitLab