Skip to content

Commit e32092e

Browse files
committed
#111: add test for lbaf data sets using seq_id and collection_id
1 parent eb5046c commit e32092e

File tree

6 files changed

+33
-10
lines changed

6 files changed

+33
-10
lines changed

config/conf -111-lbaf-data.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
input:
2+
directory: data/111-lbaf-data
3+
n_ranks: 4
4+
5+
viz:
6+
x_ranks: 2
7+
y_ranks: 2
8+
z_ranks: 1
9+
object_jitter: 0.5
10+
rank_qoi: load
11+
object_qoi: load
12+
save_meshes: true
13+
save_pngs: true
14+
force_continuous_object_qoi: true
15+
16+
output:
17+
directory: output
18+
file_stem: lb_test
19+
window_size: 2000

data/111-lbaf-data/data.0.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"metadata":{"type":"LBDatafile","rank":0},"phases":[{"id":0,"tasks":[]}]}

data/111-lbaf-data/data.1.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"metadata":{"type":"LBDatafile","rank":1},"phases":[{"id":0,"tasks":[]}]}

data/111-lbaf-data/data.2.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"metadata":{"type":"LBDatafile","rank":2},"phases":[{"id":0,"tasks":[]}]}

data/111-lbaf-data/data.3.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
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"}}]}]}

src/vt-tv/utility/json_reader.cc

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -128,15 +128,15 @@ std::unique_ptr<Info> JSONReader::parse() {
128128
auto node = task["node"];
129129
auto time = task["time"];
130130
auto etype = task["entity"]["type"];
131-
assert(time.is_number());
132-
assert(node.is_number());
131+
assert(time.is_number() && "task time must be a number");
132+
assert(node.is_number() && "task node must be a number");
133133

134134
if (etype == "object") {
135-
auto object = task["entity"]["id"];
135+
auto object = task["entity"].value("id", task["entity"]["seq_id"]);
136136
auto home = task["entity"]["home"];
137137
bool migratable = task["entity"]["migratable"];
138-
assert(object.is_number());
139-
assert(home.is_number());
138+
assert(object.is_number() && "task id or seq_id must be provided and be a number");
139+
assert(home.is_number() && "task home must be a number");
140140

141141
std::vector<UniqueIndexBitType> index_arr;
142142

@@ -174,8 +174,8 @@ std::unique_ptr<Info> JSONReader::parse() {
174174
auto sid = s["id"];
175175
auto stime = s["time"];
176176

177-
assert(sid.is_number());
178-
assert(stime.is_number());
177+
assert(sid.is_number() && "sid must be a number");
178+
assert(stime.is_number() && "stime must be a number");
179179

180180
subphase_loads[sid] = stime;
181181
}
@@ -227,10 +227,10 @@ std::unique_ptr<Info> JSONReader::parse() {
227227
auto from = comm["from"];
228228
auto to = comm["to"];
229229

230-
ElementIDType from_id = from["id"];
231-
ElementIDType to_id = to["id"];
230+
ElementIDType from_id = from.value("id", from["seq_id"]);
231+
ElementIDType to_id = to.value("id", to["seq_id"]);
232232

233-
assert(bytes.is_number());
233+
assert(bytes.is_number() && "bytes must be a number");
234234
// assert(from.is_number());
235235
// assert(to.is_number());
236236

0 commit comments

Comments
 (0)