#2201: update test cases; restore shared_id key to json data files; add option for SwapClusters without memory constraints

Author: cwschilly

src/vt/vrt/collection/balance/temperedlb/temperedlb.cc

@@ -492,7 +492,7 @@ void TemperedLB::inputParams(balance::ConfigEntry* config) {
       terse, temperedlb,
       "TemperedLB::inputParams: using knowledge={}, fanout={}, rounds={}, "
       "iters={}, criterion={}, trials={}, deterministic={}, inform={}, "
-      "ordering={}, cmf={}, rollback={}, targetpole={}\n",
+      "transfer={}, ordering={}, cmf={}, rollback={}, targetpole={}\n",
       knowledge_converter_.getString(knowledge_), f_, k_max_, num_iters_,
       criterion_converter_.getString(criterion_), num_trials_, deterministic_,
       inform_type_converter_.getString(inform_type_),

tests/data/synthetic-blocks/synthetic-dataset-blocks.0.json

@@ -1 +1 @@
-{"metadata":{"type":"LBDatafile","rank":0},"phases":[{"id":0,"tasks":[{"entity":{"home":0,"id":1,"migratable":true,"type":"object"},"node":0,"resource":"cpu","time":0.5,"user_defined":{"shared_block_id":0,"shared_bytes":9.0,"home_rank":0}},{"entity":{"home":0,"id":3,"migratable":true,"type":"object"},"node":0,"resource":"cpu","time":0.5,"user_defined":{"shared_block_id":1,"shared_bytes":9.0,"home_rank":0}},{"entity":{"home":0,"id":2,"migratable":true,"type":"object"},"node":0,"resource":"cpu","time":0.5,"user_defined":{"shared_block_id":1,"shared_bytes":9.0,"home_rank":0}},{"entity":{"home":0,"id":0,"migratable":true,"type":"object"},"node":0,"resource":"cpu","time":1.0,"user_defined":{"shared_block_id":0,"shared_bytes":9.0,"home_rank":0}}],"communications":[{"type":"SendRecv","to":{"type":"object","id":5},"messages":1,"from":{"type":"object","id":0},"bytes":2.0},{"type":"SendRecv","to":{"type":"object","id":4},"messages":1,"from":{"type":"object","id":1},"bytes":1.0},{"type":"SendRecv","to":{"type":"object","id":2},"messages":1,"from":{"type":"object","id":3},"bytes":1.0},{"type":"SendRecv","to":{"type":"object","id":8},"messages":1,"from":{"type":"object","id":3},"bytes":0.5}]}]}
+{"metadata":{"type":"LBDatafile","rank":0},"phases":[{"id":0,"tasks":[{"entity":{"home":0,"id":1,"migratable":true,"type":"object"},"node":0,"resource":"cpu","time":0.5,"user_defined":{"shared_id":0,"shared_bytes":9.0,"home_rank":0}},{"entity":{"home":0,"id":3,"migratable":true,"type":"object"},"node":0,"resource":"cpu","time":0.5,"user_defined":{"shared_id":1,"shared_bytes":9.0,"home_rank":0}},{"entity":{"home":0,"id":2,"migratable":true,"type":"object"},"node":0,"resource":"cpu","time":0.5,"user_defined":{"shared_id":1,"shared_bytes":9.0,"home_rank":0}},{"entity":{"home":0,"id":0,"migratable":true,"type":"object"},"node":0,"resource":"cpu","time":1.0,"user_defined":{"shared_id":0,"shared_bytes":9.0,"home_rank":0}}],"communications":[{"type":"SendRecv","to":{"type":"object","id":5},"messages":1,"from":{"type":"object","id":0},"bytes":2.0},{"type":"SendRecv","to":{"type":"object","id":4},"messages":1,"from":{"type":"object","id":1},"bytes":1.0},{"type":"SendRecv","to":{"type":"object","id":2},"messages":1,"from":{"type":"object","id":3},"bytes":1.0},{"type":"SendRecv","to":{"type":"object","id":8},"messages":1,"from":{"type":"object","id":3},"bytes":0.5}]}]}

tests/data/synthetic-blocks/synthetic-dataset-blocks.1.json

@@ -1 +1 @@
-{"metadata":{"type":"LBDatafile","rank":1},"phases":[{"id":0,"tasks":[{"entity":{"home":1,"id":5,"migratable":true,"type":"object"},"node":1,"resource":"cpu","time":2.0,"user_defined":{"shared_block_id":2,"shared_bytes":9.0,"home_rank":1}},{"entity":{"home":1,"id":4,"migratable":true,"type":"object"},"node":1,"resource":"cpu","time":0.5,"user_defined":{"shared_block_id":2,"shared_bytes":9.0,"home_rank":1}},{"entity":{"home":1,"id":7,"migratable":true,"type":"object"},"node":1,"resource":"cpu","time":0.5,"user_defined":{"shared_block_id":3,"shared_bytes":9.0,"home_rank":1}},{"entity":{"home":1,"id":6,"migratable":true,"type":"object"},"node":1,"resource":"cpu","time":1.0,"user_defined":{"shared_block_id":3,"shared_bytes":9.0,"home_rank":1}}],"communications":[{"type":"SendRecv","to":{"type":"object","id":1},"messages":1,"from":{"type":"object","id":4},"bytes":2.0},{"type":"SendRecv","to":{"type":"object","id":8},"messages":1,"from":{"type":"object","id":5},"bytes":2.0},{"type":"SendRecv","to":{"type":"object","id":6},"messages":1,"from":{"type":"object","id":7},"bytes":1.0}]}]}
+{"metadata":{"type":"LBDatafile","rank":1},"phases":[{"id":0,"tasks":[{"entity":{"home":1,"id":5,"migratable":true,"type":"object"},"node":1,"resource":"cpu","time":2.0,"user_defined":{"shared_id":2,"shared_bytes":9.0,"home_rank":1}},{"entity":{"home":1,"id":4,"migratable":true,"type":"object"},"node":1,"resource":"cpu","time":0.5,"user_defined":{"shared_id":2,"shared_bytes":9.0,"home_rank":1}},{"entity":{"home":1,"id":7,"migratable":true,"type":"object"},"node":1,"resource":"cpu","time":0.5,"user_defined":{"shared_id":3,"shared_bytes":9.0,"home_rank":1}},{"entity":{"home":1,"id":6,"migratable":true,"type":"object"},"node":1,"resource":"cpu","time":1.0,"user_defined":{"shared_id":3,"shared_bytes":9.0,"home_rank":1}}],"communications":[{"type":"SendRecv","to":{"type":"object","id":1},"messages":1,"from":{"type":"object","id":4},"bytes":2.0},{"type":"SendRecv","to":{"type":"object","id":8},"messages":1,"from":{"type":"object","id":5},"bytes":2.0},{"type":"SendRecv","to":{"type":"object","id":6},"messages":1,"from":{"type":"object","id":7},"bytes":1.0}]}]}

tests/data/synthetic-blocks/synthetic-dataset-blocks.2.json

@@ -1 +1 @@
-{"metadata":{"type":"LBDatafile","rank":2},"phases":[{"id":0,"tasks":[{"entity":{"home":2,"id":8,"migratable":true,"type":"object"},"node":2,"resource":"cpu","time":1.5,"user_defined":{"shared_block_id":4,"shared_bytes":9.0,"home_rank":2}}],"communications":[{"type":"SendRecv","to":{"type":"object","id":6},"messages":1,"from":{"type":"object","id":8},"bytes":1.5}]}]}
+{"metadata":{"type":"LBDatafile","rank":2},"phases":[{"id":0,"tasks":[{"entity":{"home":2,"id":8,"migratable":true,"type":"object"},"node":2,"resource":"cpu","time":1.5,"user_defined":{"shared_id":4,"shared_bytes":9.0,"home_rank":2}}],"communications":[{"type":"SendRecv","to":{"type":"object","id":6},"messages":1,"from":{"type":"object","id":8},"bytes":1.5}]}]}

tests/unit/lb/test_temperedlb.cc

@@ -26,11 +26,13 @@ std::string writeTemperedLBConfig(std::string transfer_strategy,
                      " beta=" << beta <<
                      " gamma=" << gamma <<
                      " delta=" << delta;
-        if (mem_constraints) {
-            cfg_file_ << " memory_threshold=20.0";
-        }
         if (transfer_strategy == "SwapClusters") {
             cfg_file_ << " rollback=false";
+            if (mem_constraints) {
+                cfg_file_ << " memory_threshold=20.0";
+            } else {
+                cfg_file_ << " memory_threshold=1e8";
+            }
         }
         cfg_file_.close();
     }
@@ -64,7 +66,7 @@ void runTemperedLBTest(std::string config_file, double expected_imb = 0.0) {
 
 TEST_F(TestTemperedLB, test_load_only) {
     SET_NUM_NODES_CONSTRAINT(4);
-    auto cfg = writeTemperedLBConfig("Original", false);
+    auto cfg = writeTemperedLBConfig("SwapClusters", false);
     runTemperedLBTest(cfg);
 }
 
@@ -74,15 +76,27 @@ TEST_F(TestTemperedLB, test_load_and_memory_swapclusters) {
     runTemperedLBTest(cfg);
 }
 
+TEST_F(TestTemperedLB, test_load_no_memory_delta_10) {
+    SET_NUM_NODES_CONSTRAINT(4);
+    auto cfg = writeTemperedLBConfig("SwapClusters", false, 1.0);
+    runTemperedLBTest(cfg);
+}
+
+TEST_F(TestTemperedLB, test_load_no_memory_delta_01) {
+    SET_NUM_NODES_CONSTRAINT(4);
+    auto cfg = writeTemperedLBConfig("SwapClusters", false, 0.1);
+    runTemperedLBTest(cfg);
+}
+
 TEST_F(TestTemperedLB, test_load_memory_homing_swapclusters) {
     SET_NUM_NODES_CONSTRAINT(4);
-    auto cfg = writeTemperedLBConfig("SwapClusters", true, 1.0);
+    auto cfg = writeTemperedLBConfig("SwapClusters", true, 0.1);
     runTemperedLBTest(cfg);
 }
 
 TEST_F(TestTemperedLB, test_load_memory_homing_comms) {
     SET_NUM_NODES_CONSTRAINT(4);
-    auto cfg = writeTemperedLBConfig("SwapClusters", true, 1.0, 1.0);
+    auto cfg = writeTemperedLBConfig("SwapClusters", true, 0.1, 1.0);
     double expected_imbalance = 0.0; // placeholder for value from MILP
     runTemperedLBTest(cfg, expected_imbalance);
 }