Skip to content
Snippets Groups Projects
Commit e5a2b0d4 authored by Olivier BICHLER's avatar Olivier BICHLER
Browse files

Remove regex dependency

parent 578c0429
No related branches found
No related tags found
3 merge requests!414Update version 0.5.1 -> 0.6.0,!408[Add] Dropout Operator,!368Remove regex dependency
Pipeline #67988 passed
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include <cassert> #include <cassert>
#include <string> #include <string>
#include <typeindex> #include <typeindex>
#include <regex>
#include "aidge/utils/future_std/any.hpp" #include "aidge/utils/future_std/any.hpp"
#include "aidge/utils/Attributes.hpp" #include "aidge/utils/Attributes.hpp"
...@@ -486,14 +485,24 @@ struct fmt::formatter<T, Char, std::enable_if_t<std::is_convertible<T*, Aidge:: ...@@ -486,14 +485,24 @@ struct fmt::formatter<T, Char, std::enable_if_t<std::is_convertible<T*, Aidge::
template<typename FormatContext> template<typename FormatContext>
inline auto format(const Aidge::Attributes& attrs, FormatContext& ctx) const { inline auto format(const Aidge::Attributes& attrs, FormatContext& ctx) const {
auto indent = [](const std::string& subAttrs, const std::string& prefix = " ") {
std::string result(prefix);
for (size_t i = 0; i < subAttrs.length(); ++i) {
result += subAttrs[i];
if (subAttrs[i] == '\n') {
result += prefix;
}
}
return result;
};
std::string attrsStr; std::string attrsStr;
for (const auto& attr : attrs.getAttrs()) { for (const auto& attr : attrs.getAttrs()) {
const auto anyUtilsIt = Aidge::DynamicAttributes::mAnyUtils.find(attr.second.type()); const auto anyUtilsIt = Aidge::DynamicAttributes::mAnyUtils.find(attr.second.type());
if (attr.second.type() == typeid(Aidge::DynamicAttributes)) { if (attr.second.type() == typeid(Aidge::DynamicAttributes)) {
auto subAttrs = anyUtilsIt->second->str(attr.second); auto subAttrs = anyUtilsIt->second->str(attr.second);
subAttrs = std::regex_replace(subAttrs, std::regex("(^|\n)"), "$1 "); attrsStr += fmt::format("{}:\n{}\n", attr.first, indent(subAttrs));
attrsStr += fmt::format("{}:\n{}\n", attr.first, subAttrs);
} }
else { else {
if (anyUtilsIt != Aidge::DynamicAttributes::mAnyUtils.end()) { if (anyUtilsIt != Aidge::DynamicAttributes::mAnyUtils.end()) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment