Set properly SCALFMM_CMAKE_MODULE_PATH, modify script to check algorithm

CMakeLists.txt

@@ -17,8 +17,8 @@ if(insource)
   message(FATAL_ERROR "${PROJECT_NAME} requires an out of source build. Goto ./Build and tapes cmake ../")
 endif(insource)
 
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/)
-set(SCALFMM_CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules)
+list(APPEND CMAKE_MODULE_PATH  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/)
+SET(SCALFMM_CMAKE_MODULE_PATH  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/)
 #
 # Adds the CMAKE_DEPENDENT_OPTION command
 INCLUDE(CMakeDependentOption)
@@ -677,7 +677,9 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse_
   message(STATUS "SCALFMM_USE_AVX               = ${SCALFMM_USE_AVX}")
   if(SCALFMM_USE_AVX)
     if(NOT EXISTS ${SCALFMM_CMAKE_MODULE_PATH}/compileTestAvx.cpp)
-      message(FATAL_ERROR "The CompileTestSseFile does not exist (${SCALFMM_CMAKE_MODULE_PATH}/compileTestAvx.cpp)" )
+
+      message(WARNING "SCALFMM_CMAKE_MODULE_PATH ${SCALFMM_CMAKE_MODULE_PATH}/compileTestAvx.cpp" )
+      message(FATAL_ERROR "The CompileTestAvxFile does not exist (${SCALFMM_CMAKE_MODULE_PATH}/compileTestAvx.cpp)" )
     endif()
 
     try_compile(COMPILE_AVX ${CMAKE_CURRENT_BINARY_DIR}

Examples/CMakeLists.txt

@@ -39,7 +39,7 @@ if(SCALFMM_USE_MPI)
 
 endif()
 #
-MESSAGE(WARNIG "GENERIC_SOURCE_FILES ${GENERIC_SOURCE_FILES}")
+#MESSAGE(WARNIG "GENERIC_SOURCE_FILES ${GENERIC_SOURCE_FILES}")
 #
 #
 #

Utils/scripts/cmpOpenMPAlgo.slurm

@@ -4,27 +4,44 @@
 #SBATCH -m a
 #
 #SBATCH -p court
-#SBATCH --time=2:00:00
+#SBATCH --time=20:00
 #SBATCH --nodes=1
 #SBATCH --ntasks-per-node=24
 #
+
+if test $# -eq 1
+then
+     echo "Good number of parameter"
+else
+    echo "Wrong number of parameter "
+    echo  "The script needs 1 arguments coreponding to"
+    echo  "  Arg1 the type of the interpolation method (0 Cheb, 1 Uniform)"
+    exit
+fi
 data_dir=/projets/scalfmm/data/openmpImprovements ;
-project_dir=$HOME/Dev/src/ScalFMM/scalfmm ;
+#project_dir=$HOME/Dev/src/ScalFMM/scalfmm ;
 
 #
 # PlaFRIM environment
 #
 source $HOME/Config/bashrc.bash
+w
+#
+if test $1 -eq 0
+then
+  EXEC="Utils/Release/ChebyshevInterpolationCmpAlgo"
+  Interp="Cheb"
+else
+  EXEC="Utils/Release/UniformInterpolationCmpAlgo"
+  Interp="Unif"
+fi
+FILEPERF=RES-${Interp}-openmp
 
-#
-EXEC="Utils/Release/ChebyshevInterpolationCmpAlgo"
-FILEPERF="RES-Cheb-openmp"
 OPTION="-show-info -show-compile"
 #
 DATE=`date +%y-%m-%d-%H%M`
 echo $DATE
 #
-cd $project_dir/BuildIntel2016
 #
 #   INTEL 2015
 #
@@ -33,17 +50,14 @@ cd $project_dir/BuildIntel2016
 #
 #   INTEL 2016
 #
-module add compiler/gcc/5.1.0 compiler/intel/64/2016_beta
-cd $project_dir/BuildIntel2016
-#
-#   GCC
+#module add compiler/gcc/5.1.0 compiler/intel/64/2016_beta
+#cd $project_dir/BuildIntel2016
 #
-#module add compiler/gcc/5.1.0 intel/mkl/64/11.2/2015.3.187  
-#cd $project_dir/BuildGCC51
+#   GCC  + MKL
 #
-# For eztrace
+module add compiler/gcc/7.2.0   intel/mkl/64/2018/update1
 #
-module add mpi/openmpi/gcc/1.8.4 trace/eztrace/1.0
+
 module li
 #
 #
@@ -53,11 +67,11 @@ HOST=`hostname`
 NBTEST=3  # 0..NBTEST
 DISTRIB=(unitcube unitsphere prolate plummer)
 DEPTH=(6           7           9            8)
-ALGO=(basic balanced task sectiontask)
+ALGO=(task newtask sectiontask)
 #
 pwd
-#export OMP_PROC_BIND=true
-export KMP_AFFINITY=scatter
+export OMP_PROC_BIND=true
+#export KMP_AFFINITY=scatter
 NUM=`git rev-list HEAD --count`
 echo   $DISTRIB
 mkdir  ${DATE}
@@ -65,12 +79,12 @@ for dist in `seq 0 $NBTEST`;
 do
     echo "Distribution:  " $dist ${DISTRIB[$dist]}   "  depth octree "  ${DEPTH[$dist]}
     FILE=${data_dir}/${DISTRIB[$dist]}-1M-ref.bfma
-    FILEGNU=${DISTRIB[$dist]}.txt
+    FILEGNU=${DISTRIB[$dist]}-${Interp}.txt
     mkdir   ${DATE}/${DISTRIB[$dist]} 
     touch  $FILEGNU
     #
     #    Loop on algorithm 
-    for a in `seq 0 3`;
+    for a in `seq 0 2`;
     do 
 echo  "# Core GlabalTIME P2PTIME M2LTIME  MALLOC   FREE MEMUse ENERGY PotentialError ForceError"> $FILEPERF-${DISTRIB[$dist]}-${ALGO[$a]}.out
 	#  One computation
@@ -81,22 +95,15 @@ echo  "# Core GlabalTIME P2PTIME M2LTIME  MALLOC   FREE MEMUse ENERGY PotentialE
 	    echo "Running  on " ${l} " threads with algo "   ${ALGO[$a]}
 	    $EXEC ${OPTION} -f $FILE  -depth  ${DEPTH[$dist]}  -subdepth 4  -t $l  -cmp  -algo ${ALGO[$a]}>>  $OUTPUT
 	    #
-	    eztrace_stats /tmp/coulaud_eztrace_log_rank_1 > TRACE
 	    TIME=`grep "@Algorithm"  $OUTPUT | awk '{print $4}'`
 	    TIMEP2P=`grep "P2P"  $OUTPUT | grep "second" | awk '{print $4}'`
 	    TIMEM2L=`grep "M2L"  $OUTPUT | grep "second" | awk '{print $2}'`
 	    Energy=`grep "Energy"  $OUTPUT | awk '{print $3}'`
 	    P1=`grep " Potential "  $OUTPUT | awk '{print $7}'`
 	    P2=`grep " F "  $OUTPUT | awk '{print $7}'`
-	    MALLOC=`grep Total  TRACE | grep malloc | awk '{print $2}'`
-	    FREE=`grep Total  TRACE | grep malloc | awk '{print $7}'`
-	    MEM=`grep Total  TRACE | grep malloc | awk '{print $15}'`
-	    echo " " $l "   " $TIME "  " $TIMEP2P "  " $TIMEM2L "  " $MALLOC "  " $FREE "  " $MEM "  " $Energy "     " $P1  "  " $P2
-	    echo " " $l "   " $TIME "  " $TIMEP2P "  " $TIMEM2L "  " $MALLOC "  " $FREE "  " $MEM "  "$Energy "     " $P1  "  " $P2  >>  $FILEPERF-${DISTRIB[$dist]}-${ALGO[$a]}.out
+	    echo " " $l "   " $TIME "  " $TIMEP2P "  " $TIMEM2L "  " $Energy "     " $P1  "  " $P2
+	    echo " " $l "   " $TIME "  " $TIMEP2P "  " $TIMEM2L "  " $Energy "     " $P1  "  " $P2  >>  $FILEPERF-${DISTRIB[$dist]}-${ALGO[$a]}.out
 	    mv  $OUTPUT   ${DATE}/${DISTRIB[$dist]}
-	    mv /tmp/coulaud_eztrace_log_rank_1   ${DATE}/${DISTRIB[$dist]}/trace-${DISTRIB[$dist]}-${ALGO[$a]}-${l}
-
-	    rm TRACE
 	done
 	echo  ${DISTRIB[$dist]}/$FILEPERF-${DISTRIB[$dist]}-${ALGO[$a]}.out  >> $FILEGNU
 	mv $FILEPERF-${DISTRIB[$dist]}-${ALGO[$a]}.out  ${DATE}/${DISTRIB[$dist]}