Skip to content

[libcxx] Include __fwd/span.h in <mdspan> #142925

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

Merged
merged 6 commits into from
Jun 8, 2025
Merged

[libcxx] Include __fwd/span.h in <mdspan> #142925

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
297c2bb
[𝘀𝗽𝗿] initial version
boomanaiden154 Jun 5, 2025
1a86a05
[𝘀𝗽𝗿] changes to main this commit is based on
boomanaiden154 Jun 5, 2025
357a155
formatting
boomanaiden154 Jun 5, 2025
fdadff5
[𝘀𝗽𝗿] changes introduced through rebase
carlosgalvezp Jun 7, 2025
3fe5a1e
rebase
boomanaiden154 Jun 7, 2025
835d16a
feedback
boomanaiden154 Jun 7, 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
1 change: 1 addition & 0 deletions libcxx/include/mdspan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,7 @@ namespace std {

# if _LIBCPP_STD_VER >= 23
# include <__fwd/mdspan.h>
# include <__fwd/span.h>
# include <__mdspan/default_accessor.h>
# include <__mdspan/extents.h>
# include <__mdspan/layout_left.h>
Expand Down
1 change: 1 addition & 0 deletions libcxx/test/libcxx/containers/views/mdspan/extents/assert.ctor_from_span.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
// for every rank index r.
//

#include <span>
#include <mdspan>
#include <cassert>

Expand Down
1 change: 1 addition & 0 deletions libcxx/test/libcxx/containers/views/mdspan/layout_stride/assert.ctor.extents_array.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
//
// Effects: Direct-non-list-initializes extents_ with e, and for all d in the range [0, rank_), direct-non-list-initializes strides_[d] with as_const(s[d]).

#include <span>
#include <mdspan>
#include <cassert>

Expand Down
1 change: 1 addition & 0 deletions libcxx/test/libcxx/containers/views/mdspan/layout_stride/assert.ctor.extents_span.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
//
// Effects: Direct-non-list-initializes extents_ with e, and for all d in the range [0, rank_), direct-non-list-initializes strides_[d] with as_const(s[d]).

#include <span>
#include <mdspan>
#include <cassert>

Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/CustomTestLayouts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#include <cstddef>
#include <limits>
#include <mdspan>
#include <span> // dynamic_extent
#include <type_traits>
#include <utility>

Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/extents/comparison.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#include <cassert>
#include <cstddef>
#include <mdspan>
#include <span> // dynamic_extent

#include "test_macros.h"

Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/extents/conversion.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
#include <cstddef>
#include <limits>
#include <mdspan>
#include <span> // dynamic_extent
#include <type_traits>

template <class To, class From>
Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/extents/ctad.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#include <cassert>
#include <cstddef>
#include <mdspan>
#include <span> // dynamic_extent
#include <type_traits>

#include "../ConvertibleToIntegral.h"
Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/extents/dextents.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

#include <mdspan>
#include <cstddef>
#include <span> // dynamic_extent

#include "test_macros.h"

Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/extents/dims.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

#include <mdspan>
#include <cstddef>
#include <span> // dynamic_extent

#include "test_macros.h"

Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/extents/index_type.verify.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#include <cstddef>
#include <climits>
#include <mdspan>
#include <span> // dynamic_extent

void invalid_index_types() {
// expected-error@*:* {{static assertion failed: extents::index_type must be a signed or unsigned integer type}}
Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/extents/obs_static.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
#include <cassert>
#include <cstddef>
#include <mdspan>
#include <span> // dynamic_extent
#include <utility>

#include "test_macros.h"
Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/extents/types.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
#include <concepts>
#include <cstddef>
#include <mdspan>
#include <span> // dynamic_extent
#include <type_traits>

#include "test_macros.h"
Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/layout_left/comparison.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include <cassert>
#include <cstddef>
#include <mdspan>
#include <span> // dynamic_extent

#include "test_macros.h"

Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/layout_left/ctor.default.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include <cstddef>
#include <cstdint>
#include <mdspan>
#include <span> // dynamic_extent

#include "test_macros.h"

Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/layout_left/ctor.extents.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#include <cstddef>
#include <cstdint>
#include <mdspan>
#include <span> // dynamic_extent

#include "test_macros.h"

Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/layout_left/ctor.layout_right.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include <cstddef>
#include <limits>
#include <mdspan>
#include <span> // dynamic_extent
#include <type_traits>

#include "test_macros.h"
Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/layout_left/ctor.layout_stride.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#include <cassert>
#include <cstddef>
#include <mdspan>
#include <span> // dynamic_extent
#include <type_traits>

#include "test_macros.h"
Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/layout_left/ctor.mapping.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include <cstddef>
#include <limits>
#include <mdspan>
#include <span> // dynamic_extent
#include <type_traits>

#include "test_macros.h"
Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/layout_left/index_operator.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#include <cstddef>
#include <cstdint>
#include <mdspan>
#include <span> // dynamic_extent
#include <type_traits>

#include "test_macros.h"
Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/layout_left/properties.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
#include <cassert>
#include <cstddef>
#include <mdspan>
#include <span> // dynamic_extent
#include <utility>

#include "test_macros.h"
Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/layout_left/required_span_size.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include <cstddef>
#include <cstdint>
#include <mdspan>
#include <span> // dynamic_extent

#include "test_macros.h"

Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/layout_left/static_requirements.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
#include <cassert>
#include <cstddef>
#include <mdspan>
#include <span> // dynamic_extent
#include <type_traits>
#include <utility>

Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/layout_left/stride.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include <cassert>
#include <cstdint>
#include <cstdio>
#include <span> // dynamic_extent

#include "test_macros.h"

Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/layout_right/comparison.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include <cassert>
#include <cstddef>
#include <mdspan>
#include <span> // dynamic_extent

#include "test_macros.h"

Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/layout_right/ctor.default.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include <cstddef>
#include <cstdint>
#include <mdspan>
#include <span> // dynamic_extent

#include "test_macros.h"

Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/layout_right/ctor.extents.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#include <cstddef>
#include <cstdint>
#include <mdspan>
#include <span> // dynamic_extent

#include "test_macros.h"

Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/layout_right/ctor.layout_left.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include <cstddef>
#include <limits>
#include <mdspan>
#include <span> // dynamic_extent
#include <type_traits>

#include "test_macros.h"
Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/layout_right/ctor.layout_stride.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#include <cassert>
#include <cstddef>
#include <mdspan>
#include <span> // dynamic_extent
#include <type_traits>

#include "test_macros.h"
Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/layout_right/ctor.mapping.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include <cstddef>
#include <limits>
#include <mdspan>
#include <span> // dynamic_extent
#include <type_traits>

#include "test_macros.h"
Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/layout_right/index_operator.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#include <cstddef>
#include <cstdint>
#include <mdspan>
#include <span> // dynamic_extent
#include <type_traits>

#include "test_macros.h"
Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/layout_right/properties.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
#include <cassert>
#include <cstddef>
#include <mdspan>
#include <span> // dynamic_extent
#include <utility>

#include "test_macros.h"
Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/layout_right/required_span_size.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include <cstddef>
#include <cstdint>
#include <mdspan>
#include <span> // dynamic_extent

#include "test_macros.h"

Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/layout_right/static_requirements.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
#include <cassert>
#include <cstddef>
#include <mdspan>
#include <span> // dynamic_extent
#include <type_traits>
#include <utility>

Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/layout_right/stride.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include <cassert>
#include <cstdint>
#include <cstdio>
#include <span> // dynamic_extent

#include "test_macros.h"

Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/layout_stride/comparison.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#include <mdspan>
#include <cassert>
#include <concepts>
#include <span> // dynamic_extent
#include <type_traits>

#include "test_macros.h"
Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/layout_stride/ctor.default.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include <cstddef>
#include <cstdint>
#include <mdspan>
#include <span> // dynamic_extent

#include "test_macros.h"

Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/layout_stride/ctor.extents_array.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
#include <cstddef>
#include <cstdint>
#include <mdspan>
#include <span> // dynamic_extent
#include <type_traits>

#include "test_macros.h"
Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/layout_stride/ctor.strided_mapping.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
#include <mdspan>
#include <cassert>
#include <limits>
#include <span> // dynamic_extent
#include <type_traits>

#include "test_macros.h"
Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/layout_stride/index_operator.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#include <array>
#include <cassert>
#include <cstdint>
#include <span> // dynamic_extent
#include <type_traits>

#include "test_macros.h"
Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/layout_stride/is_exhaustive_corner_case.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include <cassert>
#include <cstddef>
#include <mdspan>
#include <span> // dynamic_extent

template <class E>
constexpr void
Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/layout_stride/properties.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
#include <concepts>
#include <cstddef>
#include <mdspan>
#include <span> // dynamic_extent
#include <type_traits>

#include "test_macros.h"
Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/layout_stride/required_span_size.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include <cstddef>
#include <cstdint>
#include <mdspan>
#include <span> // dynamic_extent

#include "test_macros.h"

Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/layout_stride/static_requirements.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
#include <cassert>
#include <cstddef>
#include <mdspan>
#include <span> // dynamic_extent
#include <type_traits>
#include <utility>

Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/layout_stride/stride.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include <cassert>
#include <cstdint>
#include <cstdio>
#include <span> // dynamic_extent

#include "test_macros.h"

Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/mdspan/assign.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include <mdspan>
#include <cassert>
#include <concepts>
#include <span> // dynamic_extent
#include <type_traits>

#include "test_macros.h"
Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/mdspan/conversion.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
#include <mdspan>
#include <cassert>
#include <concepts>
#include <span> // dynamic_extent
#include <type_traits>

#include "test_macros.h"
Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/mdspan/ctor.copy.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#include <mdspan>
#include <cassert>
#include <concepts>
#include <span> // dynamic_extent
#include <type_traits>

#include "test_macros.h"
Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/mdspan/ctor.default.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include <mdspan>
#include <cassert>
#include <concepts>
#include <span> // dynamic_extent
#include <type_traits>

#include "test_macros.h"
Expand Down
1 change: 0 additions & 1 deletion libcxx/test/std/containers/views/mdspan/mdspan/ctor.dh_array.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
#include <cassert>
#include <concepts>
#include <mdspan>
#include <span> // dynamic_extent
#include <type_traits>

#include "test_macros.h"
Expand Down
Loading
Loading