-
Notifications
You must be signed in to change notification settings - Fork 308
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
Provide element-wise math functions for floats #1042
Conversation
Looks to be in the right direction, that's nice - I'll be a bit unreachable during the summer, but back in a bit |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks like a great PR, as the lack of these operations has been a major pain point for me trying to implement mathematical algorithms.
It's unfortunate the maintainers haven't had a chance to look at this, ideally there would be a few more people able to review PRs. In any case I'm giving some feedback in the hope that it might speed up the ultimate review process once it happens.
Some miscellaneous thoughts:
- Could you actually implement the
Float
trait for an ndarray? You seem to have provided implementations for most if not all of the required methods. - I assume we would need (or at least, should have) some tests for all of the new methods, and not just
clip
- Although these are not part of the
Float
trait, do you think there is room forgreater_than
,less_than
, and the rest of the family for a scalar operand? iearray![1, 2].greater_than(1)
->array![false, true]
src/impl_float_maths.rs
Outdated
@@ -0,0 +1,157 @@ | |||
//! Element-wise methods for ndarray |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All the other code files seem to have the Apache license and copyright statement at the top. I suppose one of those is needed here.
The main reason is that these methods need to import
I'm willing to add more useful methods as you mentioned, if they are compatible with the requirements. |
Ah yes you're right, implementing
What requirements are you talking about? |
Oh, I mean the functions should be implemented with the |
Looks like that won't be a problem if we don't bother with actually implementing |
Additionally, I think there should be add a #[must_use = "method returns a new array and does not mutate the original value"] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This mostly looks good to me. I added a few comments.
Long-term, I think we should make these methods lazy instead of eager, but that will require a decent amount of additional infrastructure. There seems to be a moderate demand for these methods today, so it's probably worth including the eager versions now and changing them to lazy in a later breaking change.
src/impl_float_maths.rs
Outdated
/// assert_eq!(a.clip(8., 1.), array![1., 1., 1., 1., 1., 1., 1., 1., 1., 1.]); | ||
/// assert_eq!(a.clip(3., 6.), array![3., 3., 3., 3., 4., 5., 6., 6., 6., 6.]); | ||
/// ``` | ||
pub fn clip(&self, min: A, max: A) -> Array<A, D> { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd hold off including this until num-traits
adds a clamp
method to Float
. In particular, the behavior should be the same as std
's clamp
methods (on f32
, f64
, and Ord
) in the presence of NaNs and the min > max
case.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Performance is also an issue and the current implementation would probably need tweaking
I haven't added my general perspective, I think. We have avoided these methods in the past for two reasons:
|
src/impl_float_maths.rs
Outdated
fn powi(i32) | ||
|
||
/// Float power of each element. | ||
fn powf(A) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Food for thought: This method is "powf(array, scalar)". We need a separate name for powf(array, array)
. What should the name of that method be? I don't mean that we should have that in this PR, but sometime down the line.
Could we not solve this by having in-place versions of all these methods? It would also force users to decide which one they need in each case instead of always picking the simpler code. Should be fairly simple to add by updating the macros. |
In-place versions are just a band aid, not a solution . Actual solutions does most the needed operations in one pass, not one by one (how do you handle chaining operations). I'd avoid in-place methods for now. 🙂 |
Is this to do with loading the elements into CPU registers or something? Because otherwise I can't see why processing the whole array in one pass and then again in a second pass is any worse than applying the same transformations to each element sequentially. I would have thought that avoiding a new array allocation would dwarf this optimisation. In any case if that would be a significant optimisation could we do some kind of chain pattern like: arr.chain().powi(2).exp().eval() |
With contemporary systems, moving the data from memory into caches and registers often dominates the runtime of numerical algorithms depending on how many arithmetic operations they perform relative to each memory access. Fusing operations from multiple passes into a single pass increases this ratio and thereby the likelihood of efficient CPU utilisation. |
@multimeric Good that we got to explain processor caches. This will help a lot when working with Rust. Your point about eval is close to what I'm thinking of too. Not in particular that we do that here, but that we lay the groundwork for a "language", where you can call Then a shim/layer can be inserted that has the same or sameish interface but lazy evaluation, like in your sketch! Both the in-place instead of allocating and batching operations instead of one per loop ideas are important here. There's some prior art around this. I don't know eigen (C++) very well but I think they do something like this. And the very old Rust experiment algebloat also tried this. |
It would be exciting if
I don't know what kinds of techniques can be used in Rust to make this possible. We also don't want to make the type system situation too hard to understand, unfortunately. |
Okay I'll move the discussion of this lazy eval into a new issue for now so we can get this PR merged. |
I wanted to say, if you can, please use rebase and not merges when updating the PR branch, we don't want merges crossing. There are of course exceptions to every rule, but in general this is what we want to do. I've force-pushed the branch with a rebase, since it was easy to do. (This is possible when maintainers are allowed to edit.) Feel free to squash together commits to clean up history if you'd like. |
In the spirit of issue #415 we might prefer to expose these methods with a bound like |
Just to add this also solves #1047 I think. |
fwiw, no rush, this PR is waiting on updates from the author |
Any update of this PR? |
This would be a very useful addition. Is there any more work that needs to happen so this can be merged? |
Looking forward to this... |
What's the status in this PR? Would be great to have all those methods implemented... |
Same as last time: "this PR is waiting on updates from the author" Since this MR has been discussed and reviewed, I wouldn't mind merging it if @KmolYuan updates this MR. |
Sure, if the API & docs are accepted, I agree to merge this PR. |
@KmolYuan What about the clamp is stable since 1.50 and the minimum Rust version in this project is 1.51. |
Thanks, I'll use |
@adamreichold Any idea why the CI tests fail? You repaired them in the last merged MR, so I would have thought that the tests would still be ok. It's still using 1.51 and the errors are not related to this MR. |
These errors are due to new lints introduced into rustc itself since then. It does check |
Thank you @KmolYuan, and sorry for the delay. |
I am sorry to reopen this discussion. For some reason, my project doesn't pick up the merged changes. I would expect a version bump that tells cargo to update the package. I could probably refer to the commit specifically, but that doesn't feel right. |
I assume you are using a Git dependency against our default |
I did If there isn't an easy fix for that, I'll implement the changes myself. But that won't be as sophisticated, and I'd like to make use of the PR. But I also don't want to waste your time with my issues (which are not related to ndarray specifically). |
I think you want to use something like [patch.crates-io]
ndarray = { git = "https://github.com/rust-ndarray/ndarray" } to manage the indirect dependencies, c.f. https://doc.rust-lang.org/cargo/reference/overriding-dependencies.html |
Closes #992.
Add a new module
impl_float_maths
understd
feature.If there are missing anything you like, or something should not comes here, any suggestion are welcome!
For integer things, maybe it belongs to another PR.
Three types of operators done by three local macros:
boolean_op
: Returns a boolean array, join them together by*_any
methods.unary_op
: Unary functions.binary_op
: Binary functions.New functions I made:
is_nan
.is_infinite_any
.x*x
shortcut.clip
, done by usingFloat::max
andFloat::min
. This function has a doctest, copied from Numpy.Ported functions: (here is the
Float
trait)