Skip to content

Commit

Permalink
add block tree consistency option
Browse files Browse the repository at this point in the history
  • Loading branch information
@PierreMarchand20
PierreMarchand20 committed Sep 20, 2024
1 parent 3086fde commit c337cc5
Show file tree
Hide file tree
Showing 7 changed files with 52 additions and 13 deletions.
4 changes: 4 additions & 0 deletions include/htool/hmatrix/hmatrix.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,10 +209,14 @@ class HMatrix : public TreeNode<HMatrix<CoefficientPrecision, CoordinatePrecisio
void set_admissibility_condition(std::shared_ptr<VirtualAdmissibilityCondition<CoordinatePrecision>> ptr) { this->m_tree_data->m_admissibility_condition = ptr; }
void set_minimal_target_depth(unsigned int minimal_target_depth) { this->m_tree_data->m_minimal_target_depth = minimal_target_depth; }
void set_minimal_source_depth(unsigned int minimal_source_depth) { this->m_tree_data->m_minimal_source_depth = minimal_source_depth; }
void set_block_tree_consistency(bool consistency) {
this->m_tree_data->m_is_block_tree_consistent = consistency;
}

// HMatrix Tree setters
char get_symmetry_for_leaves() const { return m_symmetry_type_for_leaves; }
char get_UPLO_for_leaves() const { return m_UPLO_for_leaves; }
bool is_block_tree_consistent() const { return this->m_tree_data->m_is_block_tree_consistent; }

// Data computation
void compute_dense_data(const VirtualGenerator<CoefficientPrecision> &generator) {
Expand Down
1 change: 1 addition & 0 deletions include/htool/hmatrix/hmatrix_tree_data.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ struct HMatrixTreeData {
unsigned int m_minimal_target_depth{0};
bool m_delay_dense_computation{false};
int m_reqrank{-1};
bool m_is_block_tree_consistent{true};

// Information
mutable std::map<std::string, std::string> m_information;
Expand Down
8 changes: 8 additions & 0 deletions include/htool/hmatrix/linalg/factorization.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ namespace htool {

template <typename CoefficientPrecision, typename CoordinatePrecision = underlying_type<CoefficientPrecision>>
void lu_factorization(HMatrix<CoefficientPrecision, CoordinatePrecision> &hmatrix) {
if (!hmatrix.is_block_tree_consistent()) {
htool::Logger::get_instance().log(LogLevel::ERROR, "lu_factorization is only implemented for consistent block tree."); // LCOV_EXCL_LINE
}

if (hmatrix.is_hierarchical()) {

bool block_tree_not_consistent = (hmatrix.get_target_cluster().get_rank() < 0 || hmatrix.get_source_cluster().get_rank() < 0);
Expand Down Expand Up @@ -83,6 +87,10 @@ void internal_lu_solve(char trans, const HMatrix<CoefficientPrecision, Coordinat

template <typename CoefficientPrecision, typename CoordinatePrecision = underlying_type<CoefficientPrecision>>
void cholesky_factorization(char UPLO, HMatrix<CoefficientPrecision, CoordinatePrecision> &hmatrix) {
if (!hmatrix.is_block_tree_consistent()) {
htool::Logger::get_instance().log(LogLevel::ERROR, "cholesky_factorization is only implemented for consistent block tree."); // LCOV_EXCL_LINE
}

if (hmatrix.is_hierarchical()) {

bool block_tree_not_consistent = (hmatrix.get_target_cluster().get_rank() < 0 || hmatrix.get_source_cluster().get_rank() < 0);
Expand Down
21 changes: 21 additions & 0 deletions include/htool/hmatrix/tree_builder/tree_builder.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ class HMatrixTreeBuilder {
std::shared_ptr<VirtualLowRankGenerator<CoefficientPrecision, CoordinatePrecision>> m_low_rank_generator;
std::shared_ptr<VirtualAdmissibilityCondition<CoordinatePrecision>> m_admissibility_condition;
std::shared_ptr<VirtualDenseBlocksGenerator<CoefficientPrecision>> m_dense_blocks_generator;
bool m_is_block_tree_consistent{true};

// Internal methods
void build_block_tree(HMatrixType *current_hmatrix) const;
Expand Down Expand Up @@ -162,6 +163,7 @@ class HMatrixTreeBuilder {
void set_minimal_source_depth(int minimal_source_depth) { m_minsourcedepth = minimal_source_depth; }
void set_minimal_target_depth(int minimal_target_depth) { m_mintargetdepth = minimal_target_depth; }
void set_dense_blocks_generator(std::shared_ptr<VirtualDenseBlocksGenerator<CoefficientPrecision>> dense_blocks_generator) { m_dense_blocks_generator = dense_blocks_generator; }
void set_block_tree_consistency(bool consistency) { m_is_block_tree_consistent = consistency; }

// Getters
char get_symmetry() const { return m_symmetry_type; }
Expand All @@ -180,6 +182,7 @@ HMatrix<CoefficientPrecision, CoordinatePrecision> HMatrixTreeBuilder<Coefficien
root_hmatrix.set_epsilon(m_epsilon);
root_hmatrix.set_minimal_target_depth(m_mintargetdepth);
root_hmatrix.set_minimal_source_depth(m_minsourcedepth);
root_hmatrix.set_block_tree_consistency(m_is_block_tree_consistent);

// Build hierarchical block structure
std::chrono::steady_clock::time_point start, end;
Expand Down Expand Up @@ -275,6 +278,24 @@ void HMatrixTreeBuilder<CoefficientPrecision, CoordinatePrecision>::build_block_
build_block_tree(hmatrix_child);
}
}
} else if (!m_is_block_tree_consistent && (source_cluster.get_size() > target_cluster.get_size())) {
HMatrixType *hmatrix_child = nullptr;
for (const auto &source_child : source_children) {
if ((is_target_cluster_in_target_partition(target_cluster) || target_cluster.get_rank() < 0) && !is_removed_by_symmetry(target_cluster, *source_child)) {
hmatrix_child = current_hmatrix->add_child(&target_cluster, source_child.get());
set_hmatrix_symmetry(*hmatrix_child);
build_block_tree(hmatrix_child);
}
}
} else if (!m_is_block_tree_consistent && (target_cluster.get_size() > source_cluster.get_size())) {
HMatrixType *hmatrix_child = nullptr;
for (const auto &target_child : target_children) {
if ((is_target_cluster_in_target_partition(*target_child) || target_child->get_rank() < 0) && !is_removed_by_symmetry(*target_child, source_cluster)) {
hmatrix_child = current_hmatrix->add_child(target_child.get(), &source_cluster);
set_hmatrix_symmetry(*hmatrix_child);
build_block_tree(hmatrix_child);
}
}
} else {
HMatrixType *hmatrix_child = nullptr;
for (const auto &target_child : target_children) {
Expand Down
14 changes: 8 additions & 6 deletions tests/functional_tests/hmatrix/hmatrix_build/test_hmatrix_build_complex_double.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,16 @@ int main(int argc, char *argv[]) {
for (auto use_local_cluster : {true, false}) {
for (auto epsilon : {1e-14, 1e-6}) {
for (auto use_dense_block_generator : {true, false}) {
std::cout << nr << " " << nc << " " << use_local_cluster << " " << epsilon << " " << use_dense_block_generator << "\n";
for (auto block_tree_consistency : {true, false}) {
std::cout << nr << " " << nc << " " << use_local_cluster << " " << epsilon << " " << use_dense_block_generator << " " << block_tree_consistency << "\n";

is_error = is_error || test_hmatrix_build<std::complex<double>, GeneratorTestComplexSymmetric>(nr, nc, use_local_cluster, 'N', 'N', epsilon, use_dense_block_generator);
if (nr == nc) {
for (auto UPLO : {'U', 'L'}) {
is_error = is_error || test_hmatrix_build<std::complex<double>, GeneratorTestComplexSymmetric>(nr, nr, use_local_cluster, 'S', UPLO, epsilon, use_dense_block_generator);
is_error = is_error || test_hmatrix_build<std::complex<double>, GeneratorTestComplexSymmetric>(nr, nc, use_local_cluster, 'N', 'N', epsilon, use_dense_block_generator, block_tree_consistency);
if (nr == nc) {
for (auto UPLO : {'U', 'L'}) {
is_error = is_error || test_hmatrix_build<std::complex<double>, GeneratorTestComplexSymmetric>(nr, nr, use_local_cluster, 'S', UPLO, epsilon, use_dense_block_generator, block_tree_consistency);

is_error = is_error || test_hmatrix_build<std::complex<double>, GeneratorTestComplexHermitian>(nr, nr, use_local_cluster, 'H', UPLO, epsilon, use_dense_block_generator);
is_error = is_error || test_hmatrix_build<std::complex<double>, GeneratorTestComplexHermitian>(nr, nr, use_local_cluster, 'H', UPLO, epsilon, use_dense_block_generator, block_tree_consistency);
}
}
}
}
Expand Down
14 changes: 8 additions & 6 deletions tests/functional_tests/hmatrix/hmatrix_build/test_hmatrix_build_double.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,16 @@ int main(int argc, char *argv[]) {
for (auto use_local_cluster : {true, false}) {
for (auto epsilon : {1e-14, 1e-6}) {
for (auto use_dense_block_generator : {true, false}) {
std::cout << nr << " " << nc << " " << use_local_cluster << " " << epsilon << " " << use_dense_block_generator << "\n";
for (auto block_tree_consistency : {true, false}) {
std::cout << nr << " " << nc << " " << use_local_cluster << " " << epsilon << " " << use_dense_block_generator << " " << block_tree_consistency << "\n";

is_error = is_error || test_hmatrix_build<double, GeneratorTestDoubleSymmetric>(nr, nc, use_local_cluster, 'N', 'N', epsilon, use_dense_block_generator);
is_error = is_error || test_hmatrix_build<double, GeneratorTestDoubleSymmetric>(nr, nc, use_local_cluster, 'N', 'N', epsilon, use_dense_block_generator, block_tree_consistency);

if (nr == nc) {
for (auto UPLO : {'U', 'L'}) {
std::cout << UPLO << "\n";
is_error = is_error || test_hmatrix_build<double, GeneratorTestDoubleSymmetric>(nr, nc, use_local_cluster, 'S', UPLO, epsilon, use_dense_block_generator);
if (nr == nc) {
for (auto UPLO : {'U', 'L'}) {
std::cout << UPLO << "\n";
is_error = is_error || test_hmatrix_build<double, GeneratorTestDoubleSymmetric>(nr, nc, use_local_cluster, 'S', UPLO, epsilon, use_dense_block_generator, block_tree_consistency);
}
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion tests/functional_tests/hmatrix/test_hmatrix_build.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ using namespace std;
using namespace htool;

template <typename T, typename GeneratorTestTypeInUserNumbering>
bool test_hmatrix_build(int nr, int nc, bool use_local_cluster, char Symmetry, char UPLO, htool::underlying_type<T> epsilon, bool use_dense_blocks_generator) {
bool test_hmatrix_build(int nr, int nc, bool use_local_cluster, char Symmetry, char UPLO, htool::underlying_type<T> epsilon, bool use_dense_blocks_generator, bool block_tree_consistency) {

// Get the number of processes
int sizeWorld;
Expand Down Expand Up @@ -87,6 +87,7 @@ bool test_hmatrix_build(int nr, int nc, bool use_local_cluster, char Symmetry, c
} else {
hmatrix_tree_builder = std::make_unique<HMatrixTreeBuilder<T, htool::underlying_type<T>>>(*target_root_cluster, *source_root_cluster, epsilon, eta, Symmetry, UPLO, -1, rankWorld, rankWorld);
}
hmatrix_tree_builder->set_block_tree_consistency(block_tree_consistency);

std::shared_ptr<VirtualDenseBlocksGenerator<T>> dense_blocks_generator;
if (use_dense_blocks_generator) {
Expand Down

0 comments on commit c337cc5

Please sign in to comment.