Skip to content

Commit

Permalink
more compiler fix
Browse files Browse the repository at this point in the history
  • Loading branch information
zac-williamson committed Jul 17, 2023
1 parent 65441ba commit 1fde990
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ void compute_permutation_grand_products(std::shared_ptr<typename Flavor::Proving

constexpr size_t NUM_RELATIONS = std::tuple_size<GrandProductRelations>{};
barretenberg::constexpr_for<0, NUM_RELATIONS, 1>([&]<size_t i>() {
using PermutationRelation = std::tuple_element<i, GrandProductRelations>::type;
using PermutationRelation = typename std::tuple_element<i, GrandProductRelations>::type;

// Assign the grand product polynomial to the relevant std::span member of `full_polynomials` (and its shift)
// For example, for UltraPermutationRelation, this will be `full_polynomials.z_perm`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,10 @@ template <class FF> class ProverLibraryTests : public testing::Test {

// Method 1: Compute z_perm using 'compute_grand_product_polynomial' as the prover would in practice
constexpr size_t PERMUTATION_RELATION_INDEX = 0;
using LHS = std::tuple_element<PERMUTATION_RELATION_INDEX, typename Flavor::GrandProductRelations>::type;
using LHS =
typename std::tuple_element<PERMUTATION_RELATION_INDEX, typename Flavor::GrandProductRelations>::type;
if constexpr (Flavor::NUM_WIRES == 4) {
using RHS = sumcheck::UltraPermutationRelation<FF>;
using RHS = typename sumcheck::UltraPermutationRelation<FF>;
static_assert(std::same_as<LHS, RHS>);
permutation_library::compute_permutation_grand_product<Flavor, RHS>(
proving_key->circuit_size, prover_polynomials, params);
Expand Down Expand Up @@ -296,7 +297,7 @@ template <class FF> class ProverLibraryTests : public testing::Test {

// Method 1: Compute z_lookup using the prover library method
constexpr size_t LOOKUP_RELATION_INDEX = 1;
using LHS = std::tuple_element<LOOKUP_RELATION_INDEX, typename Flavor::GrandProductRelations>::type;
using LHS = typename std::tuple_element<LOOKUP_RELATION_INDEX, typename Flavor::GrandProductRelations>::type;
using RHS = sumcheck::LookupRelation<FF>;
static_assert(std::same_as<LHS, RHS>);
permutation_library::compute_permutation_grand_product<Flavor, RHS>(
Expand Down

0 comments on commit 1fde990

Please sign in to comment.