Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify mdspan namespace #902

Merged
merged 5 commits into from
Feb 14, 2025
Merged

Simplify mdspan namespace #902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
98ad5c2
Return Basix hash for blocked elements
Feb 14, 2025
ab56c21
Add test
garth-wells Feb 14, 2025
bc8b3e8
Simplify use of namespace
garth-wells Feb 14, 2025
5dab3c5
Merge branch 'main' into garth/mdspan-simplify
garth-wells Feb 14, 2025
9507310
Doc fixes
garth-wells Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 9 additions & 17 deletions cpp/basix/e-lagrange.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
#include <concepts>

using namespace basix;
namespace stdex
= MDSPAN_IMPL_STANDARD_NAMESPACE::MDSPAN_IMPL_PROPOSED_NAMESPACE;
namespace md = MDSPAN_IMPL_STANDARD_NAMESPACE;
namespace stdex = md::MDSPAN_IMPL_PROPOSED_NAMESPACE;

namespace
{
Expand Down Expand Up @@ -448,9 +448,7 @@ basix::element::create_lagrange(cell::type celltype, int degree,
std::array<std::vector<impl::mdarray_t<T, 2>>, 4> x;
std::array<std::vector<impl::mdarray_t<T, 4>>, 4> M;
x[0].emplace_back(1, 0);
M[0].emplace_back(
MDSPAN_IMPL_STANDARD_NAMESPACE::dextents<std::size_t, 4>{1, 1, 1, 1},
1);
M[0].emplace_back(md::dextents<std::size_t, 4>{1, 1, 1, 1}, 1);
return FiniteElement<T>(
family::P, cell::type::point, polyset::type::standard, 0, {},
impl::mdspan_t<T, 2>(math::eye<T>(1).data(), 1, 1), impl::to_mdspan(x),
Expand Down Expand Up @@ -522,10 +520,7 @@ basix::element::create_lagrange(cell::type celltype, int degree,

const auto [pt, shape]
= lattice::create<T>(celltype, 0, lattice_type, true, simplex_method);
x[tdim].emplace_back(
MDSPAN_IMPL_STANDARD_NAMESPACE::dextents<std::size_t, 2>{shape[0],
shape[1]},
pt);
x[tdim].emplace_back(md::dextents<std::size_t, 2>{shape[0], shape[1]}, pt);
auto& _M = M[tdim].emplace_back(shape[0], 1, shape[0], 1);
std::fill(_M.data(), _M.data() + _M.size(), 0);
for (std::size_t i = 0; i < shape[0]; ++i)
Expand All @@ -543,10 +538,9 @@ basix::element::create_lagrange(cell::type celltype, int degree,
= cell::sub_entity_geometry<T>(celltype, dim, e);
if (dim == 0)
{
x[dim].emplace_back(
MDSPAN_IMPL_STANDARD_NAMESPACE::dextents<std::size_t, 2>{
entity_x_shape[0], entity_x_shape[1]},
entity_x);
x[dim].emplace_back(md::dextents<std::size_t, 2>{entity_x_shape[0],
entity_x_shape[1]},
entity_x);
auto& _M
= M[dim].emplace_back(entity_x_shape[0], 1, entity_x_shape[0], 1);
std::fill(_M.data(), _M.data() + _M.size(), 0);
Expand All @@ -557,10 +551,8 @@ basix::element::create_lagrange(cell::type celltype, int degree,
{
const auto [pt, shape] = lattice::create<T>(
celltype, degree, lattice_type, false, simplex_method);
x[dim].emplace_back(
MDSPAN_IMPL_STANDARD_NAMESPACE::dextents<std::size_t, 2>{
shape[0], shape[1]},
pt);
x[dim].emplace_back(md::dextents<std::size_t, 2>{shape[0], shape[1]},
pt);
auto& _M = M[dim].emplace_back(shape[0], 1, shape[0], 1);
std::fill(_M.data(), _M.data() + _M.size(), 0);
for (std::size_t i = 0; i < shape[0]; ++i)
Expand Down
9 changes: 4 additions & 5 deletions cpp/basix/e-regge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
#include <cmath>

using namespace basix;
namespace stdex
= MDSPAN_IMPL_STANDARD_NAMESPACE::MDSPAN_IMPL_PROPOSED_NAMESPACE;
namespace md = MDSPAN_IMPL_STANDARD_NAMESPACE;
namespace stdex = md::MDSPAN_IMPL_PROPOSED_NAMESPACE;

//-----------------------------------------------------------------------------
template <std::floating_point T>
Expand Down Expand Up @@ -116,9 +116,8 @@ FiniteElement<T> element::create_regge(cell::type celltype, int degree,
// Store up outer(t, t) for all tangents
const std::vector<int>& vert_ids = topology[d][e];
const std::size_t ntangents = d * (d + 1) / 2;
stdex::mdarray<T,
MDSPAN_IMPL_STANDARD_NAMESPACE::dextents<std::size_t, 3>>
vvt(ntangents, geometry.extent(1), geometry.extent(1));
stdex::mdarray<T, md::dextents<std::size_t, 3>> vvt(
ntangents, geometry.extent(1), geometry.extent(1));
std::vector<T> edge(geometry.extent(1));

int c = 0;
Expand Down
48 changes: 15 additions & 33 deletions cpp/basix/finite-element.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,13 @@
#define str(X) str_macro(X)

using namespace basix;
namespace md = MDSPAN_IMPL_STANDARD_NAMESPACE;

namespace stdex
= MDSPAN_IMPL_STANDARD_NAMESPACE::MDSPAN_IMPL_PROPOSED_NAMESPACE;
namespace stdex = md::MDSPAN_IMPL_PROPOSED_NAMESPACE;
template <typename T, std::size_t d>
using mdspan_t = MDSPAN_IMPL_STANDARD_NAMESPACE::mdspan<
T, MDSPAN_IMPL_STANDARD_NAMESPACE::dextents<std::size_t, d>>;
using mdspan_t = md::mdspan<T, md::dextents<std::size_t, d>>;
template <typename T, std::size_t d>
using mdarray_t
= stdex::mdarray<T,
MDSPAN_IMPL_STANDARD_NAMESPACE::dextents<std::size_t, d>>;
using mdarray_t = stdex::mdarray<T, md::dextents<std::size_t, d>>;

namespace
{
Expand Down Expand Up @@ -551,14 +548,10 @@ element::make_discontinuous(

std::array<std::size_t, 2> xshape = {npoints, tdim};
std::vector<T> xb(xshape[0] * xshape[1]);
MDSPAN_IMPL_STANDARD_NAMESPACE::mdspan<
T, MDSPAN_IMPL_STANDARD_NAMESPACE::dextents<std::size_t, 2>>
new_x(xb.data(), xshape);
md::mdspan<T, md::dextents<std::size_t, 2>> new_x(xb.data(), xshape);
std::array<std::size_t, 4> Mshape = {Mshape0, value_size, npoints, nderivs};
std::vector<T> Mb(Mshape[0] * Mshape[1] * Mshape[2] * Mshape[3]);
MDSPAN_IMPL_STANDARD_NAMESPACE::mdspan<
T, MDSPAN_IMPL_STANDARD_NAMESPACE::dextents<std::size_t, 4>>
new_M(Mb.data(), Mshape);
md::mdspan<T, md::dextents<std::size_t, 4>> new_M(Mb.data(), Mshape);
int x_n = 0;
int M_n = 0;
for (int i = 0; i < 4; ++i)
Expand Down Expand Up @@ -1520,19 +1513,16 @@ std::size_t FiniteElement<F>::hash() const
}
std::size_t vs_hash = 0;
for (std::size_t i = 0; i < value_shape().size(); ++i)
{
combine_hashes(vs_hash, std::hash<int>{}(value_shape()[i]));
}
combine_hashes(h, coeff_hash);
combine_hashes(h, std::hash<int>{}(embedded_superdegree()));
combine_hashes(h, std::hash<int>{}(embedded_subdegree()));
combine_hashes(h, std::hash<int>{}(static_cast<int>(polyset_type())));
combine_hashes(h, vs_hash);
}
else
{
combine_hashes(h, std::hash<int>{}(degree()));
}

return h;
}
//-----------------------------------------------------------------------------
Expand Down Expand Up @@ -1712,14 +1702,10 @@ FiniteElement<F>::push_forward(impl::mdspan_t<const F, 3> U,
std::vector<F> ub(shape[0] * shape[1] * shape[2]);
mdspan_t<F, 3> u(ub.data(), shape);

using u_t = MDSPAN_IMPL_STANDARD_NAMESPACE::mdspan<
F, MDSPAN_IMPL_STANDARD_NAMESPACE::dextents<std::size_t, 2>>;
using U_t = MDSPAN_IMPL_STANDARD_NAMESPACE::mdspan<
const F, MDSPAN_IMPL_STANDARD_NAMESPACE::dextents<std::size_t, 2>>;
using J_t = MDSPAN_IMPL_STANDARD_NAMESPACE::mdspan<
const F, MDSPAN_IMPL_STANDARD_NAMESPACE::dextents<std::size_t, 2>>;
using K_t = MDSPAN_IMPL_STANDARD_NAMESPACE::mdspan<
const F, MDSPAN_IMPL_STANDARD_NAMESPACE::dextents<std::size_t, 2>>;
using u_t = md::mdspan<F, md::dextents<std::size_t, 2>>;
using U_t = md::mdspan<const F, md::dextents<std::size_t, 2>>;
using J_t = md::mdspan<const F, md::dextents<std::size_t, 2>>;
using K_t = md::mdspan<const F, md::dextents<std::size_t, 2>>;
auto map = this->map_fn<u_t, U_t, J_t, K_t>();
for (std::size_t i = 0; i < u.extent(0); ++i)
{
Expand Down Expand Up @@ -1752,14 +1738,10 @@ FiniteElement<F>::pull_back(impl::mdspan_t<const F, 3> u,
std::vector<F> Ub(shape[0] * shape[1] * shape[2]);
mdspan_t<F, 3> U(Ub.data(), shape);

using u_t = MDSPAN_IMPL_STANDARD_NAMESPACE::mdspan<
const F, MDSPAN_IMPL_STANDARD_NAMESPACE::dextents<std::size_t, 2>>;
using U_t = MDSPAN_IMPL_STANDARD_NAMESPACE::mdspan<
F, MDSPAN_IMPL_STANDARD_NAMESPACE::dextents<std::size_t, 2>>;
using J_t = MDSPAN_IMPL_STANDARD_NAMESPACE::mdspan<
const F, MDSPAN_IMPL_STANDARD_NAMESPACE::dextents<std::size_t, 2>>;
using K_t = MDSPAN_IMPL_STANDARD_NAMESPACE::mdspan<
const F, MDSPAN_IMPL_STANDARD_NAMESPACE::dextents<std::size_t, 2>>;
using u_t = md::mdspan<const F, md::dextents<std::size_t, 2>>;
using U_t = md::mdspan<F, md::dextents<std::size_t, 2>>;
using J_t = md::mdspan<const F, md::dextents<std::size_t, 2>>;
using K_t = md::mdspan<const F, md::dextents<std::size_t, 2>>;
auto map = this->map_fn<U_t, u_t, K_t, J_t>();
for (std::size_t i = 0; i < u.extent(0); ++i)
{
Expand Down
7 changes: 3 additions & 4 deletions cpp/basix/interpolation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@
#include <exception>

using namespace basix;
namespace md = MDSPAN_IMPL_STANDARD_NAMESPACE;

namespace stdex
= MDSPAN_IMPL_STANDARD_NAMESPACE::MDSPAN_IMPL_PROPOSED_NAMESPACE;
namespace stdex = md::MDSPAN_IMPL_PROPOSED_NAMESPACE;
template <typename T, std::size_t D>
using mdspan_t = MDSPAN_IMPL_STANDARD_NAMESPACE::mdspan<
T, MDSPAN_IMPL_STANDARD_NAMESPACE::dextents<std::size_t, D>>;
using mdspan_t = md::mdspan<T, md::dextents<std::size_t, D>>;

//----------------------------------------------------------------------------
template <std::floating_point T>
Expand Down
Loading