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.

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

chore: update Boost.Histogram to 1.77 #594

Merged
merged 2 commits into from
Sep 9, 2021
Merged

chore: update Boost.Histogram to 1.77 #594

merged 2 commits into from
Sep 9, 2021

Conversation

henryiii
Copy link
Member

@henryiii henryiii commented Jun 25, 2021

Adapting to the new count implementation.

@github-actions github-actions bot added the needs changelog Might need a changelog entry label Jun 25, 2021
@henryiii henryiii marked this pull request as ready for review August 18, 2021 19:14
Comment on lines 37 to 42
using _atomic_type = histogram<vector_axis_variant, storage::atomic_int64>;

template <>
struct has_operator_rdiv_impl<_atomic_type, _atomic_type> : detect_base {
using type = mp11::mp_false;
};
Copy link
Member Author

@henryiii henryiii Aug 18, 2021

Choose a reason for hiding this comment

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

@HDembinski I'm having to work around the fact that count claims to have a division operator, but the implementation does not actually have one, so it reports true here then fails to compile. Same issue as the one fixed for * in boostorg/histogram#328. Though * used to work with thread_safe, and / used to be not implemented, I believe.

Copy link
Member

Choose a reason for hiding this comment

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

Sorry again, I am getting sloppy. I am developing a fix here:
boostorg/histogram#329
Could you please use that version instead of 1.77?

Copy link
Member Author

Choose a reason for hiding this comment

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

Sure, thanks!

Copy link
Member Author

Choose a reason for hiding this comment

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

Could you sync master with develop in Boost.Histogram? I can use master, develop has been force pushed to in the past, which breaks boost-histogram if we were pointing at a commit that doesn't exist anymore and gets cleaned up.

Otherwise this works.

Copy link
Member

Choose a reason for hiding this comment

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

Sorry, I missed that, I merged develop into master now.

@henryiii henryiii changed the title chore: update boost-histogram chore: update Boost.Histogram to 1.77 Aug 18, 2021
@henryiii
Copy link
Member Author

After this is merged I can test boostorg/histogram#323.

@henryiii
Copy link
Member Author

henryiii commented Sep 3, 2021

@HDembinski this is just waiting for the develop commit to land in master.

I've started working on the accumulator branch but it will take a bit to get it to work, not ready yet.

@HDembinski
Copy link
Member

@HDembinski this is just waiting for the develop commit to land in master.

Sorry, it is done now.

@henryiii henryiii enabled auto-merge (squash) September 9, 2021 02:26
@henryiii henryiii merged commit a78d54c into develop Sep 9, 2021
@henryiii henryiii deleted the henryiii/up/bh branch September 9, 2021 02:33
henryiii added a commit to amangoel185/boost-histogram that referenced this pull request Sep 9, 2021
@henryiii henryiii removed the needs changelog Might need a changelog entry label Sep 13, 2021
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