Clean up gating on concurrent feature
#140
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dalcde
approved these changes
Nov 25, 2023
hoodmane
reviewed
Nov 27, 2023
| impl<I: IndexedParallelIterator> MaybeIndexedParallelIterator for I {} | ||
|
|
||
| impl<I: IntoParallelIterator> MaybeIntoParallelIterator for I { | ||
| fn maybe_into_par_iter(self) -> Self::Iter { |
There was a problem hiding this comment.
I think maybe_par should stay together since this unconditionally is turning it into a maybe parallel iterator:
Suggested change
| fn maybe_into_par_iter(self) -> Self::Iter { | |
| fn into_maybe_par_iter(self) -> Self::Iter { |
There was a problem hiding this comment.
Ah that's a good point, I'll fix that. Thanks!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I was able to contain all the gates in a new
maybe-rayoncrate. When concurrency is enabled, it is a thin wrapper around the rayon API, or at least the part of the API that the rest of the codebase uses. When it is disabled, the crate provides the same API except that the implementation is completely serial, and doesn't depend on rayon.Every feature gate is now either in
maybe-rayon, in some comments in thesteenrodexample, or in theresolve_concurrentbenchmark.By unifying some parts of the code, it happens that serial operations now needlessly communicate via mpsc channels. Also, secondary computations now unconditionally compute intermediates upfront, but that's simply a reordering of the same operations as previously. As far as I can tell, performance is unchanged.