Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cache epsilon computations for MPB to improve MPI scaling #1257

Merged
merged 7 commits into from
Jun 26, 2020
Merged

cache epsilon computations for MPB to improve MPI scaling #1257

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c6aca70
cache epsilon computations for MPB to improve MPI scaling
stevengj Jun 19, 2020
158882a
whoops
stevengj Jun 19, 2020
6d4d772
tweak
stevengj Jun 19, 2020
ddb2337
fixes
stevengj Jun 20, 2020
85981c2
add missing sizeof
stevengj Jun 24, 2020
98ea4e4
tell MPB not to do its own subpixel averaging
stevengj Jun 24, 2020
32893d3
assert.h
stevengj Jun 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/mpb.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,15 @@ typedef struct {
bool use_cache; // whether we are using the cache
} meep_mpb_eps_data;

static void meep_mpb_eps(symmetric_matrix *eps, symmetric_matrix *eps_inv, const mpb_real r[3],
static int meep_mpb_eps(symmetric_matrix *eps, symmetric_matrix *eps_inv,
mpb_real n[3], mpb_real d1, mpb_real d2, mpb_real d3, mpb_real tol,
const mpb_real r[3],
void *eps_data_) {
meep_mpb_eps_data *eps_data = (meep_mpb_eps_data *)eps_data_;
size_t i = eps_data->icache;

(void) n; (void) d1; (void) d2; (void) d3; (void) tol; // unused

if (eps_data->use_cache) {
const double *cache = eps_data->cache;
eps_inv->m00 = cache[6*i];
Expand Down Expand Up @@ -93,6 +97,8 @@ static void meep_mpb_eps(symmetric_matrix *eps, symmetric_matrix *eps_inv, const
}

eps_data->icache += 1; // next call will use the subsequent cache element

return 1; // tells MPB not to do its own subpixel averaging
}

/**************************************************************/
Expand Down Expand Up @@ -410,7 +416,7 @@ void *fields::get_eigenmode(double frequency, direction d, const volume where, c
// first, build up a cache of the local epsilon data (while returning dummy values to MPB)
eps_data.use_cache = false;
eps_data.icache = 0;
set_maxwell_dielectric(mdata, mesh_size, R, G, meep_mpb_eps, NULL, &eps_data);
set_maxwell_dielectric(mdata, mesh_size, R, G, NULL, meep_mpb_eps, &eps_data);

// then, synchronize the data
eps_data.ncache = eps_data.icache; // actual amount of cached data
Expand All @@ -422,7 +428,8 @@ void *fields::get_eigenmode(double frequency, direction d, const volume where, c
// finally, send MPB the real epsilon data using the synchronized cache
eps_data.use_cache = true;
eps_data.icache = 0;
set_maxwell_dielectric(mdata, mesh_size, R, G, meep_mpb_eps, NULL, &eps_data);
set_maxwell_dielectric(mdata, mesh_size, R, G, NULL, meep_mpb_eps, &eps_data);
assert(eps_data.icache == eps_data.ncache);
stevengj marked this conversation as resolved.
Show resolved Hide resolved

free(eps_data.cache);

Expand Down