Skip to content
This repository has been archived by the owner on Mar 21, 2024. It is now read-only.

Backport C++17 type_traits and cuda::std::byte to C++14 #44

Closed
wants to merge 16 commits into from
Closed

Backport C++17 type_traits and cuda::std::byte to C++14 #44

wants to merge 16 commits into from

Conversation

jrhemstad
Copy link
Collaborator

@jrhemstad jrhemstad commented Oct 9, 2020 •
edited
Loading

Broken off from #10

  • Backports <type_traits> features from C++17 to make them available in C++14

  • Backports tests of type traits to make them supported in C++14

  • Backports cuda::std::byte to be available in C++14 (this was necessary to make some tests pass as a result of the <type_traits> changes

@jrhemstad jrhemstad requested a review from griwes October 9, 2020 18:09
This was referenced Oct 9, 2020
Merged
Closed
@jrhemstad
Copy link
Collaborator Author

jrhemstad commented Oct 9, 2020 •
edited
Loading

@griwes are there <type_traits> tests I'm missing that should also be back ported?

Found them in std/utilities/meta.

@trxcllnt trxcllnt mentioned this pull request Oct 9, 2020
Merged
griwes
griwes approved these changes Oct 22, 2020
View reviewed changes
Copy link
Collaborator

@griwes griwes left a comment

Choose a reason for hiding this comment

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

Looking at the diff made me realize that you're also enabling the variable templates for the traits, but not the tests around the variable templates, like here: https://github.com/NVIDIA/libcudacxx/blob/main/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_abstract.pass.cpp#L24-L29. I'll leave it up to you whether you want to enable those in this PR or if you want to do that in a future one to help you folks move to this repo in RAPIDS, since those tests will quite obviously pass.

@jrhemstad
Copy link
Collaborator Author

Looking at the diff made me realize that you're also enabling the variable templates for the traits, but not the tests around the variable templates, like here: https://github.com/NVIDIA/libcudacxx/blob/main/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_abstract.pass.cpp#L24-L29.

Thanks for noticing that. I didn't see the guards in the tests themselves. I updated them all to test in C++14 and they all passed.

@griwes
Copy link
Collaborator

griwes commented Oct 28, 2020

Kicked off internal CI at CL 29255931.

@griwes
Copy link
Collaborator

griwes commented Oct 29, 2020

It looks like MSVC doesn't accept __is_aggregate in its C++14 mode. You'll need to make its definition go away there. (It seems to me that guarding the definition of _LIBCUDACXX_IS_AGGREGATE in libcxx/include/__config with a language version check should be enough, but I have no Windows dev environment set up to confirm.)

@brycelelbach brycelelbach added this to the 1.4.0 milestone Oct 29, 2020
@jrhemstad
Copy link
Collaborator Author

It looks like MSVC doesn't accept __is_aggregate in its C++14 mode. You'll need to make its definition go away there. (It seems to me that guarding the definition of _LIBCUDACXX_IS_AGGREGATE in libcxx/include/__config with a language version check should be enough, but I have no Windows dev environment set up to confirm.)

I added a MSVC version check for >19.14.

@griwes
Copy link
Collaborator

griwes commented Oct 29, 2020

Re-running internal CI, CL 29261259.

@griwes
Copy link
Collaborator

griwes commented Oct 30, 2020

std/language.support/support.types/byte.pass.cpp passes unexpectedly on GCC in C++14 mode which causes a fail. Other than that it looks like we are good to go. Can you fix its keywords and remove the merge commit that's still in this PR? I'll merge it then.

trxcllnt and others added 15 commits October 30, 2020 16:11
@trxcllnt @jrhemstad
backport c++17 type_traits to c++14
845e93b
@trxcllnt @jrhemstad
backport c++17 std::byte to c++14
e64aa03
@jrhemstad
Make is_nothrow_convertible available in C++14.
3750860
@jrhemstad
Make remove_cvref available in c++14.
15e3a10
@jrhemstad
backport type_identity.
953bf39
@jrhemstad
Backport is_bounded_array.
490fe9f
@jrhemstad
Backport type_traits tests.
40a0305
@jrhemstad
Comment closing endif.
6567675
@jrhemstad
Update include guard in tests to allow testing in c++14.
0b9e15c
@griwes @jrhemstad
Force C++11 mode in nvcc in the check for the pipeline path.
d7895fb 
Bug 200646774
@brycelelbach @jrhemstad
Docs:
ce4c544 
- Shard the Jekyll metadata from `_config.yml` into each of the individual
  markdown files.
- Copy-edit, reformat, and add links to synchronization library documentation.
- Fill in docs for `<utility>`.
- Remove development model section until we get around to it.
@jrhemstad
Guard is_aggregate for >C++14 in MSVC.
814cb13
@jrhemstad
Fix endif comment.
ea3c285
@jrhemstad
Guard is_aggregate with MSVC version instead of C++ version.
186c8ef
@jrhemstad
correct endif comment.
2f212ba
@jrhemstad jrhemstad force-pushed the type-traits-backport branch from 7bc8681 to 30cdf58 Compare October 30, 2020 21:11
@griwes
Copy link
Collaborator

griwes commented Oct 30, 2020

Clarification: it's the libc++ version of the test that's XPASSing, in libcxx/test, not the libcu++ one.

@jrhemstad jrhemstad force-pushed the type-traits-backport branch from 30cdf58 to 2f212ba Compare October 30, 2020 21:16
@jrhemstad
Use unsupported instead of xfail in bytes.pass.cpp upstream libc++ test.
21a186b 
I backported std::byte to work in C++14. Because this
test used XFAIL, the test now unexpectedly passes
instead of fails. I updated to use UNSUPPORTED
instead to avoid an unexpected pass.
@jrhemstad jrhemstad mentioned this pull request Oct 30, 2020
Merged
3 tasks
@jrhemstad jrhemstad closed this Oct 30, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@griwes griwes griwes approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.4.0
Development

Successfully merging this pull request may close these issues.
4 participants
@jrhemstad @griwes @brycelelbach @trxcllnt