From b2d3bff7671aec473031d68e5305a0ef887f7990 Mon Sep 17 00:00:00 2001 From: Jeremy Johnson Date: Mon, 26 Feb 2024 16:08:07 +0000 Subject: Minor fix ups in verify lib Improve internal config naming and remove old config info. Make sure all configs are properly initialized. Signed-off-by: Jeremy Johnson Change-Id: I674e23eddc9694237ea4e66a689481c13965eb90 --- reference_model/src/verify/verify_utils.cc | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'reference_model/src/verify/verify_utils.cc') diff --git a/reference_model/src/verify/verify_utils.cc b/reference_model/src/verify/verify_utils.cc index 57cb50a..d598e2c 100644 --- a/reference_model/src/verify/verify_utils.cc +++ b/reference_model/src/verify/verify_utils.cc @@ -65,13 +65,13 @@ void from_json(const nlohmann::json& j, UlpVerifyInfo& ulpInfo) void from_json(const nlohmann::json& j, DotProductVerifyInfo& dotProductInfo) { - j.at("s").get_to(dotProductInfo.s); - j.at("ks").get_to(dotProductInfo.ks); + j.at("s").get_to(dotProductInfo.setNumber); + j.at("ks").get_to(dotProductInfo.kernelSize); } void from_json(const nlohmann::json& j, ReduceProductVerifyInfo& reduceProduceInfo) { - j.at("n").get_to(reduceProduceInfo.n); + j.at("n").get_to(reduceProduceInfo.numberOfProducts); } void from_json(const nlohmann::json& j, AbsErrorVerifyInfo& absErrorInfo) @@ -92,24 +92,29 @@ void from_json(const nlohmann::json& j, VerifyConfig& cfg) { j.at("mode").get_to(cfg.mode); j.at("data_type").get_to(cfg.dataType); + cfg.ulpInfo.ulp = 0; if (j.contains("ulp_info")) { j.at("ulp_info").get_to(cfg.ulpInfo); } + cfg.dotProductInfo.setNumber = 0; + cfg.dotProductInfo.kernelSize = 0; if (j.contains("dot_product_info")) { j.at("dot_product_info").get_to(cfg.dotProductInfo); } + cfg.reduceProductInfo.numberOfProducts = 0; if (j.contains("reduce_product_info")) { j.at("reduce_product_info").get_to(cfg.reduceProductInfo); } - // Set up defaults for optional AbsErrorVerifyInfo cfg.absErrorInfo.lowerBound = 0; if (j.contains("abs_error_info")) { j.at("abs_error_info").get_to(cfg.absErrorInfo); } + cfg.relativeInfo.max = 0; + cfg.relativeInfo.scale = 0; if (j.contains("relative_info")) { j.at("relative_info").get_to(cfg.relativeInfo); -- cgit v1.2.1