Skip to content

Commit

Permalink
Merge branch 'lookup-and-rangecheck' of https://github.com/xiangxiecr…
Browse files Browse the repository at this point in the history
…ypto/verifiable-FHE into lookup-and-rangecheck
  • Loading branch information
tnyuzg committed Sep 7, 2024
2 parents b98e9ab + a026810 commit d1eb676
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 44 deletions.
54 changes: 26 additions & 28 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,10 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [windows-latest, macos-latest, ubuntu-latest]
# os: [ubuntu-latest, windows-latest, macos-latest]
os: [ubuntu-latest]
name: Test
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
# We intentionally do not use lfs: true here, instead using the caching method to save LFS bandwidth.
Expand Down Expand Up @@ -111,33 +114,28 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-latest, macos-latest, ubuntu-latest]
steps:
- uses: actions/checkout@v4

- name: restore cache
uses: Swatinem/rust-cache@v2
with:
save-if: ${{ github.event_name != 'merge_group' }}

- name: install msrv toolchain
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUST_MIN_VER }}

- name: install cargo-hack
uses: taiki-e/install-action@v2
with:
tool: cargo-hack

- name: cargo check
run: cargo hack check ${{ env.RUST_MIN_VER_PKGS }} --each-feature --skip nightly --optional-deps

doc:
name: cargo doc
# NOTE: We don't have any platform specific docs in this workspace, so we only run on Ubuntu.
# If we get per-platform docs (win/macos/linux/wasm32/..) then doc jobs should match that.
runs-on: ubuntu-latest
platform:
- os: ubuntu-latest
target: x86_64-unknown-linux-gnu
command: build

# - os: windows-latest
# target: x86_64-pc-windows-msvc
# command: build

# - os: macos-latest
# target: x86_64-apple-darwin
# command: build

# - os: ubuntu-latest
# target: aarch64-unknown-linux-gnu
# command: build

- os: macos-latest
target: aarch64-apple-darwin
command: build
name: Build
runs-on: ${{ matrix.platform.os }}
steps:
- uses: actions/checkout@v4

Expand Down
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ rand_distr = "0.4"
rand_core = "0.6.4"
rand_chacha = "0.3.1"
rayon = "1"
bytemuck = { version = "1.17", features = ["derive"] }
bytemuck = { version = "1.13", features = ["derive"] }
merlin = { version = "3.0.0", default-features = false }
serde = { version = "1.0", features = ["derive"] }
bincode = "1.3"
itertools = "0.13"
sha2 = { version = "0.10" }
itertools = "0.13.0"
sha2 = { version = "0.10.7", features = ["asm"] }

criterion = "0.5"

Expand Down
17 changes: 4 additions & 13 deletions zkp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,7 @@ rand_distr = { workspace = true }
rand_chacha = { workspace = true }
num-traits = { workspace = true }
once_cell = { workspace = true }
serde = { workspace = true }
itertools = { workspace = true }

[dev-dependencies]
criterion = { workspace = true }

[[bench]]
name = "range_check_lookup"
harness = false

[[bench]]
name = "range_check_bit_decomposition"
harness = false
rand_distr = { workspace = true }
rand_chacha = "0.3.1"
serde = {workspace = true}
itertools = "0.12.1"

0 comments on commit d1eb676

Please sign in to comment.