hmat: fix installation of hmat addon (headers are copied in...

hmat: fix installation of hmat addon (headers are copied in includes/ScalFmm/HMat/Src/.../*.hpp or includes/ScalFmm/HMat/CClusteringLibrary/*.h); Still need to fix pb when including cluster.h.

Addons/HMat/CMakeLists.txt

@@ -51,11 +51,16 @@ if(SCALFMM_ADDON_HMAT)
         # Install lib
         install( TARGETS scalfmmhmat ARCHIVE DESTINATION lib )
 
-        # Install header
-        SET(my_include_dirs "Src")
+        # Install headers
+        SET(my_include_dirs "Src/Blocks" "Src/Clustering" "Src/Containers" "Src/Utils" "Src/Viewers" "CClusteringLibrary")
 
-        file( GLOB hpp_in_dir Src/*.hpp Src/*.hpp)
-        INSTALL( FILES ${hpp_in_dir} DESTINATION include/ScalFmm/HMat )
+        FOREACH(my_dir ${my_include_dirs})  
+            file(GLOB               
+                hpp_in_dir
+                ${my_dir}/*.hpp ${my_dir}/*.h
+            )
+            INSTALL( FILES ${hpp_in_dir} DESTINATION include/ScalFmm/HMat/${my_dir} )
+        ENDFOREACH()
 
         # Add C Clustering Library
         file( GLOB_RECURSE ccl_lib_files CClusteringLibrary/*.c )
@@ -64,6 +69,7 @@ if(SCALFMM_ADDON_HMAT)
         target_link_libraries( cclusteringlib scalfmm)
         install( TARGETS cclusteringlib ARCHIVE DESTINATION lib )
 
+        # Tests
         file( GLOB_RECURSE source_tests_files Tests/*.cpp )
         INCLUDE_DIRECTORIES( ${SCALFMM_BINARY_DIR}/Src )
 

Addons/HMat/Tests/testCCLKCluster.cpp

@@ -123,7 +123,7 @@ int main(int argc, char** argv){
                 GridClass bissection(nbElements, partitions.get(), nbPartitions);
 
                 char svgName[1024];
-                sprintf(svgName, "%s/%s-%s-P%d.svg", outputdir, distributionName.c_str(), "CCL_KMEDOIDS_DIST_MEAN", nbPartitions);
+                sprintf(svgName, "%s/%s-%s-P%d.svg", outputdir, distributionName.c_str(), "CCL_KMEDOIDS", nbPartitions);
                 FSvgRect output(svgName, nbElements);
                 std::cout << "\tSave svg to " << svgName << "\n";
 

Addons/HMat/Tests/testPartitionsMappingGemv.cpp

@@ -22,6 +22,7 @@
 
 #include "Utils/FParameters.hpp"
 #include "Utils/FParameterNames.hpp"
+#include "Utils/FTic.hpp"
 
 #include <memory>
 
@@ -43,6 +44,7 @@ int main(int argc, char** argv){
     std::cout << "Config : dim = " << dim << "\n";
     std::cout << "Config : nbPartitions = " << nbPartitions << "\n";
 
+    FTic time;
 
     typedef double FReal;
     typedef FMatDense<FReal> MatrixClass;