Skip to content

Commit

Permalink
Update channel and change group_by to chunk_by
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewmilson committed Mar 14, 2024
1 parent 6e9da20 commit 00596e4
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
components: rustfmt
toolchain: nightly-2024-01-04
toolchain: nightly-2024-03-10
- uses: Swatinem/rust-cache@v2
- name: Install cargo-llvm-cov
uses: taiki-e/install-action@cargo-llvm-cov
- name: Generate code coverage
run: cargo +nightly-2024-01-04 llvm-cov --codecov --output-path codecov.json
run: cargo +nightly-2024-03-10 llvm-cov --codecov --output-path codecov.json
env:
RUSTFLAGS: "-C target-feature=+avx512f"
- name: Upload coverage to Codecov
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[toolchain]
channel = "nightly-2024-01-04"
channel = "nightly-2024-03-10"
4 changes: 2 additions & 2 deletions src/core/fri.rs
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,7 @@ impl<H: Hasher<NativeType = u8>> FriLayerVerifier<H> {
let mut all_subline_evals = Vec::new();

// Group queries by the subline they reside in.
for subline_queries in queries.group_by(|a, b| a >> FOLD_STEP == b >> FOLD_STEP) {
for subline_queries in queries.chunk_by(|a, b| a >> FOLD_STEP == b >> FOLD_STEP) {
let subline_start = (subline_queries[0] >> FOLD_STEP) << FOLD_STEP;
let subline_end = subline_start + (1 << FOLD_STEP);

Expand Down Expand Up @@ -816,7 +816,7 @@ impl<B: FriOps, H: Hasher<NativeType = u8>> FriLayerProver<B, H> {

// Group queries by the subline they reside in.
// TODO(andrew): Explain what a "subline" is at the top of the module.
for query_group in queries.group_by(|a, b| a >> FOLD_STEP == b >> FOLD_STEP) {
for query_group in queries.chunk_by(|a, b| a >> FOLD_STEP == b >> FOLD_STEP) {
let subline_start = (query_group[0] >> FOLD_STEP) << FOLD_STEP;
let subline_end = subline_start + (1 << FOLD_STEP);

Expand Down
9 changes: 4 additions & 5 deletions src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
#![feature(
array_chunks,
iter_array_chunks,
exact_size_is_empty,
get_many_mut,
int_roundings,
is_sorted,
iter_array_chunks,
new_uninit,
slice_group_by,
stdsimd,
get_many_mut,
int_roundings
stdarch_x86_avx512
)]
pub mod commitment_scheme;
pub mod core;
Expand Down

0 comments on commit 00596e4

Please sign in to comment.