pack double and float more size efficient #1018
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
check also for nan and numeric limits
redboltz
reviewed
Jun 3, 2022
include/msgpack/v1/pack.hpp
Outdated
| @@ -1138,6 +1138,18 @@ inline packer<Stream>& packer<Stream>::pack_unsigned_long_long(unsigned long lon | |||
| template <typename Stream> | |||
| inline packer<Stream>& packer<Stream>::pack_float(float d) | |||
| { | |||
| if (d == d) { // check for nan | |||
There was a problem hiding this comment.
Suggested change
| if (d == d) { // check for nan | |
| if(d == d) { // check for nan |
include/msgpack/v1/pack.hpp
Outdated
| @@ -1138,6 +1138,18 @@ inline packer<Stream>& packer<Stream>::pack_unsigned_long_long(unsigned long lon | |||
| template <typename Stream> | |||
| inline packer<Stream>& packer<Stream>::pack_float(float d) | |||
| { | |||
| if (d == d) { // check for nan | |||
| // compare d to limits::max() to avoid undefined behaviour | |||
| if (d >= 0 && d <= std::numeric_limits<uint64_t>::max() && d == uint64_t(d)) { | |||
There was a problem hiding this comment.
Suggested change
| if (d >= 0 && d <= std::numeric_limits<uint64_t>::max() && d == uint64_t(d)) { | |
| if(d >= 0 && d <= std::numeric_limits<uint64_t>::max() && d == uint64_t(d)) { |
include/msgpack/v1/pack.hpp
Outdated
| if (d >= 0 && d <= std::numeric_limits<uint64_t>::max() && d == uint64_t(d)) { | ||
| pack_imp_uint64(uint64_t(d)); | ||
| return *this; | ||
|
|
There was a problem hiding this comment.
Please erase empty line above.
include/msgpack/v1/pack.hpp
Outdated
| pack_imp_uint64(uint64_t(d)); | ||
| return *this; | ||
|
|
||
| } else if (d >= std::numeric_limits<int64_t>::min() && d == int64_t(d)) { |
There was a problem hiding this comment.
Suggested change
| } else if (d >= std::numeric_limits<int64_t>::min() && d == int64_t(d)) { | |
| } else if(d >= std::numeric_limits<int64_t>::min() && d == int64_t(d)) { |
include/msgpack/v1/pack.hpp
Outdated
Comment on lines
1164
to
1175
| if (d == d) { // check for nan | ||
| // compare d to limits::max() to avoid undefined behaviour | ||
| if (d >= 0 && d <= std::numeric_limits<uint64_t>::max() && d == uint64_t(d)) { | ||
| pack_imp_uint64(uint64_t(d)); | ||
| return *this; | ||
|
|
||
| } else if (d >= std::numeric_limits<int64_t>::min() && d == int64_t(d)) { | ||
| pack_imp_int64(int64_t(d)); | ||
| return *this; | ||
| } | ||
| } | ||
|
|
There was a problem hiding this comment.
Please apply the same fix as float.
|
It seems that CI reports warnings (as errors). Could you fix this? |
Codecov Report
@@ Coverage Diff @@
## cpp_master #1018 +/- ##
==============================================
+ Coverage 85.56% 85.60% +0.04%
==============================================
Files 79 79
Lines 5009 5023 +14
==============================================
+ Hits 4286 4300 +14
Misses 723 723 |
update pack_double and pack_float to avoid warnings
|
Thank you for updating. Great work! |
speleo3
added a commit
to speleo3/mmtf-c
that referenced
this pull request
Oct 6, 2022
Floats may be stored as integers, and msgpack-cpp does that proactively since version 4.1.2, see msgpack/msgpack-c#1018
speleo3
added a commit
to speleo3/pymol-open-source
that referenced
this pull request
Oct 6, 2022
Floats may be stored as integers in msgpack, and msgpack-cpp does that proactively since version 4.1.2. That broke the `unitCell` angle round trip in `testSave_symmetry__mmtf`. See also: rcsb/mmtf-c#35 msgpack/msgpack-c#1018
JarrettSJohnson
pushed a commit
to schrodinger/pymol-open-source
that referenced
this pull request
Oct 6, 2022
Floats may be stored as integers in msgpack, and msgpack-cpp does that proactively since version 4.1.2. That broke the `unitCell` angle round trip in `testSave_symmetry__mmtf`. See also: rcsb/mmtf-c#35 msgpack/msgpack-c#1018
StevenMaude
added a commit
to sensiblecodeio/pdf2msgpack
that referenced
this pull request
Aug 4, 2023
This is v4.1.1 We can't update beyond v4.1.1 because of what is a breaking change for pdf2msgpack: msgpack/msgpack-c#1018
speleo3
added a commit
to rcsb/mmtf-c
that referenced
this pull request
Sep 26, 2023
Floats may be stored as integers, and msgpack-cpp does that proactively since version 4.1.2, see msgpack/msgpack-c#1018
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.
PR for issue #1017