Skip to content

fix FRI benchmark and compilation with recent compilers #50

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

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

fix FRI benchmark and compilation with recent compilers #50

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
fd71541
size_t is in cstddef
kwantam Dec 10, 2021
0d3b773
fix dummy_oracle::evaluated_contents
kwantam Dec 10, 2021
de28c6a
fix cli option parsing in FRI profiling executable
kwantam Dec 10, 2021
49bbb1e
update benchmark to upstream head
kwantam Dec 10, 2021
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
2 changes: 1 addition & 1 deletion depends/benchmark
Open in desktop
Submodule benchmark updated 141 files
1 change: 1 addition & 0 deletions libiop/algebra/utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#ifndef LIBIOP_ALGEBRA_UTILS_HPP_
#define LIBIOP_ALGEBRA_UTILS_HPP_

#include <cstddef>
#include <cstdint>
#include <vector>

Expand Down
26 changes: 13 additions & 13 deletions libiop/profiling/instrument_fri_snark.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,23 @@

#ifndef CPPDEBUG
bool process_prover_command_line(const int argc, const char** argv, options &options,
std::size_t localization_parameter,
std::size_t num_localization_steps,
std::size_t num_oracles,
std::size_t num_interactive_repetitions,
std::size_t num_query_repetitions)
std::size_t *localization_parameter,
std::size_t *num_localization_steps,
std::size_t *num_oracles,
std::size_t *num_interactive_repetitions,
std::size_t *num_query_repetitions)
{
namespace po = boost::program_options;

try
{
po::options_description desc = gen_options(options);
desc.add_options()
("localization_parameter", po::value<std::size_t>(&localization_parameter)->default_value(2), "Only used when num_localization_steps is 0")
("num_localization_steps", po::value<std::size_t>(&num_localization_steps)->default_value(0))
("num_oracles", po::value<std::size_t>(&num_oracles)->default_value(1))
("num_interactive_repetitions", po::value<std::size_t>(&num_interactive_repetitions)->default_value(1))
("num_query_repetitions", po::value<std::size_t>(&num_query_repetitions)->default_value(64));
("localization_parameter", po::value<std::size_t>(localization_parameter)->default_value(2), "Only used when num_localization_steps is 0")
("num_localization_steps", po::value<std::size_t>(num_localization_steps)->default_value(0))
("num_oracles", po::value<std::size_t>(num_oracles)->default_value(1))
("num_interactive_repetitions", po::value<std::size_t>(num_interactive_repetitions)->default_value(1))
("num_query_repetitions", po::value<std::size_t>(num_query_repetitions)->default_value(64));

po::variables_map vm;
po::store(po::parse_command_line(argc, argv, desc), vm);
Expand Down Expand Up @@ -157,9 +157,9 @@ int main(int argc, const char * argv[])
libff::UNUSED(argv);

#else
if (!process_prover_command_line(argc, argv, default_vals, localization_parameter,
num_interactive_repetitions, num_query_repetitions,
num_localization_steps, num_oracles))
if (!process_prover_command_line(argc, argv, default_vals, &localization_parameter,
&num_interactive_repetitions, &num_query_repetitions,
&num_localization_steps, &num_oracles))
{
return 1;
}
Expand Down
5 changes: 3 additions & 2 deletions libiop/protocols/encoded/dummy_protocol.tcc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ std::shared_ptr<std::vector<FieldT>> dummy_oracle<FieldT>::evaluated_contents(
}

std::shared_ptr<std::vector<FieldT>> result = std::make_shared<std::vector<FieldT>>();
result->reserve(constituent_oracle_evaluations[0]->size());
for (size_t i = 0; i < result->size(); ++i)
const auto result_size = constituent_oracle_evaluations[0]->size();
result->reserve(result_size);
for (size_t i = 0; i < result_size; ++i)
{
result->emplace_back(FieldT::zero());
}
Expand Down