expand cluster_builder and hmatrix interface.

Author: PierreMarchand20

src/htool/clustering/cluster_builder.hpp

@@ -19,15 +19,55 @@ void declare_cluster_builder(py::module &m, const std::string &className) {
     py::class_<Class> py_class(m, className.c_str());
 
     py_class.def(py::init<>());
-    py_class.def("create_cluster_tree", [](Class &self, py::array_t<CoordinatePrecision, py::array::f_style | py::array::forcecast> coordinates, int number_of_children, int size_of_partition) {
-        return self.create_cluster_tree(coordinates.shape()[1], coordinates.shape()[0], coordinates.data(), number_of_children, size_of_partition);
-    });
-    py_class.def("create_cluster_tree", [](Class &self, py::array_t<CoordinatePrecision, py::array::f_style | py::array::forcecast> coordinates, int number_of_children, int size_of_partition, py::array_t<int, py::array::f_style | py::array::forcecast> partition) {
-        if (partition.ndim() != 2 && partition.shape()[0] != 2) {
-            throw std::runtime_error("Wrong format for partition"); // LCOV_EXCL_LINE
-        }
-        return self.create_cluster_tree(coordinates.shape()[1], coordinates.shape()[0], coordinates.data(), number_of_children, size_of_partition, partition.data());
-    });
+    py_class.def(
+        "create_cluster_tree", [](Class &self, py::array_t<CoordinatePrecision, py::array::f_style | py::array::forcecast> coordinates, int number_of_children, int size_of_partition, py::array_t<int, py::array::f_style | py::array::forcecast> partition, py::array_t<CoordinatePrecision, py::array::f_style | py::array::forcecast> radii, py::array_t<CoordinatePrecision, py::array::f_style | py::array::forcecast> weigths) {
+            if (partition.ndim() != 2 && partition.shape()[0] != 2) {
+                throw std::runtime_error("Wrong format for partition"); // LCOV_EXCL_LINE
+            }
+            return self.create_cluster_tree(coordinates.shape()[1], coordinates.shape()[0], coordinates.data(), radii.data(), weigths.data(), number_of_children, size_of_partition, partition.data());
+        },
+        py::arg("coordinates"),
+        py::arg("number_of_children"),
+        py::arg("size_of_partition"),
+        py::kw_only(),
+        py::arg("partition"), // make them optional with C++17 and None
+        py::arg("radii"),     // make them optional with C++17 and None
+        py::arg("weights")    // make them optional with C++17 and None
+    );
+    py_class.def(
+        "create_cluster_tree", [](Class &self, py::array_t<CoordinatePrecision, py::array::f_style | py::array::forcecast> coordinates, int number_of_children, int size_of_partition, py::array_t<int, py::array::f_style | py::array::forcecast> partition, py::array_t<CoordinatePrecision, py::array::f_style | py::array::forcecast> radii) {
+            if (partition.ndim() != 2 && partition.shape()[0] != 2) {
+                throw std::runtime_error("Wrong format for partition"); // LCOV_EXCL_LINE
+            }
+            return self.create_cluster_tree(coordinates.shape()[1], coordinates.shape()[0], coordinates.data(), radii.data(), nullptr, number_of_children, size_of_partition, partition.data());
+        },
+        py::arg("coordinates"),
+        py::arg("number_of_children"),
+        py::arg("size_of_partition"),
+        py::kw_only(),
+        py::arg("partition"), // make them optional with C++17 and None
+        py::arg("radii")      // make them optional with C++17 and None
+    );
+    py_class.def(
+        "create_cluster_tree", [](Class &self, py::array_t<CoordinatePrecision, py::array::f_style | py::array::forcecast> coordinates, int number_of_children, int size_of_partition, py::array_t<int, py::array::f_style | py::array::forcecast> partition) {
+            if (partition.ndim() != 2 && partition.shape()[0] != 2) {
+                throw std::runtime_error("Wrong format for partition"); // LCOV_EXCL_LINE
+            }
+            return self.create_cluster_tree(coordinates.shape()[1], coordinates.shape()[0], coordinates.data(), number_of_children, size_of_partition, partition.data());
+        },
+        py::arg("coordinates"),
+        py::arg("number_of_children"),
+        py::arg("size_of_partition"),
+        py::kw_only(),
+        py::arg("partition"));
+
+    py_class.def(
+        "create_cluster_tree", [](Class &self, py::array_t<CoordinatePrecision, py::array::f_style | py::array::forcecast> coordinates, int number_of_children, int size_of_partition) {
+            return self.create_cluster_tree(coordinates.shape()[1], coordinates.shape()[0], coordinates.data(), number_of_children, size_of_partition);
+        },
+        py::arg("coordinates"),
+        py::arg("number_of_children"),
+        py::arg("size_of_partition"));
     py_class.def("set_minclustersize", &Class::set_minclustersize);
     py_class.def("set_direction_computation_strategy", &Class::set_direction_computation_strategy);
     py_class.def("set_splitting_strategy", &Class::set_splitting_strategy);

src/htool/hmatrix/hmatrix.hpp

@@ -45,6 +45,9 @@ void declare_HMatrix(py::module &m, const std::string &className) {
     py_class.def("get_tree_parameters", [](const HMatrix<CoefficientPrecision, CoordinatePrecision> &hmatrix) { return htool::get_tree_parameters(hmatrix); });
     py_class.def("get_local_information", [](const HMatrix<CoefficientPrecision, CoordinatePrecision> &hmatrix) { return htool::get_hmatrix_information(hmatrix); });
     py_class.def("get_distributed_information", [](const HMatrix<CoefficientPrecision, CoordinatePrecision> &hmatrix, MPI_Comm_wrapper comm) { return htool::get_distributed_hmatrix_information(hmatrix, comm); });
+    py_class.def("get_target_cluster",&HMatrix<CoefficientPrecision, CoordinatePrecision>::get_target_cluster,py::return_value_policy::reference_internal);
+    py_class.def("get_source_cluster",&HMatrix<CoefficientPrecision, CoordinatePrecision>::get_source_cluster,py::return_value_policy::reference_internal);
+
 
     m.def("recompression", &htool::recompression<CoefficientPrecision, CoordinatePrecision, std::function<void(LowRankMatrix<CoefficientPrecision> &)>>);
     m.def("recompression", [](HMatrix<CoefficientPrecision, CoordinatePrecision> &hmatrix) { recompression(hmatrix); });