diff --git a/cmake/load_bundled_libraries.cmake b/cmake/load_bundled_libraries.cmake index 0981547a6a..2d95298dd1 100644 --- a/cmake/load_bundled_libraries.cmake +++ b/cmake/load_bundled_libraries.cmake @@ -40,8 +40,10 @@ endif() # yaml-cpp always included in the build set(YAMLCPP_LIBRARY yaml-cpp) -add_subdirectory(${PROJECT_LIB_DIR}/yaml-cpp) -set_darma_compiler_flags(${YAMLCPP_LIBRARY}) +if(NOT TARGET ${YAMLCPP_LIBRARY}) + add_subdirectory(${PROJECT_LIB_DIR}/yaml-cpp) + set_darma_compiler_flags(${YAMLCPP_LIBRARY}) +endif() # EngFormat-Cpp always included in the build set(ENG_FORMAT_LIBRARY EngFormat-Cpp) diff --git a/src/vt/vrt/collection/balance/lb_data_holder.cc b/src/vt/vrt/collection/balance/lb_data_holder.cc index 88ca07bcba..da6420fea7 100644 --- a/src/vt/vrt/collection/balance/lb_data_holder.cc +++ b/src/vt/vrt/collection/balance/lb_data_holder.cc @@ -338,13 +338,12 @@ std::unique_ptr LBDataHolder::toTV(PhaseType phase) const { std::unordered_map objects; if (node_data_.find(phase) != node_data_.end()) { - std::cout << "FINDING PHASE " << phase << std::endl; for (auto&& elm : node_data_.at(phase)) { ElementIDStruct id = elm.first; double whole_phase_load = elm.second.whole_phase_load; auto const& subphase_loads = elm.second.subphase_loads; - typename DataMapType::mapped_type user_defined; + ElmUserDataType user_defined; if ( user_defined_lb_info_.find(phase) != user_defined_lb_info_.end() and user_defined_lb_info_.at(phase).find(id) != @@ -359,9 +358,9 @@ std::unique_ptr LBDataHolder::toTV(PhaseType phase) const { objects.try_emplace( id.id, // add id into map and then construct ObjectWork with these parameters - ObjectWork{ - id.id, whole_phase_load, std::move(subphase_map) //, std::move(user_defined) - } + ObjectWork( + id.id, whole_phase_load, std::move(subphase_map), std::move(user_defined) + ) ); } }