Skip to content

Commit

Permalink
Add something that kind of works
Browse files Browse the repository at this point in the history
  • Loading branch information
@skailasa
skailasa committed Jan 19, 2024
1 parent 2802cd4 commit 89dd08b
Show file tree
Hide file tree
Showing 7 changed files with 215 additions and 33 deletions.
26 changes: 15 additions & 11 deletions fmm/examples/single_node.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,16 @@ use itertools::Itertools;

use rlst_dense::traits::RawAccess;

use bempp_field::types::FftFieldTranslationKiFmm;
use bempp_field::types::{FftFieldTranslationKiFmm, SvdFieldTranslationKiFmm};
use bempp_fmm::{
charge::build_charge_dict,
types::{FmmDataUniform, KiFmmLinear},
};
use bempp_kernel::laplace_3d::Laplace3dKernel;
use bempp_traits::{fmm::FmmLoop, tree::Tree};
use bempp_traits::{
fmm::{FmmLoop, M2LSetup},
tree::Tree,
};
use bempp_tree::implementations::helpers::points_fixture;
use bempp_tree::types::single_node::SingleNodeTree;

Expand All @@ -25,27 +28,28 @@ fn main() {
let order = 6;
let alpha_inner = 1.05;
let alpha_outer = 2.95;
let depth = 4;
let depth = 5;

let tree = SingleNodeTree::new(points.data(), false, None, Some(depth), &global_idxs, true);

let kernel = Laplace3dKernel::default();
let m2l_data: FftFieldTranslationKiFmm<f32, Laplace3dKernel<f32>> =
FftFieldTranslationKiFmm::new(kernel.clone(), order, *tree.get_domain(), alpha_inner);
// let m2l_data = SvdFieldTranslationKiFmm::new(
// kernel.clone(),
// Some(80),
// order,
// *tree.get_domain(),
// alpha_inner,
// );
let m2l_data = SvdFieldTranslationKiFmm::new(
kernel.clone(),
Some(80),
order,
*tree.get_domain(),
alpha_inner,
);

let fmm = KiFmmLinear::new(order, alpha_inner, alpha_outer, kernel, tree, m2l_data);

// Form charge dict, matching charges with their associated global indices
let charge_dict = build_charge_dict(&global_idxs, &charges);

let datatree = FmmDataUniform::new(fmm, &charge_dict).unwrap();
let mut datatree = FmmDataUniform::new(fmm, &charge_dict).unwrap();
datatree.setup();

let s = Instant::now();
let times = datatree.run(true);
Expand Down
8 changes: 5 additions & 3 deletions fmm/examples/single_node_matrix.rs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use std::time::Instant;

use bempp_fmm::types::FmmDataUniformMatrix;
use bempp_traits::fmm::M2LSetup;
use itertools::Itertools;

use rlst_dense::traits::RawAccess;
Expand All @@ -23,8 +24,8 @@ fn main() {

// Test matrix input
let points = points_fixture::<f32>(npoints, None, None);
let ncharge_vecs = 3;
let depth = 4;
let ncharge_vecs = 8;
let depth = 5;

let mut charge_mat = vec![vec![0.0; npoints]; ncharge_vecs];
charge_mat
Expand Down Expand Up @@ -62,7 +63,8 @@ fn main() {
.collect();

// Associate data with the FMM
let datatree = FmmDataUniformMatrix::new(fmm, &charge_dicts).unwrap();
let mut datatree = FmmDataUniformMatrix::new(fmm, &charge_dicts).unwrap();
datatree.setup();

let s = Instant::now();
let times = datatree.run(true);
Expand Down
50 changes: 50 additions & 0 deletions fmm/src/field_translation/source_to_target/fft.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,34 @@ use crate::field_translation::hadamard::matmul8x8;

/// Field translations defined on uniformly refined trees.
pub mod uniform {
use bempp_traits::fmm::M2LSetup;

use super::*;

impl<T, U> M2LSetup
for FmmDataUniform<KiFmmLinear<SingleNodeTree<U>, T, FftFieldTranslationKiFmm<U, T>, U>, U>
where
T: Kernel<T = U>
+ ScaleInvariantKernel<T = U>
+ std::marker::Send
+ std::marker::Sync
+ Default,
U: Scalar<Real = U> + Float + Default + std::marker::Send + std::marker::Sync + Fft,
Complex<U>: Scalar,
Array<U, BaseArray<U, VectorContainer<U>, 2>, 2>: MatrixSvd<Item = U>,
{
fn setup(&mut self) -> &mut Self {
// let mut level_displacements = Vec::new();
// for level in 2..=self.fmm.tree().get_depth() {
// level_displacements.push(self.displacements(level));
// }

// self.level_displacements = level_displacements;
self.is_setup = true;
self
}
}

impl<T, U> FmmDataUniform<KiFmmLinear<SingleNodeTree<U>, T, FftFieldTranslationKiFmm<U, T>, U>, U>
where
T: Kernel<T = U>
Expand Down Expand Up @@ -373,9 +399,33 @@ pub mod uniform {

/// Field translations defined on adaptively refined
pub mod adaptive {
use bempp_traits::fmm::M2LSetup;
use rlst_dense::rlst_array_from_slice2;

use super::*;
impl<T, U> M2LSetup
for FmmDataAdaptive<KiFmmLinear<SingleNodeTree<U>, T, FftFieldTranslationKiFmm<U, T>, U>, U>
where
T: Kernel<T = U>
+ ScaleInvariantKernel<T = U>
+ std::marker::Send
+ std::marker::Sync
+ Default,
U: Scalar<Real = U> + Float + Default + std::marker::Send + std::marker::Sync + Fft,
Complex<U>: Scalar,
Array<U, BaseArray<U, VectorContainer<U>, 2>, 2>: MatrixSvd<Item = U>,
{
fn setup(&mut self) -> &mut Self {
// let mut level_displacements = Vec::new();
// for level in 2..=self.fmm.tree().get_depth() {
// level_displacements.push(self.displacements(level));
// }

// self.level_displacements = level_displacements;
self.is_setup = true;
self
}
}

impl<T, U> FmmDataAdaptive<KiFmmLinear<SingleNodeTree<U>, T, FftFieldTranslationKiFmm<U, T>, U>, U>
where
Expand Down
95 changes: 92 additions & 3 deletions fmm/src/field_translation/source_to_target/svd.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,40 @@ use rlst_dense::{

/// Field translations for uniformly refined trees that take matrix input for charges.
pub mod matrix {
use bempp_traits::fmm::M2LSetup;

use crate::types::{FmmDataUniformMatrix, KiFmmLinearMatrix};

use super::*;

impl<T, U> M2LSetup
for FmmDataUniformMatrix<
KiFmmLinearMatrix<SingleNodeTree<U>, T, SvdFieldTranslationKiFmm<U, T>, U>,
U,
>
where
T: Kernel<T = U>
+ ScaleInvariantKernel<T = U>
+ std::marker::Send
+ std::marker::Sync
+ Default,
U: Scalar<Real = U> + rlst_blis::interface::gemm::Gemm,
U: Float + Default,
U: std::marker::Send + std::marker::Sync + Default,
Array<U, BaseArray<U, VectorContainer<U>, 2>, 2>: MatrixSvd<Item = U>,
{
fn setup(&mut self) -> &mut Self {
let mut level_displacements = Vec::new();
for level in 2..=self.fmm.tree().get_depth() {
level_displacements.push(self.displacements(level));
}

self.level_displacements = level_displacements;
self.is_setup = true;
self
}
}

impl<T, U>
FmmDataUniformMatrix<
KiFmmLinearMatrix<SingleNodeTree<U>, T, SvdFieldTranslationKiFmm<U, T>, U>,
Expand Down Expand Up @@ -121,7 +151,8 @@ pub mod matrix {

let nsources = sources.len();

let all_displacements = self.displacements(level);
// let all_displacements = self.displacements(level);
let all_displacements = &self.level_displacements[(level - 2) as usize];

// Interpret multipoles as a matrix
let multipoles = rlst_array_from_slice2!(
Expand Down Expand Up @@ -276,8 +307,35 @@ pub mod matrix {
}

pub mod adaptive {
use bempp_traits::fmm::M2LSetup;

use super::*;

impl<T, U> M2LSetup
for FmmDataAdaptive<KiFmmLinear<SingleNodeTree<U>, T, SvdFieldTranslationKiFmm<U, T>, U>, U>
where
T: Kernel<T = U>
+ ScaleInvariantKernel<T = U>
+ std::marker::Send
+ std::marker::Sync
+ Default,
U: Scalar<Real = U> + rlst_blis::interface::gemm::Gemm,
U: Float + Default,
U: std::marker::Send + std::marker::Sync + Default,
Array<U, BaseArray<U, VectorContainer<U>, 2>, 2>: MatrixSvd<Item = U>,
{
fn setup(&mut self) -> &mut Self {
let mut level_displacements = Vec::new();
for level in 2..=self.fmm.tree().get_depth() {
level_displacements.push(self.displacements(level));
}

self.level_displacements = level_displacements;
self.is_setup = true;
self
}
}

impl<T, U> FmmDataAdaptive<KiFmmLinear<SingleNodeTree<U>, T, SvdFieldTranslationKiFmm<U, T>, U>, U>
where
T: Kernel<T = U>
Expand Down Expand Up @@ -452,7 +510,8 @@ pub mod adaptive {
};

let nsources = sources.len();
let all_displacements = self.displacements(level);
// let all_displacements = self.displacements(level);
let all_displacements = &self.level_displacements[(level - 2) as usize];

// Interpret multipoles as a matrix
let ncoeffs = self.fmm.m2l.ncoeffs(self.fmm.order);
Expand Down Expand Up @@ -576,8 +635,35 @@ pub mod adaptive {
}

pub mod uniform {
use bempp_traits::fmm::M2LSetup;

use super::*;

impl<T, U> M2LSetup
for FmmDataUniform<KiFmmLinear<SingleNodeTree<U>, T, SvdFieldTranslationKiFmm<U, T>, U>, U>
where
T: Kernel<T = U>
+ ScaleInvariantKernel<T = U>
+ std::marker::Send
+ std::marker::Sync
+ Default,
U: Scalar<Real = U> + rlst_blis::interface::gemm::Gemm,
U: Float + Default,
U: std::marker::Send + std::marker::Sync + Default,
Array<U, BaseArray<U, VectorContainer<U>, 2>, 2>: MatrixSvd<Item = U>,
{
fn setup(&mut self) -> &mut Self {
let mut level_displacements = Vec::new();
for level in 2..=self.fmm.tree().get_depth() {
level_displacements.push(self.displacements(level));
}

self.level_displacements = level_displacements;
self.is_setup = true;
self
}
}

impl<T, U> FmmDataUniform<KiFmmLinear<SingleNodeTree<U>, T, SvdFieldTranslationKiFmm<U, T>, U>, U>
where
T: Kernel<T = U>
Expand Down Expand Up @@ -622,6 +708,7 @@ pub mod uniform {

for (i, tv) in self.fmm.m2l.transfer_vectors.iter().enumerate() {
let mut all_displacements_lock = all_displacements[i].lock().unwrap();
// let mut all_displacements_lock = all_displacements[i];

if transfer_vectors_set.contains(&tv.hash) {
let target = &v_list[*transfer_vectors_map.get(&tv.hash).unwrap()];
Expand Down Expand Up @@ -660,7 +747,9 @@ pub mod uniform {

let nsources = sources.len();

let all_displacements = self.displacements(level);
// let all_displacements = self.displacements(level);
let all_displacements = &self.level_displacements[(level - 2) as usize];
// let all_displacements = all_displacements.into_iter().map(Mutex::new).collect_vec();

// Interpret multipoles as a matrix
let ncoeffs = self.fmm.m2l.ncoeffs(self.fmm.order);
Expand Down
46 changes: 30 additions & 16 deletions fmm/src/fmm.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -549,12 +549,17 @@ where
}

Check warning on line 549 in fmm/src/fmm.rs

View workflow job for this annotation

GitHub Actions / Rust style checks 

Diff in /home/runner/work/bempp-rs/bempp-rs/fmm/src/fmm.rs

fn run(&self, time: bool) -> Option<TimeDict> {
let t1 = self.upward_pass(time);
let t2 = self.downward_pass(time);

if let (Some(mut t1), Some(t2)) = (t1, t2) {
t1.extend(t2);
Some(t1)
if self.is_setup {
let t1 = self.upward_pass(time);
let t2 = self.downward_pass(time);

if let (Some(mut t1), Some(t2)) = (t1, t2) {
t1.extend(t2);
Some(t1)
} else {
None
}
} else {
None
}
Expand Down Expand Up @@ -654,12 +659,17 @@ where
}

Check warning on line 659 in fmm/src/fmm.rs

View workflow job for this annotation

GitHub Actions / Rust style checks 

Diff in /home/runner/work/bempp-rs/bempp-rs/fmm/src/fmm.rs

fn run(&self, time: bool) -> Option<TimeDict> {
let t1 = self.upward_pass(time);
let t2 = self.downward_pass(time);

if let (Some(mut t1), Some(t2)) = (t1, t2) {
t1.extend(t2);
Some(t1)
if self.is_setup {
let t1 = self.upward_pass(time);
let t2 = self.downward_pass(time);

if let (Some(mut t1), Some(t2)) = (t1, t2) {
t1.extend(t2);
Some(t1)
} else {
None
}
} else {
None
}
Expand Down Expand Up @@ -759,12 +769,16 @@ where
}

fn run(&self, time: bool) -> Option<TimeDict> {
let t1 = self.upward_pass(time);
let t2 = self.downward_pass(time);

if let (Some(mut t1), Some(t2)) = (t1, t2) {
t1.extend(t2);
Some(t1)
if self.is_setup {
let t1 = self.upward_pass(time);
let t2 = self.downward_pass(time);

if let (Some(mut t1), Some(t2)) = (t1, t2) {
t1.extend(t2);
Some(t1)
} else {
None
}
} else {
None
}
Expand Down
Loading

0 comments on commit 89dd08b

Please sign in to comment.