Skip to content

Commit

Permalink
#111: add test for lbaf data sets using seq_id and collection_id
Browse files Browse the repository at this point in the history
  • Loading branch information
tlamonthezie authored and maxime-bfsquall committed Sep 24, 2024
1 parent 2c899b8 commit 7c7fbd9
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 10 deletions.
19 changes: 19 additions & 0 deletions config/conf -111-lbaf-data.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
input:
directory: data/111-lbaf-data
n_ranks: 4

viz:
x_ranks: 2
y_ranks: 2
z_ranks: 1
object_jitter: 0.5
rank_qoi: load
object_qoi: load
save_meshes: true
save_pngs: true
force_continuous_object_qoi: true

output:
directory: output
file_stem: lb_test
window_size: 2000
1 change: 1 addition & 0 deletions data/111-lbaf-data/data.0.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"metadata":{"type":"LBDatafile","rank":0},"phases":[{"id":0,"tasks":[]}]}
1 change: 1 addition & 0 deletions data/111-lbaf-data/data.1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"metadata":{"type":"LBDatafile","rank":1},"phases":[{"id":0,"tasks":[]}]}
1 change: 1 addition & 0 deletions data/111-lbaf-data/data.2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"metadata":{"type":"LBDatafile","rank":2},"phases":[{"id":0,"tasks":[]}]}
1 change: 1 addition & 0 deletions data/111-lbaf-data/data.3.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"metadata":{"type":"LBDatafile","rank":3},"phases":[{"id":0,"tasks":[{"entity":{"collection_id":7,"home":3,"migratable":true,"seq_id":0,"type":"object"},"node":3,"resource":"cpu","time":1.0},{"entity":{"collection_id":7,"home":3,"migratable":true,"seq_id":1,"type":"object"},"node":3,"resource":"cpu","time":0.5},{"entity":{"collection_id":7,"home":3,"migratable":true,"seq_id":2,"type":"object"},"node":3,"resource":"cpu","time":0.5},{"entity":{"collection_id":7,"home":3,"migratable":true,"seq_id":3,"type":"object"},"node":3,"resource":"cpu","time":0.5},{"entity":{"collection_id":7,"home":3,"migratable":true,"seq_id":4,"type":"object"},"node":3,"resource":"cpu","time":0.5},{"entity":{"collection_id":7,"home":3,"migratable":true,"seq_id":5,"type":"object"},"node":3,"resource":"cpu","time":2.0},{"entity":{"collection_id":7,"home":3,"migratable":true,"seq_id":6,"type":"object"},"node":3,"resource":"cpu","time":1.0},{"entity":{"collection_id":7,"home":3,"migratable":true,"seq_id":7,"type":"object"},"node":3,"resource":"cpu","time":0.5},{"entity":{"collection_id":7,"home":3,"migratable":true,"seq_id":8,"type":"object"},"node":3,"resource":"cpu","time":1.5}],"communications":[{"bytes":1.5,"from":{"collection_id":7,"home":3,"migratable":true,"seq_id":8,"type":"object"},"messages":1,"type":"SendRecv","to":{"collection_id":7,"home":3,"migratable":true,"seq_id":6,"type":"object"}}]}]}
20 changes: 10 additions & 10 deletions src/vt-tv/utility/json_reader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -131,15 +131,15 @@ std::unique_ptr<Info> JSONReader::parse() {
auto node = task["node"];
auto time = task["time"];
auto etype = task["entity"]["type"];
assert(time.is_number());
assert(node.is_number());
assert(time.is_number() && "task time must be a number");
assert(node.is_number() && "task node must be a number");

if (etype == "object") {
auto object = task["entity"]["id"];
auto object = task["entity"].value("id", task["entity"]["seq_id"]);
auto home = task["entity"]["home"];
bool migratable = task["entity"]["migratable"];
assert(object.is_number());
assert(home.is_number());
assert(object.is_number() && "task id or seq_id must be provided and be a number");
assert(home.is_number() && "task home must be a number");

std::vector<UniqueIndexBitType> index_arr;

Expand Down Expand Up @@ -177,8 +177,8 @@ std::unique_ptr<Info> JSONReader::parse() {
auto sid = s["id"];
auto stime = s["time"];

assert(sid.is_number());
assert(stime.is_number());
assert(sid.is_number() && "sid must be a number");
assert(stime.is_number() && "stime must be a number");

subphase_loads[sid] = stime;
}
Expand Down Expand Up @@ -230,10 +230,10 @@ std::unique_ptr<Info> JSONReader::parse() {
auto from = comm["from"];
auto to = comm["to"];

ElementIDType from_id = from["id"];
ElementIDType to_id = to["id"];
ElementIDType from_id = from.value("id", from["seq_id"]);
ElementIDType to_id = to.value("id", to["seq_id"]);

assert(bytes.is_number());
assert(bytes.is_number() && "bytes must be a number");
// assert(from.is_number());
// assert(to.is_number());

Expand Down

0 comments on commit 7c7fbd9

Please sign in to comment.