[Params] support new Itanium ABI for concepts https://reviews.llvm.or…

…g/D147655

src/alpaqa/include/alpaqa/implementation/params/json.tpp

@@ -21,7 +21,7 @@ std::string join_sorted_keys(const auto &members) {
 
 template <class T>
     requires requires { attribute_table<T, json>::table; }
-void set_param(T &t, const json &j) {
+void set_param_default(T &t, const json &j) {
     if (!j.is_object())
         throw invalid_json_param("Invalid value " + to_string(j) +
                                  " for type '" + demangled_typename(typeid(T)) +
@@ -79,7 +79,7 @@ void set_param(T &t, const json &j) {
 
 template <class T>
     requires requires { enum_table<T, json>::table; }
-void set_param(T &t, const json &j) {
+void set_param_default(T &t, const json &j) {
     if (!j.is_string())
         throw invalid_json_param("Invalid value " + to_string(j) +
                                  " for enum '" + demangled_typename(typeid(T)) +
@@ -100,13 +100,13 @@ void set_param(T &t, const json &j) {
 
 template <class T>
     requires requires { enum_table<T, json>::table; }
-void get_param(const T &t, json &j) {
+void get_param_default(const T &t, json &j) {
     j = enum_name(t);
 }
 
 template <class T>
     requires requires { attribute_table<T, json>::table; }
-void get_param(const T &t, json &s) {
+void get_param_default(const T &t, json &s) {
     s             = json::object();
     const auto &m = attribute_table<T, json>::table;
     for (auto &&[k, v] : m)

src/alpaqa/include/alpaqa/implementation/params/params.tpp

@@ -50,7 +50,7 @@ struct enum_accessor<T, ParamString> {
 /// given by @p s.key.
 template <class T>
     requires requires { attribute_table<T, ParamString>::table; }
-void set_param(T &t, ParamString s) {
+void set_param_default(T &t, ParamString s) {
     const auto &m         = attribute_table<T, ParamString>::table;
     auto [key, remainder] = split_key(s.key);
     auto it               = m.find(key);
@@ -71,7 +71,7 @@ void set_param(T &t, ParamString s) {
 /// Set @p t to the value of @p s.value.
 template <class T>
     requires requires { enum_table<T, ParamString>::table; }
-void set_param(T &t, ParamString s) {
+void set_param_default(T &t, ParamString s) {
     assert_key_empty<T>(s);
     const auto &m = enum_table<T, ParamString>::table;
     auto it       = m.find(s.value);

src/alpaqa/src/params/json.cpp

@@ -38,7 +38,7 @@ inline constexpr bool is_duration<std::chrono::duration<Rep, Period>> = true;
 
 template <class Duration>
     requires is_duration<Duration>
-void set_param(Duration &t, const json &j) {
+void set_param_default(Duration &t, const json &j) {
     if (!j.is_string())
         throw invalid_json_param(
             "Invalid value " + to_string(j) + " for type '" +
@@ -60,7 +60,7 @@ void set_param(Duration &t, const json &j) {
 
 template <class Duration>
     requires is_duration<Duration>
-void get_param(const Duration &t, json &s) {
+void get_param_default(const Duration &t, json &s) {
     namespace chr = std::chrono;
     auto dur      = t;
     std::string result;
@@ -179,7 +179,7 @@ void ALPAQA_EXPORT set_param(std::string &t, const nlohmann::json &j) {
 
 template <std::integral T>
     requires(!std::same_as<T, bool>)
-void set_param(T &t, const nlohmann::json &j) {
+void set_param_default(T &t, const nlohmann::json &j) {
     if (std::unsigned_integral<T> && !j.is_number_unsigned())
         throw invalid_json_param("Invalid value " + to_string(j) +
                                  " for type '" + demangled_typename(typeid(T)) +
@@ -194,7 +194,7 @@ void set_param(T &t, const nlohmann::json &j) {
 }
 
 template <std::floating_point T>
-void set_param(T &t, const nlohmann::json &j) {
+void set_param_default(T &t, const nlohmann::json &j) {
     if (j.is_string()) {
         if (j == "nan") {
             t = std::numeric_limits<T>::quiet_NaN();
@@ -222,12 +222,12 @@ void set_param(T &t, const nlohmann::json &j) {
 template <class T>
     requires(std::integral<T> || std::same_as<T, bool> ||
              std::same_as<T, std::string>)
-void get_param(const T &t, nlohmann::json &j) {
+void get_param_default(const T &t, nlohmann::json &j) {
     j = t;
 }
 
 template <std::floating_point T>
-void get_param(const T &t, nlohmann::json &j) {
+void get_param_default(const T &t, nlohmann::json &j) {
     if (std::isnan(t))
         j = "nan";
     else if (t == +std::numeric_limits<T>::infinity())
@@ -240,6 +240,19 @@ void get_param(const T &t, nlohmann::json &j) {
 
 #include <alpaqa/params/structs.ipp>
 
+// Because of the new name mangling for concepts (https://reviews.llvm.org/D147655)
+// we need this to be an unconstrained function template. The actual constraints
+// are in set_param_default, which is not exported. Fully specialized
+// instantiations of set_param are still allowed.
+template <class T>
+void set_param(T &t, const json &j) {
+    set_param_default(t, j);
+}
+template <class T>
+void get_param(const T &t, json &j) {
+    get_param_default(t, j);
+}
+
 template <class... Ts>
 void set_param(util::detail::dummy<Ts...> &, const json &) {}
 template <class... Ts>

src/alpaqa/src/params/params.cpp

@@ -64,7 +64,7 @@ void ALPAQA_EXPORT set_param(std::string &v, ParamString s) {
 template <class T>
     requires((std::floating_point<T> || std::integral<T>) &&
              !std::is_enum_v<T> && !std::is_same_v<T, bool>)
-void set_param(T &f, ParamString s) {
+void set_param_default(T &f, ParamString s) {
     assert_key_empty<T>(s);
     const auto *val_end = s.value.data() + s.value.size();
     auto res            = util::from_chars(s.value.data(), val_end, f);
@@ -141,7 +141,7 @@ inline constexpr bool is_duration<std::chrono::duration<Rep, Period>> = true;
 
 template <class Duration>
     requires is_duration<Duration>
-void set_param(Duration &t, ParamString s) {
+void set_param_default(Duration &t, ParamString s) {
     assert_key_empty<Duration>(s);
     try {
         util::parse_duration(t = {}, s.value);
@@ -160,6 +160,15 @@ void set_param(Duration &t, ParamString s) {
 
 #include <alpaqa/params/structs.ipp>
 
+// Because of the new name mangling for concepts (https://reviews.llvm.org/D147655)
+// we need this to be an unconstrained function template. The actual constraints
+// are in set_param_default, which is not exported. Fully specialized
+// instantiations of set_param are still allowed.
+template <class T>
+void set_param(T &t, ParamString s) {
+    set_param_default(t, s);
+}
+
 template <class... Ts>
 void set_param(util::detail::dummy<Ts...> &, ParamString) {}
 

src/interop/lbfgsb/src/lbfgsb-json.cpp

@@ -5,9 +5,15 @@ namespace alpaqa::params {
 
 #include <alpaqa/lbfgsb/lbfgsb-structs.ipp>
 
-template void LBFGSB_ADAPTER_EXPORT set_param(lbfgsb::LBFGSBSolver::Params &,
-                                              const json &);
-template void LBFGSB_ADAPTER_EXPORT
-get_param(const lbfgsb::LBFGSBSolver::Params &, json &);
+template <>
+void LBFGSB_ADAPTER_EXPORT set_param(lbfgsb::LBFGSBSolver::Params &t,
+                                     const json &j) {
+    set_param_default(t, j);
+}
+template <>
+void LBFGSB_ADAPTER_EXPORT get_param(const lbfgsb::LBFGSBSolver::Params &t,
+                                     json &j) {
+    get_param_default(t, j);
+}
 
 } // namespace alpaqa::params

src/interop/lbfgsb/src/lbfgsb-params.cpp

@@ -5,7 +5,10 @@ namespace alpaqa::params {
 
 #include <alpaqa/lbfgsb/lbfgsb-structs.ipp>
 
-template void LBFGSB_ADAPTER_EXPORT set_param(lbfgsb::LBFGSBSolver::Params &,
-                                              ParamString);
+template <>
+void LBFGSB_ADAPTER_EXPORT set_param(lbfgsb::LBFGSBSolver::Params &t,
+                                     ParamString s) {
+    set_param_default(t, s);
+}
 
 } // namespace alpaqa::params

src/interop/qpalm/src/qpalm-json.cpp

@@ -5,7 +5,13 @@ namespace alpaqa::params {
 
 #include <alpaqa/qpalm/qpalm-structs.ipp>
 
-template void QPALM_ADAPTER_EXPORT set_param(qpalm::Settings &, const json &);
-template void QPALM_ADAPTER_EXPORT get_param(const qpalm::Settings &, json &);
+template <>
+void QPALM_ADAPTER_EXPORT set_param(qpalm::Settings &t, const json &j) {
+    set_param_default(t, j);
+}
+template <>
+void QPALM_ADAPTER_EXPORT get_param(const qpalm::Settings &t, json &j) {
+    get_param_default(t, j);
+}
 
 } // namespace alpaqa::params

src/interop/qpalm/src/qpalm-params.cpp

@@ -5,6 +5,9 @@ namespace alpaqa::params {
 
 #include <alpaqa/qpalm/qpalm-structs.ipp>
 
-template void QPALM_ADAPTER_EXPORT set_param(qpalm::Settings &, ParamString);
+template <>
+void QPALM_ADAPTER_EXPORT set_param(qpalm::Settings &t, ParamString s) {
+    set_param_default(t, s);
+}
 
 } // namespace alpaqa::params