[stdlib] Roundable trait with ndigits param in the round operation and Round to nearest even logic #2752

msaelices · 2024-05-19T13:51:26Z

Add Roundable.__round__(ndigits) method
Implement the method in all the types that adhere to Roundable
Round to the next even number when the diff is exactly 0.5, recommended way in IEEE 754, which also Python adheres to.
Tests

Signed-off-by: Manuel Saelices <[email protected]>

…missing types Signed-off-by: Manuel Saelices <[email protected]>

Signed-off-by: Manuel Saelices <[email protected]>

As the round() and Roundable trait was moved previously there Signed-off-by: Manuel Saelices <[email protected]>

laszlokindrat

Thanks for working on this! I have a few concerns with the Int/IntLiteral stuff, but looking good otherwise!

stdlib/src/builtin/float_literal.mojo

stdlib/src/builtin/math.mojo

stdlib/src/builtin/int_literal.mojo

stdlib/test/builtin/test_float_literal.mojo

laszlokindrat · 2024-05-27T21:18:54Z

@msaelices Are you still working on this? This is a very nice improvement, and I would love to bring it in!

Signed-off-by: Manuel Saelices <[email protected]>

…at runtime Signed-off-by: Manuel Saelices <[email protected]>

msaelices · 2024-05-27T21:43:23Z

@msaelices Are you still working on this? This is a very nice improvement, and I would love to bring it in!

Sure. I'm working on this now.

Signed-off-by: Manuel Saelices <[email protected]>

msaelices · 2024-05-27T22:25:02Z

@laszlokindrat could you please take another look?

Signed-off-by: Manuel Saelices <[email protected]>

laszlokindrat

Great progress, thanks for addressing my reviews! It seems you could split this up into several independent patches for the different types. That would make it easier to land these. Then the patch for the trait could be added after they all landed, and it should be simple. It's up to you, but I think it would speed things up :)

stdlib/src/builtin/float_literal.mojo

laszlokindrat · 2024-05-28T10:51:14Z

stdlib/src/builtin/int_literal.mojo

@@ -269,6 +269,47 @@ struct IntLiteral(
 """
 return self

+ @always_inline("nodebug")
+ fn __divmod__(self, rhs: Self) -> Tuple[Self, Self]:


non-blocking: maybe in a followup: Maybe it's time for a DivModable trait or something. Then we could hook these up into the builtin divmod function.

laszlokindrat · 2024-05-28T10:54:49Z

stdlib/src/builtin/simd.mojo

@@ -1142,6 +1142,18 @@ struct SIMD[type: DType, size: Int = simdwidthof[type]()](
 """
 return llvm_intrinsic["llvm.round", Self, has_side_effect=False](self)

+ @always_inline("nodebug")
+ fn __round__(self, ndigits: Int) -> Self:


non-blocking: SIMD might benefit from having a separate overload that does this elementwise between two vectors. Might get tricky for the different dtypes, though. Anyway, just a followup idea.

stdlib/src/builtin/int_literal.mojo

msaelices · 2024-05-28T21:37:49Z

Great progress, thanks for addressing my reviews! It seems you could split this up into several independent patches for the different types. That would make it easier to land these. Then, the patch for the trait could be added after they all landed, and it should be simple. It's up to you, but I think it would speed things up :)

I think I prefer not to split the PR. It would be harder for me to cherry-pick all the commits or redo my work and track all of them.

Signed-off-by: Manuel Saelices <[email protected]>

msaelices · 2024-05-28T22:05:01Z

@laszlokindrat Could you please TAL? 🏓

laszlokindrat

Very nice, thank you for working on this!

laszlokindrat · 2024-05-29T10:27:05Z

!sync

stdlib/src/builtin/int_literal.mojo

Signed-off-by: Manuel Saelices <[email protected]>

laszlokindrat · 2024-05-30T10:32:43Z

!sync

laszlokindrat · 2024-05-30T15:06:49Z

!sync

modularbot · 2024-05-30T15:54:05Z

✅🟣 This contribution has been merged 🟣✅

Your pull request has been merged to the internal upstream Mojo sources. It will be reflected here in the Mojo repository on the nightly branch during the next Mojo nightly release, typically within the next 24-48 hours.

We use Copybara to merge external contributions, click here to learn more.

…peration and Round to nearest even logic (#40794) [External] [stdlib] Roundable trait with ndigits param in the round operation and Round to nearest even logic * Add `Roundable.__round__(ndigits)` method * Implement the method in all the types that adhere to `Roundable` * Round to the next even number when the diff is exactly 0.5, recommended way in [IEEE 754](https://en.wikipedia.org/wiki/IEEE_754), which also Python adheres to. * Tests --------- Co-authored-by: Manuel Saelices <[email protected]> Closes #2752 MODULAR_ORIG_COMMIT_REV_ID: f3349ff968cdb519bd505427a6aea8afe1ae1bb0

modularbot · 2024-05-31T13:03:05Z

Landed in 4edfc69! Thank you for your contribution 🎉

…peration and Round to nearest even logic (#40794) [External] [stdlib] Roundable trait with ndigits param in the round operation and Round to nearest even logic * Add `Roundable.__round__(ndigits)` method * Implement the method in all the types that adhere to `Roundable` * Round to the next even number when the diff is exactly 0.5, recommended way in [IEEE 754](https://en.wikipedia.org/wiki/IEEE_754), which also Python adheres to. * Tests --------- Co-authored-by: Manuel Saelices <[email protected]> Closes #2752 MODULAR_ORIG_COMMIT_REV_ID: f3349ff968cdb519bd505427a6aea8afe1ae1bb0

msaelices added 3 commits May 19, 2024 11:27

[stdlib] Fix the x.5 edge cases to have the same outcome as Python

9783f91

Signed-off-by: Manuel Saelices <[email protected]>

[stdlib] Add __round__(ndigits) method to Roundable and implement in …

ffc062d

…missing types Signed-off-by: Manuel Saelices <[email protected]>

[stdlib] Fix IntLiteral.__round__. Implement __divmod__. Tests

c19f147

Signed-off-by: Manuel Saelices <[email protected]>

msaelices requested a review from a team as a code owner May 19, 2024 13:51

msaelices mentioned this pull request May 19, 2024

Roundable trait with ndigits param in the round operation #2656

Closed

msaelices added 3 commits May 19, 2024 15:54

[stdlib] __rount__() implementation for int and SIMD

c104384

Signed-off-by: Manuel Saelices <[email protected]>

[stdlib] Micro optimization in the __round__() logic

a4171cb

Signed-off-by: Manuel Saelices <[email protected]>

[stdlib] Round to the next even number when the diff is exactly 0.5

7c5f6d2

Signed-off-by: Manuel Saelices <[email protected]>

msaelices changed the title ~~Roundable trait with ndigits param in the round operation~~ Roundable trait with ndigits param in the round operation and Round to nearest even logic May 19, 2024

[stdlib] Moved the __round__(ndigits) logic to math.mojo

f2e5554

As the round() and Roundable trait was moved previously there Signed-off-by: Manuel Saelices <[email protected]>

laszlokindrat self-assigned this May 20, 2024

laszlokindrat changed the title ~~Roundable trait with ndigits param in the round operation and Round to nearest even logic~~ [stdlib] Roundable trait with ndigits param in the round operation and Round to nearest even logic May 20, 2024

Merge branch 'nightly' into roundable-with-ndigits-param-v2

5ebe155

laszlokindrat reviewed May 22, 2024

View reviewed changes

msaelices added 4 commits May 27, 2024 23:33

Merge branch 'nightly' into roundable-with-ndigits-param-v2

cb8fc6c

Signed-off-by: Manuel Saelices <[email protected]>

Merge branch 'nightly' into roundable-with-ndigits-param-v2

8b73b2d

[stdlib] Rename minus_one to neg_one to be consistent

c6cf50f

Signed-off-by: Manuel Saelices <[email protected]>

[stdlib] Declare ndigits as Int instead of IntLiteral to allow using …

9de5acc

…at runtime Signed-off-by: Manuel Saelices <[email protected]>

msaelices added 2 commits May 28, 2024 00:05

[stdlib] Implement the round to nearest even in the __round__() method

beacc16

Signed-off-by: Manuel Saelices <[email protected]>

[stdlib] Support for negative ndigits in FloatLiteral.__round__(ndigits)

1657b19

Signed-off-by: Manuel Saelices <[email protected]>

msaelices requested a review from laszlokindrat May 27, 2024 22:24

Merge branch 'nightly' into roundable-with-ndigits-param-v2

1a18c00

Signed-off-by: Manuel Saelices <[email protected]>

laszlokindrat reviewed May 28, 2024

View reviewed changes

laszlokindrat mentioned this pull request May 28, 2024

[stdlib] Improvements to pow and Powable #2867

Open

6 tasks

msaelices added 2 commits May 28, 2024 23:48

[stdlib] Simplify FloatLiteral.__round__() logic by early return

5b61c0c

Signed-off-by: Manuel Saelices <[email protected]>

[stdlib] Tests for the IntLiteral.__divmod__() method

78e4ee5

Signed-off-by: Manuel Saelices <[email protected]>

[stdlib] Tests IntLiteral.__round__(ndigits) and Int.__round__(ndigits)

6039f4e

Signed-off-by: Manuel Saelices <[email protected]>

msaelices force-pushed the roundable-with-ndigits-param-v2 branch from 9247ca1 to 6039f4e Compare May 28, 2024 22:03

msaelices requested a review from laszlokindrat May 28, 2024 22:04

Merge branch 'nightly' into roundable-with-ndigits-param-v2

4ec23e4

laszlokindrat approved these changes May 29, 2024

View reviewed changes

modularbot added the imported-internally Signals that a given pull request has been imported internally. label May 29, 2024

laszlokindrat reviewed May 29, 2024

View reviewed changes

stdlib/src/builtin/int_literal.mojo Outdated Show resolved Hide resolved

msaelices added 2 commits May 29, 2024 17:19

[stdlib] Simplify IntLiteral.__round__() logic to make CI happy

e6f55f2

Signed-off-by: Manuel Saelices <[email protected]>

Merge branch 'nightly' into roundable-with-ndigits-param-v2

6dd48d7

modularbot added the merged-internally Indicates that this pull request has been merged internally label May 30, 2024

msaelices closed this May 30, 2024

msaelices deleted the roundable-with-ndigits-param-v2 branch May 30, 2024 20:41

modularbot added the merged-externally Merged externally in public mojo repo label May 31, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[stdlib] Roundable trait with ndigits param in the round operation and Round to nearest even logic #2752

[stdlib] Roundable trait with ndigits param in the round operation and Round to nearest even logic #2752

msaelices commented May 19, 2024 •

edited

laszlokindrat left a comment

laszlokindrat commented May 27, 2024 •

edited

msaelices commented May 27, 2024

msaelices commented May 27, 2024

laszlokindrat left a comment

laszlokindrat May 28, 2024

laszlokindrat May 28, 2024

msaelices commented May 28, 2024

msaelices commented May 28, 2024

laszlokindrat left a comment

laszlokindrat commented May 29, 2024

laszlokindrat commented May 30, 2024

laszlokindrat commented May 30, 2024

modularbot commented May 30, 2024

modularbot commented May 31, 2024

[stdlib] Roundable trait with ndigits param in the round operation and Round to nearest even logic #2752

[stdlib] Roundable trait with ndigits param in the round operation and Round to nearest even logic #2752

Conversation

msaelices commented May 19, 2024 • edited

laszlokindrat left a comment

Choose a reason for hiding this comment

laszlokindrat commented May 27, 2024 • edited

msaelices commented May 27, 2024

msaelices commented May 27, 2024

laszlokindrat left a comment

Choose a reason for hiding this comment

laszlokindrat May 28, 2024

Choose a reason for hiding this comment

laszlokindrat May 28, 2024

Choose a reason for hiding this comment

msaelices commented May 28, 2024

msaelices commented May 28, 2024

laszlokindrat left a comment

Choose a reason for hiding this comment

laszlokindrat commented May 29, 2024

laszlokindrat commented May 30, 2024

laszlokindrat commented May 30, 2024

modularbot commented May 30, 2024

modularbot commented May 31, 2024

msaelices commented May 19, 2024 •

edited

laszlokindrat commented May 27, 2024 •

edited