Skip to content

Rename pointer data size type contiguous - #147

Merged
crtrott merged 8 commits into
kokkos:stablefrom
crtrott:rename-pointer-data-size_type-contiguous
Jun 30, 2022
Merged

crtrott merged 8 commits into
kokkos:stablefrom
crtrott:rename-pointer-data-size_type-contiguous

Conversation

@crtrott

@crtrott crtrott commented Jun 28, 2022

Copy link
Copy Markdown
Member

No description provided.

mhoemmen
mhoemmen previously approved these changes Jun 29, 2022
@@ -279,7 +279,7 @@ static_assert(_MDSPAN_CPLUSPLUS >= MDSPAN_CXX_STD_14, "mdspan requires C++14 or
// Corentins demo compiler for subscript chokes on empty [] call,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// Corentins demo compiler for subscript chokes on empty [] call,
// Early implementations of P2128 (multiple-parameter operator[]) fail to compile
// if called with zero arguments, even though the proposal supports this.

@@ -279,7 +279,7 @@ static_assert(_MDSPAN_CPLUSPLUS >= MDSPAN_CXX_STD_14, "mdspan requires C++14 or
// Corentins demo compiler for subscript chokes on empty [] call,
// though I believe the proposal supports it?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// though I believe the proposal supports it?

@mhoemmen

Copy link
Copy Markdown
Contributor

nvc++'s build works if I rebase this PR atop my PR #148. I get one build warning (which explains the one loop change in PR #148):

[ 92%] Building CXX object tests/CMakeFiles/test_mdarray_ctors.dir/test_mdarray_ctors.cpp.o
".../include/experimental/__p0009_bits/layout_right.hpp", line 174: warning: pointless comparison of unsigned integer with zero
        for(rank_type r=0; r<extents_type::rank(); r++) value*=__extents.extent(r);
                            ^
          detected during:
            instantiation of "std::experimental::layout_right::mapping<Extents>::index_type std::experimental::layout_right::mapping<Extents>::required_span_size() const noexcept [with Extents=std::experimental::extents<unsigned int>]" at line 237 of ".../include/experimental/__p1684_bits/mdarray.hpp"
            instantiation of "std::experimental::mdarray<ElementType, Extents, LayoutPolicy, Container>::mdarray(const std::experimental::mdarray<ElementType, Extents, LayoutPolicy, Container>::extents_type &, const Alloc &) [with ElementType=int, Extents=std::experimental::extents<unsigned int>, LayoutPolicy=std::experimental::layout_right, Container=std::vector<int, std::allocator<int>>, Alloc=std::allocator<int>, <unnamed>=0]" at line 365 of ".../tests/test_mdarray_ctors.cpp"

@mhoemmen

Copy link
Copy Markdown
Contributor

I'm not sure why github is more conservative about conflicts than git. Rebasing #147 atop #149 worked for me.

@crtrott
crtrott force-pushed the rename-pointer-data-size_type-contiguous branch from 0da7ba1 to 49a4730 Compare June 29, 2022 19:15
@crtrott

crtrott commented Jun 29, 2022

Copy link
Copy Markdown
Member Author

Because it requires a force push due to rewriting history I guess.

@mhoemmen mhoemmen left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @crtrott ! : - D It builds for me with nvc++ and passes all the tests.

@crtrott
crtrott merged commit 36dda96 into kokkos:stable Jun 30, 2022
mhoemmen added a commit to mhoemmen/stdBLAS that referenced this pull request Jun 30, 2022
The recently merged mdspan PR kokkos/mdspan#147
is a breaking change.  This commit makes stdblas build with that change.

My changes to the kokkos-based tests are best effort only;
I haven't tested that build yet.
mhoemmen added a commit to mhoemmen/stdBLAS that referenced this pull request Jul 1, 2022
The recently merged mdspan PR kokkos/mdspan#147
is a breaking change.  This commit makes stdblas build with that change.

My changes to the kokkos-based tests are best effort only;
I haven't tested that build yet.
@crtrott
crtrott deleted the rename-pointer-data-size_type-contiguous branch January 24, 2023 22:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants