Skip to content

Reorg file structure #482

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
crtrott merged 2 commits into from
Oct 14, 2026
Merged

Reorg file structure #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c554960
Move implementation files to include/mdspan/impl
crtrott Oct 14, 2026
aae1529
Fixup include paths
crtrott Oct 14, 2026
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
3 changes: 0 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,6 @@ endif()
install(DIRECTORY include/mdspan DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
if (MDSPAN_INSTALL_STDMODE_HEADERS)
install(DIRECTORY include/experimental DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
else()
install(DIRECTORY include/experimental DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
REGEX "/mdspan$|/mdarray$" EXCLUDE)
endif()

include(CMakePackageConfigHelpers)
Expand Down
0 ...rimental/__p0009_bits/compressed_pair.hpp → include/mdspan/impl/compressed_pair.hpp
View file
Open in desktop
File renamed without changes.
0 include/experimental/__p0009_bits/config.hpp → include/mdspan/impl/config.hpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...imental/__p2630_bits/constant_wrapper.hpp → include/mdspan/impl/constant_wrapper.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#pragma once

#include "../__p0009_bits/utility.hpp"
#include "utility.hpp"
#include <type_traits>

namespace MDSPAN_IMPL_STANDARD_NAMESPACE {
Expand Down
0 ...imental/__p0009_bits/default_accessor.hpp → include/mdspan/impl/default_accessor.hpp
View file
Open in desktop
File renamed without changes.
0 include/experimental/__p2389_bits/dims.hpp → include/mdspan/impl/dims.hpp
View file
Open in desktop
File renamed without changes.
0 ...erimental/__p0009_bits/dynamic_extent.hpp → include/mdspan/impl/dynamic_extent.hpp
View file
Open in desktop
File renamed without changes.
0 ...ude/experimental/__p0009_bits/extents.hpp → include/mdspan/impl/extents.hpp
View file
Open in desktop
File renamed without changes.
0 ...perimental/__p0009_bits/full_extent_t.hpp → include/mdspan/impl/full_extent_t.hpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...l/__p2630_bits/integral_constant_like.hpp → ...de/mdspan/impl/integral_constant_like.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#pragma once

#include "../__p0009_bits/utility.hpp"
#include "utility.hpp"
#include <type_traits>
#if defined(__cpp_lib_concepts)
# include <concepts>
Expand Down
2 changes: 1 addition & 1 deletion ...experimental/__p0009_bits/layout_left.hpp → include/mdspan/impl/layout_left.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "layout_stride.hpp"
#include "utility.hpp"
#if MDSPAN_HAS_CXX_17
#include "../__p2642_bits/layout_padded_fwd.hpp"
#include "layout_padded_fwd.hpp"
#endif
#include <type_traits>

Expand Down
14 changes: 7 additions & 7 deletions ...perimental/__p2642_bits/layout_padded.hpp → include/mdspan/impl/layout_padded.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@

#include <cassert>
#include "layout_padded_fwd.hpp"
#include "../__p0009_bits/dynamic_extent.hpp"
#include "../__p0009_bits/extents.hpp"
#include "../__p0009_bits/mdspan.hpp"
#include "../__p0009_bits/layout_left.hpp"
#include "../__p0009_bits/layout_right.hpp"
#include "../__p0009_bits/layout_stride.hpp"
#include "../__p0009_bits/utility.hpp"
#include "dynamic_extent.hpp"
#include "extents.hpp"
#include "mdspan.hpp"
#include "layout_left.hpp"
#include "layout_right.hpp"
#include "layout_stride.hpp"
#include "utility.hpp"

namespace MDSPAN_IMPL_STANDARD_NAMESPACE {
namespace detail {
Expand Down
4 changes: 2 additions & 2 deletions ...mental/__p2642_bits/layout_padded_fwd.hpp → include/mdspan/impl/layout_padded_fwd.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#pragma once

#include <cassert>
#include "../__p0009_bits/dynamic_extent.hpp"
#include "../__p0009_bits/utility.hpp"
#include "dynamic_extent.hpp"
#include "utility.hpp"

namespace MDSPAN_IMPL_STANDARD_NAMESPACE {

Expand Down
2 changes: 1 addition & 1 deletion ...xperimental/__p0009_bits/layout_right.hpp → include/mdspan/impl/layout_right.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "layout_stride.hpp"
#include "utility.hpp"
#if MDSPAN_HAS_CXX_17
#include "../__p2642_bits/layout_padded_fwd.hpp"
#include "layout_padded_fwd.hpp"
#endif

namespace MDSPAN_IMPL_STANDARD_NAMESPACE {
Expand Down
2 changes: 1 addition & 1 deletion ...perimental/__p0009_bits/layout_stride.hpp → include/mdspan/impl/layout_stride.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "utility.hpp"

#if MDSPAN_HAS_CXX_17
#include "../__p2642_bits/layout_padded_fwd.hpp"
#include "layout_padded_fwd.hpp"
#endif

#if !defined(MDSPAN_IMPL_USE_ATTRIBUTE_NO_UNIQUE_ADDRESS)
Expand Down
0 include/experimental/__p0009_bits/macros.hpp → include/mdspan/impl/macros.hpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ude/experimental/__p1684_bits/mdarray.hpp → include/mdspan/impl/mdarray.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#pragma once

#include "../../mdspan/mdspan.hpp"
#include "mdspan.hpp"
#include <cassert>
#include <vector>

Expand Down
0 include/experimental/__p0009_bits/mdspan.hpp → include/mdspan/impl/mdspan.hpp
View file
Open in desktop
File renamed without changes.
0 ...mental/__p0009_bits/no_unique_address.hpp → include/mdspan/impl/no_unique_address.hpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...perimental/__p2630_bits/strided_slice.hpp → include/mdspan/impl/strided_slice.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#pragma once

#include "../__p0009_bits/config.hpp"
#include "config.hpp"
#include "constant_wrapper.hpp"
#include "integral_constant_like.hpp"

Expand Down
0 ...e/experimental/__p2630_bits/submdspan.hpp → include/mdspan/impl/submdspan.hpp
View file
Open in desktop
File renamed without changes.
0 ...30_bits/submdspan_canonicalize_slices.hpp → ...an/impl/submdspan_canonicalize_slices.hpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...mental/__p2630_bits/submdspan_extents.hpp → include/mdspan/impl/submdspan_extents.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

#include "constant_wrapper.hpp"
#include "strided_slice.hpp"
#include "../__p0009_bits/utility.hpp"
#include "submdspan_canonicalize_slices.hpp"
#include "utility.hpp"

namespace MDSPAN_IMPL_STANDARD_NAMESPACE {
namespace detail {
Expand Down
2 changes: 1 addition & 1 deletion ...mental/__p2630_bits/submdspan_mapping.hpp → include/mdspan/impl/submdspan_mapping.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <array>
#include <type_traits>
#include <utility> // index_sequence
#include "../__p0009_bits/utility.hpp"
#include "utility.hpp"

// Suppress spurious warning with NVCC about no return statement.
// This is a known issue in NVCC and NVC++
Expand Down
0 ...rimental/__p0009_bits/trait_backports.hpp → include/mdspan/impl/trait_backports.hpp
View file
Open in desktop
File renamed without changes.
0 ...e/experimental/__p0009_bits/type_list.hpp → include/mdspan/impl/type_list.hpp
View file
Open in desktop
File renamed without changes.
0 ...ude/experimental/__p0009_bits/utility.hpp → include/mdspan/impl/utility.hpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion include/mdspan/mdarray.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
#endif

#include "mdspan.hpp"
#include "../experimental/__p1684_bits/mdarray.hpp"
#include "impl/mdarray.hpp"

#endif // MDARRAY_HPP_
24 changes: 12 additions & 12 deletions include/mdspan/mdspan.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@
#define MDSPAN_IMPL_PROPOSED_NAMESPACE Experimental
#endif

#include "../experimental/__p0009_bits/default_accessor.hpp"
#include "../experimental/__p0009_bits/full_extent_t.hpp"
#include "../experimental/__p0009_bits/mdspan.hpp"
#include "../experimental/__p0009_bits/dynamic_extent.hpp"
#include "../experimental/__p0009_bits/extents.hpp"
#include "../experimental/__p0009_bits/layout_stride.hpp"
#include "../experimental/__p0009_bits/layout_left.hpp"
#include "../experimental/__p0009_bits/layout_right.hpp"
#include "../experimental/__p0009_bits/macros.hpp"
#include "impl/default_accessor.hpp"
#include "impl/full_extent_t.hpp"
#include "impl/mdspan.hpp"
#include "impl/dynamic_extent.hpp"
#include "impl/extents.hpp"
#include "impl/layout_stride.hpp"
#include "impl/layout_left.hpp"
#include "impl/layout_right.hpp"
#include "impl/macros.hpp"
#if MDSPAN_HAS_CXX_17
#include "../experimental/__p2642_bits/layout_padded.hpp"
#include "../experimental/__p2630_bits/submdspan.hpp"
#include "impl/layout_padded.hpp"
#include "impl/submdspan.hpp"
#endif
#include "../experimental/__p2389_bits/dims.hpp"
#include "impl/dims.hpp"

#endif // MDSPAN_HPP_
2 changes: 1 addition & 1 deletion tests/test_constant_wrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <type_traits>
#include <gtest/gtest.h>

#include "../include/experimental/__p2630_bits/constant_wrapper.hpp"
#include "mdspan/impl/constant_wrapper.hpp"

namespace { // (anonymous)

Expand Down
Loading