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.

Sign up for GitHub

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

Jump to bottom

Support fast_float 7.0.0 #136

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Support fast_float 7.0.0 #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
10207f0
When fetching fast_float, use version 7.0.0
musicinmybrain Nov 22, 2024
385721e
Fix compatibility with `chars_format` in fast_float version 7
musicinmybrain Nov 21, 2024
4c38f4e
Avoid having to name a type for or’ing `chars_format` flags
musicinmybrain Nov 22, 2024
8c53bc3
Do not attempt to benchmark fast_float with long double
musicinmybrain Nov 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion benchmark/runtime/float/repeated.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,4 +210,3 @@ static void scan_float_repeated_fastfloat(benchmark::State& state)
}
BENCHMARK_TEMPLATE(scan_float_repeated_fastfloat, float);
BENCHMARK_TEMPLATE(scan_float_repeated_fastfloat, double);
BENCHMARK_TEMPLATE(scan_float_repeated_fastfloat, long double);
1 change: 0 additions & 1 deletion benchmark/runtime/float/single.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,4 +185,3 @@ static void scan_float_single_fastfloat(benchmark::State& state)
}
BENCHMARK_TEMPLATE(scan_float_single_fastfloat, float);
BENCHMARK_TEMPLATE(scan_float_single_fastfloat, double);
BENCHMARK_TEMPLATE(scan_float_single_fastfloat, long double);
2 changes: 1 addition & 1 deletion cmake/dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ else ()
FetchContent_Declare(
fast_float
GIT_REPOSITORY https://github.com/fastfloat/fast_float.git
GIT_TAG v6.1.6
GIT_TAG v7.0.0
GIT_SHALLOW TRUE
)

Expand Down
10 changes: 6 additions & 4 deletions src/scn/impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,15 +721,17 @@ scan_expected<std::ptrdiff_t> fast_float_fallback(impl_init_data<CharT> data,
struct fast_float_impl_base : impl_base {
fast_float::chars_format get_flags() const
{
unsigned format_flags{};
fast_float::chars_format format_flags{};
if ((m_options & float_reader_base::allow_fixed) != 0) {
format_flags |= fast_float::fixed;
format_flags =
static_cast<fast_float::chars_format>(format_flags | fast_float::chars_format::fixed);
}
if ((m_options & float_reader_base::allow_scientific) != 0) {
format_flags |= fast_float::scientific;
format_flags =
static_cast<fast_float::chars_format>(format_flags | fast_float::chars_format::scientific);
}

return static_cast<fast_float::chars_format>(format_flags);
return format_flags;
}
};

Expand Down