Commit 9b314095 authored by BLANCHARD Pierre's avatar BLANCHARD Pierre

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.
parent c75d6652
...@@ -51,11 +51,16 @@ if(SCALFMM_ADDON_HMAT) ...@@ -51,11 +51,16 @@ if(SCALFMM_ADDON_HMAT)
# Install lib # Install lib
install( TARGETS scalfmmhmat ARCHIVE DESTINATION lib ) install( TARGETS scalfmmhmat ARCHIVE DESTINATION lib )
# Install header # Install headers
SET(my_include_dirs "Src") SET(my_include_dirs "Src/Blocks" "Src/Clustering" "Src/Containers" "Src/Utils" "Src/Viewers" "CClusteringLibrary")
file( GLOB hpp_in_dir Src/*.hpp Src/*.hpp) FOREACH(my_dir ${my_include_dirs})
INSTALL( FILES ${hpp_in_dir} DESTINATION include/ScalFmm/HMat ) 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 # Add C Clustering Library
file( GLOB_RECURSE ccl_lib_files CClusteringLibrary/*.c ) file( GLOB_RECURSE ccl_lib_files CClusteringLibrary/*.c )
...@@ -64,6 +69,7 @@ if(SCALFMM_ADDON_HMAT) ...@@ -64,6 +69,7 @@ if(SCALFMM_ADDON_HMAT)
target_link_libraries( cclusteringlib scalfmm) target_link_libraries( cclusteringlib scalfmm)
install( TARGETS cclusteringlib ARCHIVE DESTINATION lib ) install( TARGETS cclusteringlib ARCHIVE DESTINATION lib )
# Tests
file( GLOB_RECURSE source_tests_files Tests/*.cpp ) file( GLOB_RECURSE source_tests_files Tests/*.cpp )
INCLUDE_DIRECTORIES( ${SCALFMM_BINARY_DIR}/Src ) INCLUDE_DIRECTORIES( ${SCALFMM_BINARY_DIR}/Src )
......
...@@ -123,7 +123,7 @@ int main(int argc, char** argv){ ...@@ -123,7 +123,7 @@ int main(int argc, char** argv){
GridClass bissection(nbElements, partitions.get(), nbPartitions); GridClass bissection(nbElements, partitions.get(), nbPartitions);
char svgName[1024]; 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); FSvgRect output(svgName, nbElements);
std::cout << "\tSave svg to " << svgName << "\n"; std::cout << "\tSave svg to " << svgName << "\n";
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include "Utils/FParameters.hpp" #include "Utils/FParameters.hpp"
#include "Utils/FParameterNames.hpp" #include "Utils/FParameterNames.hpp"
#include "Utils/FTic.hpp"
#include <memory> #include <memory>
...@@ -43,6 +44,7 @@ int main(int argc, char** argv){ ...@@ -43,6 +44,7 @@ int main(int argc, char** argv){
std::cout << "Config : dim = " << dim << "\n"; std::cout << "Config : dim = " << dim << "\n";
std::cout << "Config : nbPartitions = " << nbPartitions << "\n"; std::cout << "Config : nbPartitions = " << nbPartitions << "\n";
FTic time;
typedef double FReal; typedef double FReal;
typedef FMatDense<FReal> MatrixClass; typedef FMatDense<FReal> MatrixClass;
......
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