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

Jump to bottom

Add varying rdim for DMD time windowing #282

Merged
merged 6 commits into from
Jun 24, 2024
Merged

Add varying rdim for DMD time windowing #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a92c1d1
Add window file option for specifying rdim or ef
ckendrick Feb 16, 2024
133faa1
Fix issue with reading indicator value file
ckendrick Feb 16, 2024
1f5aba8
Fix issue with duplicate indicator values
ckendrick Apr 24, 2024
5ce9d42
Add window rdim/ef file option to parametric_tw
ckendrick Apr 25, 2024
833e1d9
Refactor window rdim/ef in local_tw
ckendrick Apr 25, 2024
9fb3f7e
Check if file exists and verify rdim/ef values
ckendrick May 16, 2024
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
91 changes: 84 additions & 7 deletions examples/dmd/local_tw_csv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
#include "linalg/Matrix.h"
#include "utils/HDFDatabase.h"
#include "utils/CSVDatabase.h"
#include "utils/Utilities.h"
#include <cmath>
#include <iostream>
#include <limits>
Expand Down Expand Up @@ -100,6 +101,7 @@ int main(int argc, char *argv[])
const char *test_list = "dmd_test";
const char *temporal_idx_list = "temporal_idx";
const char *spatial_idx_list = "spatial_idx";
const char *window_file = "";
const char *hdf_name = "dmd.hdf";
const char *snap_pfx = "step";
const char *basename = "";
Expand Down Expand Up @@ -149,6 +151,9 @@ int main(int argc, char *argv[])
"Name of the file indicating bound of temporal indices.");
args.AddOption(&spatial_idx_list, "-x-idx", "--spatial-index",
"Name of the file indicating spatial indices.");
args.AddOption(&window_file, "-window-set", "--window-set-name",
"Name of the file containing a rdim/ef list for each window"
" within the list directory.");
args.AddOption(&snap_pfx, "-snap-pfx", "--snapshot-prefix",
"Prefix of snapshots.");
args.AddOption(&basename, "-o", "--outputfile-name",
Expand Down Expand Up @@ -248,12 +253,9 @@ int main(int argc, char *argv[])
vector<double> indicator_val;
if (!train || numWindows > 0)
{
int indicator_val_size = 0;
db->getInteger("indicator_val_size", indicator_val_size);
indicator_val.resize(indicator_val_size);
db->getDoubleArray(string(outputPath) + "/indicator_val.csv",
indicator_val.data(),
indicator_val_size);
csv_db.getDoubleVector(string(outputPath) + "/indicator_val.csv", indicator_val,
false);

if (indicator_val.size() > 0)
{
if (numWindows > 0)
Expand All @@ -272,6 +274,66 @@ int main(int argc, char *argv[])
}
}

// Load window RDIM/EF file if given
vector<string> window_str_list;
vector<double> window_list;
bool use_rdim_windows = false;
if (string(window_file).size() > 0)
{
const string window_file_path = string(list_dir) + "/" +
string(window_file) + ".csv";
if (!CAROM::Utilities::file_exist(window_file_path))
{
throw std::runtime_error(string("Specified window rdim/ef file, but file '" +
window_file_path + "' does not exist!"));
}
csv_db.getStringVector(window_file_path, window_str_list, false);

CAROM_VERIFY(window_str_list.size() > 0);

if (numWindows > 0)
{
CAROM_VERIFY(numWindows == window_str_list.size() - 1);
}

if (window_str_list[0] == "RDIM")
{
use_rdim_windows = true;
}

CAROM_VERIFY(window_str_list[0] == "RDIM" || window_str_list[0] == "EF");

for (int i = 1; i < window_str_list.size(); i++)
{
std::string tmp;
std::stringstream window_ss(window_str_list[i]);
getline(window_ss, tmp, ',');
getline(window_ss, tmp, ',');
double window_rdim_ef = stod(tmp);
if (use_rdim_windows)
{
CAROM_VERIFY(int(window_rdim_ef) > 0);
}
else
{
CAROM_VERIFY(window_rdim_ef > 0.0 && window_rdim_ef <= 1.0);
}
window_list.push_back(window_rdim_ef);
}

numWindows = window_list.size();

if (myid == 0)
{
std::cout << "Read window file with " << window_list.size() << " windows:\n";
for (int i = 0; i < window_list.size(); i++)
{
std::cout << " Window " << i << ": " << (use_rdim_windows ? "RDIM = " :
"EF = ") << window_list[i] << "\n";
}
}
}

int npar = 0;
int num_train_snap_orig, num_train_snap;
string training_par_dir;
Expand Down Expand Up @@ -337,6 +399,10 @@ int main(int argc, char *argv[])
CAROM_VERIFY(windowOverlapSamples < windowNumSamples);
numWindows = (windowNumSamples < infty) ? round((double) (num_train_snap-1) /
(double) windowNumSamples) : 1;
if (window_list.size() > 0)
{
CAROM_VERIFY(numWindows == window_list.size());
}
}

CAROM_VERIFY(numWindows > 0);
Expand Down Expand Up @@ -487,12 +553,23 @@ int main(int argc, char *argv[])

for (int window = 0; window < numWindows; ++window)
{
if (window_list.size() > 0)
{
if (use_rdim_windows) {
rdim = window_list[window];
dylan-copeland marked this conversation as resolved.
Show resolved Hide resolved
} else {
ef = window_list[window];
dylan-copeland marked this conversation as resolved.
Show resolved Hide resolved
}
}

if (rdim != -1)
{
if (myid == 0)
{
cout << "Creating DMD model #" << window << " with rdim: " << rdim << endl;
cout << "Creating DMD model #" << window << " with rdim: " << rdim <<
endl;
}
CAROM_VERIFY(rdim <= windowNumSamples);
dmd[window]->train(rdim);
}
else if (ef != -1)
Expand Down
74 changes: 74 additions & 0 deletions examples/dmd/parametric_tw_csv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
#include "linalg/Matrix.h"
#include "utils/HDFDatabase.h"
#include "utils/CSVDatabase.h"
#include "utils/Utilities.h"
#include <cmath>
#include <iostream>
#include <limits>
Expand Down Expand Up @@ -123,6 +124,7 @@ int main(int argc, char *argv[])
const char *test_list = "dmd_test";
const char *temporal_idx_list = "temporal_idx";
const char *spatial_idx_list = "spatial_idx";
const char *window_file = "";
const char *hdf_name = "dmd";
const char *snap_pfx = "step";
const char *basename = "";
Expand Down Expand Up @@ -199,6 +201,9 @@ int main(int argc, char *argv[])
"Use CSV or HDF format for input files.");
args.AddOption(&useWindowDims, "-wdim", "--wdim", "-no-wdim", "--no-wdim",
"Use DMD dimensions for each window, input from a CSV file.");
args.AddOption(&window_file, "-window-set", "--window-set-name",
"Name of the file containing a rdim/ef list for each window"
" within the list directory.");
args.AddOption(&subsample, "-subs", "--subsample",
"Subsampling factor for training snapshots.");
args.AddOption(&eval_subsample, "-esubs", "--eval_subsample",
Expand Down Expand Up @@ -494,6 +499,66 @@ int main(int argc, char *argv[])
}
}

// Load window RDIM/EF file if given
vector<string> window_str_list;
vector<double> window_list;
bool use_rdim_windows = false;
if (string(window_file).size() > 0)
{
const string window_file_path = string(list_dir) + "/" +
string(window_file) + ".csv";
if (!CAROM::Utilities::file_exist(window_file_path))
{
throw std::runtime_error(string("Specified window rdim/ef file, but file '" +
window_file_path + "' does not exist!"));
}
csv_db.getStringVector(window_file_path, window_str_list, false);

CAROM_VERIFY(window_str_list.size() > 0);

if (numWindows > 0)
{
CAROM_VERIFY(numWindows == window_str_list.size() - 1);
}

if (window_str_list[0] == "RDIM")
{
use_rdim_windows = true;
}

CAROM_VERIFY(window_str_list[0] == "RDIM" || window_str_list[0] == "EF");

for (int i = 1; i < window_str_list.size(); i++)
{
std::string tmp;
std::stringstream window_ss(window_str_list[i]);
getline(window_ss, tmp, ',');
getline(window_ss, tmp, ',');
double window_rdim_ef = stod(tmp);
if (use_rdim_windows)
{
CAROM_VERIFY(int(window_rdim_ef) > 0);
}
else
{
CAROM_VERIFY(window_rdim_ef > 0.0 && window_rdim_ef <= 1.0);
}
window_list.push_back(window_rdim_ef);
}

numWindows = window_list.size();

if (myid == 0)
{
std::cout << "Read window file with " << window_list.size() << " windows:\n";
for (int i = 0; i < window_list.size(); i++)
{
std::cout << " Window " << i << ": " << (use_rdim_windows ? "RDIM = " :
"EF = ") << window_list[i] << "\n";
}
}
}

vector<int> windowDim;
if (useWindowDims)
{
Expand Down Expand Up @@ -662,6 +727,15 @@ int main(int argc, char *argv[])
if (useWindowDims)
rdim = windowDim[window];

if (window_list.size() > 0)
{
if (use_rdim_windows) {
rdim = window_list[window];
} else {
ef = window_list[window];
}
}

if (rdim != -1)
{
if (myid == 0)
Expand Down
Loading