Skip to content

Commit c0eb7dd

Browse files
committed
add github workflow for test-pypi cross-OS wheel builds
1 parent 7522e21 commit c0eb7dd

4 files changed

Lines changed: 103 additions & 93 deletions

File tree

include/fdaPDE-cpp/fdaPDE/core/fdaPDE/src/finite_elements/dof_handler.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,9 @@ class DofHandler<2, EmbedDim, finite_element_tag> :
312312
using Base::n_dofs_;
313313
using Base::triangulation_;
314314
static constexpr auto edge_pattern = TriangulationType::edge_pattern;
315-
315+
static constexpr int local_dim = TriangulationType::local_dim;
316+
static constexpr int embed_dim = TriangulationType::embed_dim;
317+
316318
DofHandler() = default;
317319
DofHandler(const TriangulationType& triangulation) : Base(triangulation) { }
318320

@@ -502,7 +504,9 @@ class DofHandler<3, 3, finite_element_tag> :
502504
using Base::n_dofs_;
503505
using Base::triangulation_;
504506
static constexpr auto edge_pattern = TriangulationType::edge_pattern;
505-
507+
static constexpr int local_dim = TriangulationType::local_dim;
508+
static constexpr int embed_dim = TriangulationType::embed_dim;
509+
506510
DofHandler() = default;
507511
DofHandler(const TriangulationType& triangulation) : Base(triangulation) { }
508512

include/fdaPDE-cpp/fdaPDE/core/fdaPDE/src/geoframe/data_layer.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1085,12 +1085,12 @@ class scalar_data_layer {
10851085
int n_cols = data.cols();
10861086
if (n_cols == 0) { return os; } // empty frame, nothing to print
10871087
out.resize(n_cols);
1088-
auto stringify = []<typename T>(const T& t, bool is_na) {
1088+
auto stringify = []<typename T>(const T& t, bool is_na) -> std::string {
10891089
if (is_na) { return std::string("NA"); }
1090-
if constexpr (!std::is_same_v<T, std::string>) {
1091-
return std::to_string(t);
1092-
} else {
1090+
if constexpr (std::is_same_v<T, std::string>) {
10931091
return t;
1092+
} else {
1093+
return std::format("{}", t);
10941094
}
10951095
};
10961096
auto print = [&]<typename T>(std::vector<std::string>& out_, const std::string& typestring, const field& desc) {

include/fdaPDE-cpp/fdaPDE/core/fdaPDE/src/utility/mdarray.h

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,15 @@ template <int... Extents> class MdExtents {
200200
std::array<index_t, Order> extents_ {(Extents == Dynamic ? 0 : Extents)...};
201201
};
202202

203-
template <int N>
204-
using full_dynamic_extent_t = std::decay_t<decltype(internals::apply_index_pack<N>(
205-
[]<int... Ns_> { return MdExtents<((void)Ns_, Dynamic)...> {Ns_...}; }))>;
203+
// required by MVSC
204+
template <int N> struct make_full_dynamic_extents {
205+
static constexpr auto value() {
206+
return internals::apply_index_pack<N>([]<int... Ns_> { return MdExtents<((void)Ns_, Dynamic)...> {Ns_...}; });
207+
}
208+
using type = decltype(value());
209+
};
210+
211+
template <int N> using full_dynamic_extent_t = typename make_full_dynamic_extents<N>::type;
206212

207213
namespace internals {
208214

0 commit comments

Comments
 (0)