ci: update version string in docs

.github/workflows/benchmarks.yml

@@ -6,15 +6,22 @@ on:
         description: "Test scenario tags"
 
 jobs:
-
-  bench_poseidon:
-    permissions:
-      contents: read
+  bench_elgamal:
     runs-on: self-hosted
     steps:
       - uses: actions/checkout@v4
+      - uses: actions-rs/toolchain@v1
         with:
-          persist-credentials: false
+          toolchain: nightly-2023-06-27
+          override: true
+          components: rustfmt, clippy
+      - name: Bench elgamal
+        run: cargo bench --verbose --bench elgamal
+
+  bench_poseidon:
+    runs-on: self-hosted
+    steps:
+      - uses: actions/checkout@v4
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly-2023-06-27
@@ -24,14 +31,10 @@ jobs:
         run: cargo bench --verbose --bench poseidon
 
   bench_einsum_accum_matmul:
-    permissions:
-      contents: read
     runs-on: self-hosted
     needs: [bench_poseidon]
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly-2023-06-27
@@ -41,14 +44,10 @@ jobs:
         run: cargo bench --verbose --bench accum_einsum_matmul
 
   bench_accum_matmul_relu:
-    permissions:
-      contents: read
     runs-on: self-hosted
     needs: [bench_poseidon]
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly-2023-06-27
@@ -58,14 +57,10 @@ jobs:
         run: cargo bench --verbose --bench accum_matmul_relu
 
   bench_accum_matmul_relu_overflow:
-    permissions:
-      contents: read
     runs-on: self-hosted
     needs: [bench_poseidon]
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly-2023-06-27
@@ -75,14 +70,10 @@ jobs:
         run: cargo bench --verbose --bench accum_matmul_relu_overflow
 
   bench_relu:
-    permissions:
-      contents: read
     runs-on: self-hosted
     needs: [bench_poseidon]
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly-2023-06-27
@@ -92,14 +83,10 @@ jobs:
         run: cargo bench --verbose --bench relu
 
   bench_accum_dot:
-    permissions:
-      contents: read
     runs-on: self-hosted
     needs: [bench_poseidon]
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly-2023-06-27
@@ -109,14 +96,10 @@ jobs:
         run: cargo bench --verbose --bench accum_dot
 
   bench_accum_conv:
-    permissions:
-      contents: read
     runs-on: self-hosted
     needs: [bench_poseidon]
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly-2023-06-27
@@ -126,14 +109,10 @@ jobs:
         run: cargo bench --verbose --bench accum_conv
 
   bench_accum_sumpool:
-    permissions:
-      contents: read
     runs-on: self-hosted
     needs: [bench_poseidon]
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly-2023-06-27
@@ -143,14 +122,10 @@ jobs:
         run: cargo bench --verbose --bench accum_sumpool
 
   bench_pairwise_add:
-    permissions:
-      contents: read
     runs-on: self-hosted
     needs: [bench_poseidon]
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly-2023-06-27
@@ -160,14 +135,10 @@ jobs:
         run: cargo bench --verbose --bench pairwise_add
 
   bench_accum_sum:
-    permissions:
-      contents: read
     runs-on: self-hosted
     needs: [bench_poseidon]
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly-2023-06-27
@@ -177,14 +148,10 @@ jobs:
         run: cargo bench --verbose --bench accum_sum
 
   bench_pairwise_pow:
-    permissions:
-      contents: read
     runs-on: self-hosted
     needs: [bench_poseidon]
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly-2023-06-27

.github/workflows/engine.yml

@@ -15,16 +15,11 @@ defaults:
     working-directory: .
 jobs:
   publish-wasm-bindings:
-    permissions:
-      contents: read
-      packages: write
     name: publish-wasm-bindings
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/')
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly-2024-07-18
@@ -56,7 +51,7 @@ jobs:
         run: |
           echo '{
             "name": "@ezkljs/engine",
-            "version": "${RELEASE_TAG}",
+            "version": "${{ github.ref_name }}",
             "dependencies": {
               "@types/json-bigint": "^1.0.1",
               "json-bigint": "^1.0.0"
@@ -189,26 +184,21 @@ jobs:
 
 
   in-browser-evm-ver-publish:
-    permissions:
-      contents: read
-      packages: write
     name: publish-in-browser-evm-verifier-package
     needs: [publish-wasm-bindings]
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/')
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - name: Update version in package.json
         shell: bash
         env:
           RELEASE_TAG: ${{ github.ref_name }}
         run: |
-          sed -i "s|\"version\": \".*\"|\"version\": \"${RELEASE_TAG}\"|" in-browser-evm-verifier/package.json
+          sed -i "s|\"version\": \".*\"|\"version\": \"${{ github.ref_name }}\"|" in-browser-evm-verifier/package.json
       - name: Prepare tag and fetch package integrity
         run: |
-          CLEANED_TAG=${RELEASE_TAG} # Get the tag from ref_name
+          CLEANED_TAG=${{ github.ref_name }} # Get the tag from ref_name
           CLEANED_TAG="${CLEANED_TAG#v}" # Remove leading 'v'
           echo "CLEANED_TAG=${CLEANED_TAG}" >> $GITHUB_ENV # Set it as an environment variable for later steps
           ENGINE_INTEGRITY=$(npm view @ezkljs/engine@$CLEANED_TAG dist.integrity)

.github/workflows/large-tests.yml

@@ -6,13 +6,9 @@ on:
         description: "Test scenario tags"
 jobs:
   large-tests:
-    permissions:
-      contents: read
     runs-on: kaiju
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly-2024-07-18

.github/workflows/pypi-gpu.yml

@@ -18,17 +18,12 @@ defaults:
 jobs:
 
   linux:
-    permissions:
-      contents: read
-      packages: write
     runs-on: GPU
     strategy:
       matrix:
         target: [x86_64]
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: actions/setup-python@v4
         with:
           python-version: 3.12

.github/workflows/pypi.yml

@@ -16,8 +16,6 @@ defaults:
 
 jobs:
   macos:
-    permissions:
-      contents: read
     runs-on: macos-latest
     if: startsWith(github.ref, 'refs/tags/')
     strategy:
@@ -25,8 +23,6 @@ jobs:
         target: [x86_64, universal2-apple-darwin]
     steps:
       - uses: actions/checkout@v4
-        with: 
-          persist-credentials: false
       - uses: actions/setup-python@v4
         with:
           python-version: 3.12
@@ -49,13 +45,6 @@ jobs:
           components: rustfmt, clippy
 
       - name: Build wheels
-        if: matrix.target == 'universal2-apple-darwin'
-        uses: PyO3/maturin-action@v1
-        with:
-          target: ${{ matrix.target }}
-          args: --release --out dist --features python-bindings
-      - name: Build wheels
-        if: matrix.target == 'x86_64'
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.target }}
@@ -73,8 +62,6 @@ jobs:
           path: dist
 
   windows:
-    permissions:
-      contents: read
     runs-on: windows-latest
     if: startsWith(github.ref, 'refs/tags/')
     strategy:
@@ -82,8 +69,6 @@ jobs:
         target: [x64, x86]
     steps:
       - uses: actions/checkout@v4
-        with: 
-          persist-credentials: false
       - uses: actions/setup-python@v4
         with:
           python-version: 3.12
@@ -122,8 +107,6 @@ jobs:
           path: dist
 
   linux:
-    permissions:
-      contents: read
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/')
     strategy:
@@ -131,8 +114,6 @@ jobs:
         target: [x86_64]
     steps:
       - uses: actions/checkout@v4
-        with: 
-          persist-credentials: false
       - uses: actions/setup-python@v4
         with:
           python-version: 3.12
@@ -239,8 +220,6 @@ jobs:
   #       path: dist
 
   musllinux:
-    permissions:
-      contents: read
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/')
     strategy:
@@ -249,8 +228,6 @@ jobs:
           - x86_64-unknown-linux-musl
     steps:
       - uses: actions/checkout@v4
-        with: 
-          persist-credentials: false
       - uses: actions/setup-python@v4
         with:
           python-version: 3.12
@@ -306,8 +283,6 @@ jobs:
           path: dist
 
   musllinux-cross:
-    permissions:
-      contents: read
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/')
     strategy:
@@ -317,8 +292,6 @@ jobs:
             arch: aarch64
     steps:
       - uses: actions/checkout@v4
-        with: 
-          persist-credentials: false
       - uses: actions/setup-python@v4
         with:
           python-version: 3.12
@@ -395,15 +368,12 @@ jobs:
           packages-dir: ./
 
   doc-publish:
-    permissions:
-      contents: read
     name: Trigger ReadTheDocs Build
     runs-on: ubuntu-latest
     needs: pypi-publish
     steps:
       - uses: actions/checkout@v4
-        with: 
-          persist-credentials: false
+
       - name: Trigger RTDs build
         uses: dfm/rtds-action@v1
         with:

.github/workflows/release.yml

@@ -10,9 +10,6 @@ on:
       - "*"
 jobs:
   create-release:
-    permissions:
-      contents: read
-      packages: write
     name: create-release
     runs-on: ubuntu-22.04
     if: startsWith(github.ref, 'refs/tags/')
@@ -36,9 +33,6 @@ jobs:
           tag_name: ${{ env.EZKL_VERSION }}
 
   build-release-gpu:
-    permissions:
-      contents: read
-      packages: write
     name: build-release-gpu
     needs: ["create-release"]
     runs-on: GPU
@@ -56,9 +50,6 @@ jobs:
           components: rustfmt, clippy
       - name: Checkout repo
         uses: actions/checkout@v4
-        with: 
-          persist-credentials: false
-
 
       - name: Get release version from tag
         shell: bash
@@ -100,10 +91,6 @@ jobs:
           asset_content_type: application/octet-stream
 
   build-release:
-    permissions:
-      contents: read
-      packages: write
-      issues: write
     name: build-release
     needs: ["create-release"]
     runs-on: ${{ matrix.os }}
@@ -145,8 +132,6 @@ jobs:
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
-        with: 
-          persist-credentials: false
 
       - name: Get release version from tag
         shell: bash
@@ -196,18 +181,14 @@ jobs:
           echo "target flag is: ${{ env.TARGET_FLAGS }}"
           echo "target dir is: ${{ env.TARGET_DIR }}"
 
-      - name: Build release binary (no asm or metal) 
-        if: matrix.build != 'linux-gnu' && matrix.build != 'macos-aarch64'
+      - name: Build release binary (no asm)
+        if: matrix.build != 'linux-gnu'
         run: ${{ env.CARGO }} build --release ${{ env.TARGET_FLAGS }} -Z sparse-registry
 
       - name: Build release binary (asm)
         if: matrix.build == 'linux-gnu'
         run: ${{ env.CARGO }} build --release ${{ env.TARGET_FLAGS }} -Z sparse-registry --features asm
 
-      - name: Build release binary (metal)
-        if: matrix.build == 'macos-aarch64'
-        run: ${{ env.CARGO }} build --release ${{ env.TARGET_FLAGS }} -Z sparse-registry --features macos-metal
-
       - name: Strip release binary
         if: matrix.build != 'windows-msvc' && matrix.build != 'linux-aarch64'
         run: strip "target/${{ matrix.target }}/release/ezkl"

.github/workflows/rust.yml

@@ -19,31 +19,11 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
-
-  fr-age-test:
-    permissions:
-      contents: read
-    runs-on: large-self-hosted
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: nightly-2024-07-18
-          override: true
-          components: rustfmt, clippy
-      - name: fr age Mock
-        run: cargo test --release --verbose tests::large_mock_::large_tests_6_expects -- --include-ignored
-
   build:
-    permissions:
-      contents: read
     runs-on: ubuntu-latest
+
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly-2024-07-18
@@ -53,13 +33,9 @@ jobs:
         run: cargo build --verbose
 
   docs:
-    permissions:
-      contents: read
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly-2024-07-18
@@ -69,13 +45,9 @@ jobs:
         run: cargo doc --verbose
 
   library-tests:
-    permissions:
-      contents: read
     runs-on: ubuntu-latest-32-cores
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly-2024-07-18
@@ -99,8 +71,6 @@ jobs:
   #     ENABLE_ICICLE_GPU: true
   #   steps:
   #     - uses: actions/checkout@v4
-        # with:
-        #   persist-credentials: false
   #     - uses: actions-rs/toolchain@v1
   #       with:
   #         toolchain: nightly-2024-07-18
@@ -131,13 +101,9 @@ jobs:
   #       run: cargo nextest run conv_relu_col_ultra_overflow --no-capture --features icicle -- --include-ignored
 
   ultra-overflow-tests_og-lookup:
-    permissions:
-      contents: read
     runs-on: non-gpu
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly-2024-07-18
@@ -168,13 +134,9 @@ jobs:
         run: cargo nextest run  --release conv_relu_col_ultra_overflow --no-capture --no-default-features --features ezkl -- --include-ignored
 
   ultra-overflow-tests:
-    permissions:
-      contents: read
     runs-on: non-gpu
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly-2024-07-18
@@ -205,13 +167,9 @@ jobs:
         run: cargo nextest run  --release conv_relu_col_ultra_overflow --no-capture -- --include-ignored
 
   model-serialization:
-    permissions:
-      contents: read
     runs-on: ubuntu-latest-16-cores
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly-2024-07-18
@@ -225,13 +183,9 @@ jobs:
         run: cargo nextest run native_tests::tests::model_serialization_different_binaries_  --test-threads 1
 
   wasm32-tests:
-    permissions:
-      contents: read
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly-2024-07-18
@@ -254,14 +208,10 @@ jobs:
         run: wasm-pack test --chrome --headless -- -Z build-std="panic_abort,std" --features web
 
   mock-proving-tests:
-    permissions:
-      contents: read
     runs-on: non-gpu
     needs: [build, library-tests, docs, python-tests, python-integration-tests]
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly-2024-07-18
@@ -321,14 +271,10 @@ jobs:
         run: cargo nextest run --release --verbose tests::mock_fixed_params_ --test-threads 32
 
   prove-and-verify-evm-tests:
-    permissions:
-      contents: read
     runs-on: non-gpu
     needs: [build, library-tests, docs, python-tests, python-integration-tests]
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly-2024-07-18
@@ -339,8 +285,6 @@ jobs:
           crate: cargo-nextest
           locked: true
       - uses: actions/checkout@v3
-        with:
-          persist-credentials: false
       - name: Use pnpm 8
         uses: pnpm/action-setup@v2
         with:
@@ -405,50 +349,11 @@ jobs:
       - name: KZG prove and verify tests (EVM + hashed outputs)
         run: cargo nextest run --release --verbose tests_evm::kzg_evm_hashed_output_prove_and_verify --test-threads 1
 
-  # prove-and-verify-tests-metal:
-  #   permissions:
-  #     contents: read
-  #   runs-on: macos-13
-  #   # needs: [build, library-tests, docs]
-  #   steps:
-  #     - uses: actions/checkout@v4
-  #       with:
-  #         persist-credentials: false
-  #     - uses: actions-rs/toolchain@v1
-  #       with:
-  #         toolchain: nightly-2024-07-18
-  #         override: true
-  #         components: rustfmt, clippy
-  #     - uses: jetli/wasm-pack-action@v0.4.0
-  #       with:
-  #         # Pin to version 0.12.1
-  #         version: 'v0.12.1'
-  #     - name: Add rust-src
-  #       run: rustup component add rust-src --toolchain nightly-2024-07-18
-  #     - uses: actions/checkout@v3
-  #       with:
-  #         persist-credentials: false
-  #     - name: Use pnpm 8
-  #       uses: pnpm/action-setup@v2
-  #       with:
-  #         version: 8
-  #     - uses: baptiste0928/cargo-install@v1
-  #       with:
-  #         crate: cargo-nextest
-  #         locked: true
-  #     - name: KZG prove and verify tests (public outputs)
-  #       run: cargo nextest run --release --features macos-metal --verbose tests::kzg_prove_and_verify_::t --no-capture
-
-
   prove-and-verify-tests:
-    permissions:
-      contents: read
     runs-on: non-gpu
     needs: [build, library-tests, docs]
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly-2024-07-18
@@ -464,8 +369,6 @@ jobs:
       - name: Add rust-src
         run: rustup component add rust-src --toolchain nightly-2024-07-18-x86_64-unknown-linux-gnu
       - uses: actions/checkout@v3
-        with:
-          persist-credentials: false
       - name: Use pnpm 8
         uses: pnpm/action-setup@v2
         with:
@@ -528,8 +431,6 @@ jobs:
   #     ENABLE_ICICLE_GPU: true
   #   steps:
   #     - uses: actions/checkout@v4
-        # with:
-        #   persist-credentials: false
   #     - uses: actions-rs/toolchain@v1
   #       with:
   #         toolchain: nightly-2024-07-18
@@ -560,14 +461,10 @@ jobs:
   #       run: cargo nextest run --release --verbose tests::kzg_prove_and_verify_hashed --features icicle  --test-threads 1
 
   prove-and-verify-mock-aggr-tests:
-    permissions:
-      contents: read
     runs-on: self-hosted
     needs: [build, library-tests, docs, python-tests, python-integration-tests]
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly-2024-07-18
@@ -586,8 +483,6 @@ jobs:
   #     ENABLE_ICICLE_GPU: true
   #   steps:
   #     - uses: actions/checkout@v4
-        # with:
-        #   persist-credentials: false
   #     - uses: actions-rs/toolchain@v1
   #       with:
   #         toolchain: nightly-2024-07-18
@@ -601,14 +496,10 @@ jobs:
   #       run: cargo nextest run --verbose tests_aggr::kzg_aggr_prove_and_verify_  --features icicle --test-threads 1 -- --include-ignored
 
   prove-and-verify-aggr-tests:
-    permissions:
-      contents: read
     runs-on: large-self-hosted
     needs: [build, library-tests, docs, python-tests, python-integration-tests]
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly-2024-07-18
@@ -622,14 +513,10 @@ jobs:
         run: cargo nextest run --release --verbose tests_aggr::kzg_aggr_prove_and_verify_  --test-threads 4 -- --include-ignored
 
   prove-and-verify-aggr-evm-tests:
-    permissions:
-      contents: read
     runs-on: large-self-hosted
     needs: [build, library-tests, docs, python-tests, python-integration-tests]
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly-2024-07-18
@@ -647,14 +534,10 @@ jobs:
         run: cargo nextest run  --release --verbose tests_evm::kzg_evm_aggr_prove_and_verify_::t --test-threads 4 -- --include-ignored
 
   examples:
-    permissions:
-      contents: read
     runs-on: ubuntu-latest-32-cores
     needs: [build, library-tests, docs]
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly-2024-07-18
@@ -668,14 +551,10 @@ jobs:
         run: cargo nextest run --release tests_examples
 
   python-tests:
-    permissions:
-      contents: read
     runs-on: non-gpu
     needs: [build, library-tests, docs]
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: actions/setup-python@v4
         with:
           python-version: "3.12"
@@ -698,14 +577,10 @@ jobs:
         run: source .env/bin/activate; pip install pytest-asyncio; pytest -vv
 
   accuracy-measurement-tests:
-    permissions:
-      contents: read
-    runs-on: non-gpu
+    runs-on: ubuntu-latest-32-cores
     needs: [build, library-tests, docs, python-tests, python-integration-tests]
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: actions/setup-python@v4
         with:
           python-version: "3.12"
@@ -732,8 +607,6 @@ jobs:
         run: source .env/bin/activate; cargo nextest run --release --verbose tests::resources_accuracy_measurement_public_outputs_
 
   python-integration-tests:
-    permissions:
-      contents: read
     runs-on: large-self-hosted
     services:
       # Label used to access the service container
@@ -755,8 +628,6 @@ jobs:
           - 5432:5432
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - uses: actions/setup-python@v4
         with:
           python-version: "3.11"
@@ -806,13 +677,9 @@ jobs:
         # run: source .env/bin/activate; cargo nextest run py_tests::tests::reusable_
 
   ios-integration-tests:
-      permissions:
-        contents: read
       runs-on: macos-latest
       steps:
         - uses: actions/checkout@v4
-          with:
-            persist-credentials: false
         - uses: actions-rs/toolchain@v1
           with:
             toolchain: nightly-2024-07-18
@@ -826,15 +693,11 @@ jobs:
           run: CARGO_BUILD_TARGET=aarch64-apple-darwin RUSTUP_TOOLCHAIN=nightly-2024-07-18-aarch64-apple-darwin cargo test --test ios_integration_tests --features ios-bindings-test --no-default-features
 
   swift-package-tests:
-      permissions:
-        contents: read
       runs-on: macos-latest
       needs: [ios-integration-tests]
 
       steps:
         - uses: actions/checkout@v4
-          with:
-            persist-credentials: false
         - uses: actions-rs/toolchain@v1
           with:
             toolchain: nightly-2024-07-18
@@ -852,15 +715,6 @@ jobs:
             rm -rf ezkl-swift-package/Sources/EzklCoreBindings
             cp -r build/EzklCoreBindings ezkl-swift-package/Sources/
 
-        - name: Copy Test Files
-          run: |
-            rm -rf ezkl-swift-package/Tests/EzklAssets/
-            mkdir -p ezkl-swift-package/Tests/EzklAssets/
-            cp tests/assets/kzg ezkl-swift-package/Tests/EzklAssets/kzg.srs
-            cp tests/assets/input.json ezkl-swift-package/Tests/EzklAssets/input.json
-            cp tests/assets/model.compiled ezkl-swift-package/Tests/EzklAssets/network.ezkl
-            cp tests/assets/settings.json ezkl-swift-package/Tests/EzklAssets/settings.json
-
         - name: Set up Xcode environment
           run: |
             sudo xcode-select -s /Applications/Xcode.app/Contents/Developer

.github/workflows/static-analysis.yml

@@ -1,33 +0,0 @@
-name: Static Analysis
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-jobs:
-  analyze:
-    permissions:
-      contents: read
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: nightly-2024-07-18
-          override: true
-          components: rustfmt, clippy
-
-      # Run Zizmor static analysis
-
-      - name: Install Zizmor
-        run: cargo install --locked zizmor
-
-      - name: Run Zizmor Analysis
-        run: zizmor .
-
-
-    

.github/workflows/swift-pm.yml

@@ -9,24 +9,18 @@ on:
 
 jobs:
   build-and-update:
-    permissions:
-      contents: read
-      packages: write
     runs-on: macos-latest
     env:
       EZKL_SWIFT_PACKAGE_REPO: github.com/zkonduit/ezkl-swift-package.git
-      RELEASE_TAG: ${{ github.ref_name }}
 
     steps:
       - name: Checkout EZKL
         uses: actions/checkout@v3
-        with: 
-          persist-credentials: false
 
       - name: Extract TAG from github.ref_name
         run: |
           # github.ref_name is provided by GitHub Actions and contains the tag name directly.
-          TAG="${RELEASE_TAG}"
+          TAG="${{ github.ref_name }}"
           echo "Original TAG: $TAG"
           # Remove leading 'v' if present to match the Swift Package Manager version format.
           NEW_TAG=${TAG#v}
@@ -53,8 +47,7 @@ jobs:
 
       - name: Copy Test Files
         run: |
-          rm -rf ezkl-swift-package/Tests/EzklAssets/
-          mkdir -p ezkl-swift-package/Tests/EzklAssets/
+          rm -rf ezkl-swift-package/Tests/EzklAssets/*
           cp tests/assets/kzg ezkl-swift-package/Tests/EzklAssets/kzg.srs
           cp tests/assets/input.json ezkl-swift-package/Tests/EzklAssets/input.json
           cp tests/assets/model.compiled ezkl-swift-package/Tests/EzklAssets/network.ezkl
@@ -112,6 +105,7 @@ jobs:
           cd ezkl-swift-package
           git add Sources/EzklCoreBindings Tests/EzklAssets
           git commit -m "Automatically updated EzklCoreBindings for EZKL"
+          
           if ! git push origin; then
             echo "::error::Failed to push changes to ${{ env.EZKL_SWIFT_PACKAGE_REPO }}. Please ensure that EZKL_PORTER_TOKEN has the correct permissions."
             exit 1
@@ -121,6 +115,7 @@ jobs:
         run: |
           cd ezkl-swift-package
           source $GITHUB_ENV
+          
           # Tag the latest commit on the current branch
           if git rev-parse "$TAG" >/dev/null 2>&1; then
             echo "Tag $TAG already exists locally. Skipping tag creation."

.github/workflows/tagging.yml

@@ -12,8 +12,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
       - name: Bump version and push tag
         id: tag_version
         uses: mathieudutour/github-tag-action@v6.2

Cargo.lock

@@ -1835,16 +1835,6 @@ dependencies = [
  "syn 2.0.90",
 ]
 
-[[package]]
-name = "env_filter"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
-dependencies = [
- "log",
- "regex",
-]
-
 [[package]]
 name = "env_logger"
 version = "0.10.2"
@@ -1858,19 +1848,6 @@ dependencies = [
  "termcolor",
 ]
 
-[[package]]
-name = "env_logger"
-version = "0.11.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0"
-dependencies = [
- "anstream",
- "anstyle",
- "env_filter",
- "humantime",
- "log",
-]
-
 [[package]]
 name = "equivalent"
 version = "1.0.1"
@@ -1946,7 +1923,7 @@ dependencies = [
  "console_error_panic_hook",
  "criterion 0.5.1",
  "ecc",
- "env_logger 0.10.2",
+ "env_logger",
  "ethabi",
  "foundry-compilers",
  "gag",
@@ -1954,7 +1931,7 @@ dependencies = [
  "halo2_gadgets",
  "halo2_proofs",
  "halo2_solidity_verifier",
- "halo2curves 0.7.0 (git+https://github.com/privacy-scaling-explorations/halo2curves?rev=b753a832e92d5c86c5c997327a9cf9de86a18851)",
+ "halo2curves 0.7.0",
  "hex",
  "indicatif",
  "instant",
@@ -1962,6 +1939,7 @@ dependencies = [
  "lazy_static",
  "log",
  "maybe-rayon",
+ "metal",
  "mimalloc",
  "mnist",
  "num",
@@ -2416,14 +2394,14 @@ dependencies = [
 [[package]]
 name = "halo2_proofs"
 version = "0.3.0"
-source = "git+https://github.com/zkonduit/halo2#bf9d0057a82443be48c4779bbe14961c18fb5996#bf9d0057a82443be48c4779bbe14961c18fb5996"
+source = "git+https://github.com/zkonduit/halo2#ee4e1a09ebdb1f79f797685b78951c6034c430a6#ee4e1a09ebdb1f79f797685b78951c6034c430a6"
 dependencies = [
  "bincode",
  "blake2b_simd",
- "env_logger 0.10.2",
+ "env_logger",
  "ff",
  "group",
- "halo2curves 0.7.0 (git+https://github.com/privacy-scaling-explorations/halo2curves?rev=b753a832e92d5c86c5c997327a9cf9de86a18851)",
+ "halo2curves 0.7.0",
  "icicle-bn254",
  "icicle-core",
  "icicle-cuda-runtime",
@@ -2431,7 +2409,6 @@ dependencies = [
  "lazy_static",
  "log",
  "maybe-rayon",
- "mopro-msm",
  "rand_chacha",
  "rand_core 0.6.4",
  "rustc-hash 2.0.0",
@@ -2517,36 +2494,6 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "halo2curves"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d380afeef3f1d4d3245b76895172018cfb087d9976a7cabcd5597775b2933e07"
-dependencies = [
- "blake2",
- "digest 0.10.7",
- "ff",
- "group",
- "halo2derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "hex",
- "lazy_static",
- "num-bigint",
- "num-integer",
- "num-traits",
- "pairing",
- "pasta_curves",
- "paste",
- "rand 0.8.5",
- "rand_core 0.6.4",
- "rayon",
- "serde",
- "serde_arrays",
- "sha2",
- "static_assertions",
- "subtle",
- "unroll",
-]
-
 [[package]]
 name = "halo2curves"
 version = "0.7.0"
@@ -2556,7 +2503,7 @@ dependencies = [
  "digest 0.10.7",
  "ff",
  "group",
- "halo2derive 0.1.0 (git+https://github.com/privacy-scaling-explorations/halo2curves?rev=b753a832e92d5c86c5c997327a9cf9de86a18851)",
+ "halo2derive",
  "hex",
  "lazy_static",
  "num-bigint",
@@ -2576,20 +2523,6 @@ dependencies = [
  "unroll",
 ]
 
-[[package]]
-name = "halo2derive"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdb99e7492b4f5ff469d238db464131b86c2eaac814a78715acba369f64d2c76"
-dependencies = [
- "num-bigint",
- "num-integer",
- "num-traits",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "halo2derive"
 version = "0.1.0"
@@ -3350,8 +3283,7 @@ dependencies = [
 [[package]]
 name = "metal"
 version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21"
+source = "git+https://github.com/gfx-rs/metal-rs#0e1918b34689c4b8cd13a43372f9898680547ee9"
 dependencies = [
  "bitflags 2.5.0",
  "block",
@@ -3422,28 +3354,6 @@ dependencies = [
  "byteorder",
 ]
 
-[[package]]
-name = "mopro-msm"
-version = "0.1.0"
-source = "git+https://github.com/zkonduit/metal-msm-gpu-acceleration.git#be5f647b1a6c1a6ea9024390744a2b4d87f5d002"
-dependencies = [
- "bincode",
- "env_logger 0.11.6",
- "halo2curves 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "instant",
- "itertools 0.13.0",
- "lazy_static",
- "log",
- "metal",
- "objc",
- "once_cell",
- "rand 0.8.5",
- "rayon",
- "serde",
- "thiserror",
- "walkdir",
-]
-
 [[package]]
 name = "native-tls"
 version = "0.2.11"

Cargo.toml

@@ -91,6 +91,7 @@ pyo3-async-runtimes = { git = "https://github.com/PyO3/pyo3-async-runtimes", ver
 pyo3-log = { version = "0.12.0", default-features = false, optional = true }
 tract-onnx = { git = "https://github.com/sonos/tract/", rev = "37132e0397d0a73e5bd3a8615d932dabe44f6736", default-features = false, optional = true }
 tabled = { version = "0.12.0", optional = true }
+metal = { git = "https://github.com/gfx-rs/metal-rs", optional = true }
 objc = { version = "0.2.4", optional = true }
 mimalloc = { version = "0.1", optional = true }
 pyo3-stub-gen = { version = "0.6.0", optional = true }
@@ -276,14 +277,13 @@ icicle = ["halo2_proofs/icicle_gpu"]
 empty-cmd = []
 no-banner = []
 no-update = []
-macos-metal = ["halo2_proofs/macos"]
-ios-metal = ["halo2_proofs/ios"]
+
 
 [patch.'https://github.com/zkonduit/halo2']
-halo2_proofs = { git = "https://github.com/zkonduit/halo2#bf9d0057a82443be48c4779bbe14961c18fb5996", package = "halo2_proofs" }
+halo2_proofs = { git = "https://github.com/zkonduit/halo2#ee4e1a09ebdb1f79f797685b78951c6034c430a6", package = "halo2_proofs" }
 
 [patch.'https://github.com/zkonduit/halo2#0654e92bdf725fd44d849bfef3643870a8c7d50b']
-halo2_proofs = { git = "https://github.com/zkonduit/halo2#bf9d0057a82443be48c4779bbe14961c18fb5996", package = "halo2_proofs" }
+halo2_proofs = { git = "https://github.com/zkonduit/halo2#ee4e1a09ebdb1f79f797685b78951c6034c430a6", package = "halo2_proofs" }
 
 [patch.crates-io]
 uniffi_testing = { git = "https://github.com/ElusAegis/uniffi-rs", branch = "feat/testing-feature-build-fix" }

docs/python/src/conf.py

@@ -1,7 +1,7 @@
 import ezkl
 
 project = 'ezkl'
-release = '0.0.0'
+release = '17.1.0'
 version = release
 
 

examples/notebooks/mnist_gan_proof_splitting.ipynb

@@ -453,18 +453,18 @@
             "outputs": [],
             "source": [
                 "# now mock aggregate the proofs\n",
-                "# proofs = []\n",
-                "# for i in range(3):\n",
-                "#     proof_path = os.path.join('proof_split_'+str(i)+'.json')\n",
-                "#     proofs.append(proof_path)\n",
+                "proofs = []\n",
+                "for i in range(3):\n",
+                "    proof_path = os.path.join('proof_split_'+str(i)+'.json')\n",
+                "    proofs.append(proof_path)\n",
                 "\n",
-                "# ezkl.mock_aggregate(proofs, logrows=26, split_proofs = True)"
+                "ezkl.mock_aggregate(proofs, logrows=23, split_proofs = True)"
             ]
         }
     ],
     "metadata": {
         "kernelspec": {
-            "display_name": ".env",
+            "display_name": "ezkl",
             "language": "python",
             "name": "python3"
         },
@@ -478,7 +478,7 @@
             "name": "python",
             "nbconvert_exporter": "python",
             "pygments_lexer": "ipython3",
-            "version": "3.12.7"
+            "version": "3.12.5"
         },
         "orig_nbformat": 4
     },

src/circuit/modules/poseidon.rs

@@ -100,6 +100,9 @@ impl<S: Spec<Fp, WIDTH, RATE> + Sync, const WIDTH: usize, const RATE: usize, con
         let rc_a = (0..WIDTH).map(|_| meta.fixed_column()).collect::<Vec<_>>();
         let rc_b = (0..WIDTH).map(|_| meta.fixed_column()).collect::<Vec<_>>();
 
+        for input in hash_inputs.iter().take(WIDTH) {
+            meta.enable_equality(*input);
+        }
         meta.enable_constant(rc_b[0]);
 
         Self::configure_with_cols(
@@ -149,6 +152,9 @@ impl<S: Spec<Fp, WIDTH, RATE> + Sync, const WIDTH: usize, const RATE: usize, con
         let rc_a = (0..WIDTH).map(|_| meta.fixed_column()).collect::<Vec<_>>();
         let rc_b = (0..WIDTH).map(|_| meta.fixed_column()).collect::<Vec<_>>();
 
+        for input in hash_inputs.iter().take(WIDTH) {
+            meta.enable_equality(*input);
+        }
         meta.enable_constant(rc_b[0]);
 
         let instance = meta.instance_column();

src/circuit/ops/chip.rs

@@ -75,16 +75,6 @@ impl FromStr for CheckMode {
     }
 }
 
-impl CheckMode {
-    /// Returns the value of the check mode
-    pub fn is_safe(&self) -> bool {
-        match self {
-            CheckMode::SAFE => true,
-            CheckMode::UNSAFE => false,
-        }
-    }
-}
-
 #[allow(missing_docs)]
 /// An enum representing the tolerance we can accept for the accumulated arguments, either absolute or percentage
 #[derive(Clone, Default, Debug, PartialEq, PartialOrd, Serialize, Deserialize, Copy)]
@@ -215,16 +205,15 @@ impl DynamicLookups {
 
 /// A struct representing the selectors for the dynamic lookup tables
 #[derive(Clone, Debug, Default)]
-
 pub struct Shuffles {
     /// [Selector]s generated when configuring the layer. We use a [BTreeMap] as we expect to configure many dynamic lookup ops.
     pub input_selectors: BTreeMap<(usize, (usize, usize)), Selector>,
     /// Selectors for the dynamic lookup tables
-    pub output_selectors: Vec<Selector>,
+    pub reference_selectors: Vec<Selector>,
     /// Inputs:
     pub inputs: Vec<VarTensor>,
     /// tables
-    pub outputs: Vec<VarTensor>,
+    pub references: Vec<VarTensor>,
 }
 
 impl Shuffles {
@@ -235,13 +224,9 @@ impl Shuffles {
 
         Self {
             input_selectors: BTreeMap::new(),
-            output_selectors: vec![],
-            inputs: vec![dummy_var.clone(), dummy_var.clone(), dummy_var.clone()],
-            outputs: vec![
-                single_col_dummy_var.clone(),
-                single_col_dummy_var.clone(),
-                single_col_dummy_var.clone(),
-            ],
+            reference_selectors: vec![],
+            inputs: vec![dummy_var.clone(), dummy_var.clone()],
+            references: vec![single_col_dummy_var.clone(), single_col_dummy_var.clone()],
         }
     }
 }
@@ -379,12 +364,6 @@ impl<F: PrimeField + TensorType + PartialOrd + std::hash::Hash> BaseConfig<F> {
         if inputs[0].num_cols() != output.num_cols() {
             log::warn!("input and output shapes do not match");
         }
-        if inputs[0].num_inner_cols() != inputs[1].num_inner_cols() {
-            log::warn!("input number of inner columns do not match");
-        }
-        if inputs[0].num_inner_cols() != output.num_inner_cols() {
-            log::warn!("input and output number of inner columns do not match");
-        }
 
         for i in 0..output.num_blocks() {
             for j in 0..output.num_inner_cols() {
@@ -751,8 +730,8 @@ impl<F: PrimeField + TensorType + PartialOrd + std::hash::Hash> BaseConfig<F> {
     pub fn configure_shuffles(
         &mut self,
         cs: &mut ConstraintSystem<F>,
-        inputs: &[VarTensor; 3],
-        outputs: &[VarTensor; 3],
+        inputs: &[VarTensor; 2],
+        references: &[VarTensor; 2],
     ) -> Result<(), CircuitError>
     where
         F: Field,
@@ -763,14 +742,14 @@ impl<F: PrimeField + TensorType + PartialOrd + std::hash::Hash> BaseConfig<F> {
             }
         }
 
-        for t in outputs.iter() {
+        for t in references.iter() {
             if !t.is_advice() || t.num_inner_cols() > 1 {
                 return Err(CircuitError::WrongDynamicColumnType(t.name().to_string()));
             }
         }
 
         // assert all tables have the same number of blocks
-        if outputs
+        if references
             .iter()
             .map(|t| t.num_blocks())
             .collect::<Vec<_>>()
@@ -778,23 +757,23 @@ impl<F: PrimeField + TensorType + PartialOrd + std::hash::Hash> BaseConfig<F> {
             .any(|w| w[0] != w[1])
         {
             return Err(CircuitError::WrongDynamicColumnType(
-                "outputs inner cols".to_string(),
+                "references inner cols".to_string(),
             ));
         }
 
         let one = Expression::Constant(F::ONE);
 
-        for q in 0..outputs[0].num_blocks() {
-            let s_output = cs.complex_selector();
+        for q in 0..references[0].num_blocks() {
+            let s_reference = cs.complex_selector();
 
             for x in 0..inputs[0].num_blocks() {
                 for y in 0..inputs[0].num_inner_cols() {
                     let s_input = cs.complex_selector();
 
-                    cs.lookup_any("shuffle", |cs| {
+                    cs.lookup_any("lookup", |cs| {
                         let s_inputq = cs.query_selector(s_input);
                         let mut expression = vec![];
-                        let s_outputq = cs.query_selector(s_output);
+                        let s_referenceq = cs.query_selector(s_reference);
                         let mut input_queries = vec![one.clone()];
 
                         for input in inputs {
@@ -806,9 +785,9 @@ impl<F: PrimeField + TensorType + PartialOrd + std::hash::Hash> BaseConfig<F> {
                             });
                         }
 
-                        let mut output_queries = vec![one.clone()];
-                        for output in outputs {
-                            output_queries.push(match output {
+                        let mut ref_queries = vec![one.clone()];
+                        for reference in references {
+                            ref_queries.push(match reference {
                                 VarTensor::Advice { inner: advices, .. } => {
                                     cs.query_advice(advices[q][0], Rotation(0))
                                 }
@@ -817,7 +796,7 @@ impl<F: PrimeField + TensorType + PartialOrd + std::hash::Hash> BaseConfig<F> {
                         }
 
                         let lhs = input_queries.into_iter().map(|c| c * s_inputq.clone());
-                        let rhs = output_queries.into_iter().map(|c| c * s_outputq.clone());
+                        let rhs = ref_queries.into_iter().map(|c| c * s_referenceq.clone());
                         expression.extend(lhs.zip(rhs));
 
                         expression
@@ -828,13 +807,13 @@ impl<F: PrimeField + TensorType + PartialOrd + std::hash::Hash> BaseConfig<F> {
                         .or_insert(s_input);
                 }
             }
-            self.shuffles.output_selectors.push(s_output);
+            self.shuffles.reference_selectors.push(s_reference);
         }
 
         // if we haven't previously initialized the input/output, do so now
-        if self.shuffles.outputs.is_empty() {
-            debug!("assigning shuffles output");
-            self.shuffles.outputs = outputs.to_vec();
+        if self.shuffles.references.is_empty() {
+            debug!("assigning shuffles reference");
+            self.shuffles.references = references.to_vec();
         }
         if self.shuffles.inputs.is_empty() {
             debug!("assigning shuffles input");

src/circuit/ops/errors.rs

@@ -100,7 +100,4 @@ pub enum CircuitError {
     #[error("invalid input type {0}")]
     /// Invalid input type
     InvalidInputType(String),
-    #[error("an element is missing from the shuffled version of the tensor")]
-    /// An element is missing from the shuffled version of the tensor
-    MissingShuffleElement,
 }

src/circuit/ops/hybrid.rs

@@ -1,7 +1,7 @@
 use super::*;
 use crate::{
     circuit::{layouts, utils, Tolerance},
-    fieldutils::{integer_rep_to_felt, IntegerRep},
+    fieldutils::integer_rep_to_felt,
     graph::multiplier_to_scale,
     tensor::{self, Tensor, TensorType, ValTensor},
 };
@@ -250,8 +250,8 @@ impl<F: PrimeField + TensorType + PartialOrd + std::hash::Hash> Op<F> for Hybrid
                 config,
                 region,
                 values[..].try_into()?,
-                integer_rep_to_felt(input_scale.0 as IntegerRep),
-                integer_rep_to_felt(output_scale.0 as IntegerRep),
+                integer_rep_to_felt(input_scale.0 as i128),
+                integer_rep_to_felt(output_scale.0 as i128),
             )?,
             HybridOp::Div { denom, .. } => {
                 if denom.0.fract() == 0.0 {
@@ -259,7 +259,7 @@ impl<F: PrimeField + TensorType + PartialOrd + std::hash::Hash> Op<F> for Hybrid
                         config,
                         region,
                         values[..].try_into()?,
-                        integer_rep_to_felt(denom.0 as IntegerRep),
+                        integer_rep_to_felt(denom.0 as i128),
                     )?
                 } else {
                     layouts::nonlinearity(

src/circuit/ops/layouts.rs

@@ -43,7 +43,7 @@ const ASCII_ALPHABET: &str = "abcdefghijklmnopqrstuvwxyz";
 /// use ezkl::circuit::BaseConfig;
 /// use ezkl::tensor::ValTensor;
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///    Some(&[1, 2, 3, 2, 3, 4, 3, 4, 5]),
 /// &[3, 3],
@@ -160,26 +160,9 @@ pub(crate) fn div<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
         .into()
     };
     claimed_output.reshape(input_dims)?;
-    let claimed_output = region.assign(&config.custom_gates.output, &claimed_output)?;
+    region.assign(&config.custom_gates.output, &claimed_output)?;
     region.increment(claimed_output.len());
 
-    // here we decompose and extract the sign of the input
-    let sign = sign(config, region, &[claimed_output.clone()])?;
-    // check if x is too large only if the decomp would support overflow in the previous op
-    if (IntegerRep::MAX).abs() < ((region.base() as i128).pow(region.legs() as u32)) - 1 {
-        let abs_value = pairwise(
-            config,
-            region,
-            &[claimed_output.clone(), sign],
-            BaseOp::Mult,
-        )?;
-        let max_val = create_constant_tensor(integer_rep_to_felt(IntegerRep::MAX), 1);
-        let less_than_max = less(config, region, &[abs_value.clone(), max_val])?;
-        // assert the result is 1
-        let comparison_unit = create_constant_tensor(F::ONE, less_than_max.len());
-        enforce_equality(config, region, &[abs_value, comparison_unit])?;
-    }
-
     let product = pairwise(
         config,
         region,
@@ -252,30 +235,6 @@ pub(crate) fn recip<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
         &[equal_zero_mask.clone(), equal_inverse_mask],
     )?;
 
-    let masked_output = pairwise(
-        config,
-        region,
-        &[claimed_output.clone(), not_equal_zero_mask.clone()],
-        BaseOp::Mult,
-    )?;
-
-    // here we decompose and extract the sign of the input
-    let sign = sign(config, region, &[masked_output.clone()])?;
-    // check if x is too large only if the decomp would support overflow in the previous op
-    if (IntegerRep::MAX).abs() < ((region.base() as i128).pow(region.legs() as u32)) - 1 {
-        let abs_value = pairwise(
-            config,
-            region,
-            &[claimed_output.clone(), sign],
-            BaseOp::Mult,
-        )?;
-        let max_val = create_constant_tensor(integer_rep_to_felt(IntegerRep::MAX), 1);
-        let less_than_max = less(config, region, &[abs_value.clone(), max_val])?;
-        // assert the result is 1
-        let comparison_unit = create_constant_tensor(F::ONE, less_than_max.len());
-        enforce_equality(config, region, &[abs_value, comparison_unit])?;
-    }
-
     let err_func = |config: &BaseConfig<F>,
                     region: &mut RegionCtx<F>,
                     x: &ValTensor<F>|
@@ -307,7 +266,7 @@ pub(crate) fn recip<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::circuit::BaseConfig;
 /// use ezkl::tensor::ValTensor;
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///     Some(&[1, 2, 3, 2, 3, 4, 3, 4, 9]),
 ///    &[3, 3],
@@ -379,7 +338,7 @@ pub fn sqrt<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::circuit::BaseConfig;
 /// use ezkl::tensor::ValTensor;
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///    Some(&[1, 2, 3, 2, 3, 4, 3, 4, 5]),
 /// &[3, 3],
@@ -418,7 +377,7 @@ pub fn rsqrt<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::circuit::layouts::dot;
 ///
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 ///
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///     Some(&[5, 2, 3, 0, 4, -1, 3, 1, 6]),
@@ -445,6 +404,22 @@ pub fn dot<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 
     let mut values = values.clone();
 
+    // this section has been optimized to death, don't mess with it
+    let mut removal_indices = values[0].get_const_zero_indices();
+    let second_zero_indices = values[1].get_const_zero_indices();
+    removal_indices.extend(second_zero_indices);
+    removal_indices.par_sort_unstable();
+    removal_indices.dedup();
+
+    // if empty return a const
+    if removal_indices.len() == values[0].len() {
+        return Ok(create_zero_tensor(1));
+    }
+
+    // is already sorted
+    values[0].remove_indices(&mut removal_indices, true)?;
+    values[1].remove_indices(&mut removal_indices, true)?;
+
     let mut inputs = vec![];
     let block_width = config.custom_gates.output.num_inner_cols();
 
@@ -517,7 +492,7 @@ pub fn dot<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::tensor::ValTensor;
 ///
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 ///
 /// // matmul case
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
@@ -931,6 +906,7 @@ fn _sort_ascending<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
     let window_b = assigned_sort.get_slice(&[1..assigned_sort.len()])?;
 
     let is_greater = greater_equal(config, region, &[window_b.clone(), window_a.clone()])?;
+
     let unit = create_unit_tensor(is_greater.len());
 
     enforce_equality(config, region, &[unit, is_greater])?;
@@ -969,7 +945,7 @@ fn _select_topk<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::tensor::ValTensor;
 ///
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 ///
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///     Some(&[2, 15, 2, 1, 1, 0]),
@@ -1192,38 +1168,30 @@ pub(crate) fn dynamic_lookup<F: PrimeField + TensorType + PartialOrd + std::hash
 }
 
 /// Shuffle arg
-/// 1. the input is a set of pairs (index_input, value_input) -- looked up against a (dynamic) set of values (index_output, value_output).
-/// 2. index_input is copy constrained to values in a fixed column and is thus a fixed set of incrementing values over the input
-/// 3. value_input is just the input that we are ascertaining is shuffled
-/// 4. index_output is (typically) a prover generated witness committed to in an advice column
-/// 5. value_output is (typically) a prover generated witness committed to in an advice column
-/// 6. Given the above, and given the fixed index_input , we go through every (index_input, value_input) pair and ascertain that it is contained in the input.
-/// Given the fixed incrementing index index_input, we avoid multiplicity in the output by leveraging this surrogate index: if index_output isn't matched to the exact value where for `index_input=index_output` -> `value_input=value_output`, then the lookup fails
 pub(crate) fn shuffles<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
     config: &BaseConfig<F>,
     region: &mut RegionCtx<F>,
-    output: &[ValTensor<F>; 1],
     input: &[ValTensor<F>; 1],
+    reference: &[ValTensor<F>; 1],
 ) -> Result<ValTensor<F>, CircuitError> {
     let shuffle_index = region.shuffle_index();
-    let (output, input) = (output[0].clone(), input[0].clone());
+    let (input, reference) = (input[0].clone(), reference[0].clone());
 
     // assert input and reference are same length
-    if output.len() != input.len() {
+    if input.len() != reference.len() {
         return Err(CircuitError::MismatchedShuffleLength(
-            output.len(),
             input.len(),
+            reference.len(),
         ));
     }
 
-    let (output, flush_len_ref) = region.assign_shuffle(&config.shuffles.outputs[0], &output)?;
-    let output_len = output.len();
-    let input = region.assign(&config.shuffles.inputs[0], &input)?;
+    let (reference, flush_len_ref) =
+        region.assign_shuffle(&config.shuffles.references[0], &reference)?;
+    let reference_len = reference.len();
 
     // now create a vartensor of constants for the shuffle index
-    let index = create_constant_tensor(F::from(shuffle_index as u64), output_len);
-    let (index, flush_len_index) = region.assign_shuffle(&config.shuffles.outputs[1], &index)?;
-    region.assign(&config.shuffles.inputs[1], &index)?;
+    let index = create_constant_tensor(F::from(shuffle_index as u64), reference_len);
+    let (index, flush_len_index) = region.assign_shuffle(&config.shuffles.references[1], &index)?;
 
     if flush_len_index != flush_len_ref {
         return Err(CircuitError::MismatchedShuffleLength(
@@ -1232,71 +1200,18 @@ pub(crate) fn shuffles<F: PrimeField + TensorType + PartialOrd + std::hash::Hash
         ));
     }
 
-    // now found the position of each element of the reference to the input
-
-    let is_known = !output.any_unknowns()? && !input.any_unknowns()?;
-
-    let claimed_index_output = if is_known {
-        let input = input.int_evals()?;
-        let output = output.int_evals()?;
-
-        // Keep track of which positions we've used for each value
-        let mut used_positions: HashMap<usize, bool> = HashMap::new();
-
-        let index_output = output
-            .iter()
-            .map(|x| {
-                // Find all positions of the current element
-                let positions: Vec<usize> = input
-                    .iter()
-                    .enumerate()
-                    .filter(|(_, y)| *y == x)
-                    .map(|(i, _)| i)
-                    .collect();
-
-                // Find the first unused position for this element
-                let pos = positions
-                    .iter()
-                    .find(|&&i| !used_positions.get(&i).unwrap_or(&false))
-                    .unwrap_or(&0);
-
-                // Mark this position as used
-                used_positions.insert(*pos, true);
-
-                Ok::<_, CircuitError>(Value::known(F::from(*pos as u64)))
-            })
-            .collect::<Result<Vec<_>, _>>()?;
-
-        // Verify all indices were used exactly once
-        if !used_positions.values().all(|&x| x) {
-            return Err(CircuitError::MissingShuffleElement);
-        }
-
-        Tensor::from(index_output.into_iter()).into()
-    } else {
-        Tensor::new(
-            Some(&vec![Value::<F>::unknown(); output_len]),
-            &[output_len],
-        )?
-        .into()
-    };
-
-    region.assign_shuffle(&config.shuffles.outputs[2], &claimed_index_output)?;
-
-    // the incrementing index is the set of numbered values for the input tensor 0...n, and is FIXED
-    let incrementing_index: ValTensor<F> =
-        Tensor::from((0..output.len() as u64).map(|x| ValType::Constant(F::from(x)))).into();
-    region.assign(&config.shuffles.inputs[2], &incrementing_index)?;
+    let input = region.assign(&config.shuffles.inputs[0], &input)?;
+    region.assign(&config.shuffles.inputs[1], &index)?;
 
     let mut shuffle_block = 0;
 
     if !region.is_dummy() {
-        (0..output_len)
+        (0..reference_len)
             .map(|i| {
-                let (x, _, z) = config.shuffles.outputs[0]
+                let (x, _, z) = config.shuffles.references[0]
                     .cartesian_coord(region.combined_dynamic_shuffle_coord() + i + flush_len_ref);
                 shuffle_block = x;
-                let ref_selector = config.shuffles.output_selectors[shuffle_block];
+                let ref_selector = config.shuffles.reference_selectors[shuffle_block];
                 region.enable(Some(&ref_selector), z)?;
                 Ok(())
             })
@@ -1305,7 +1220,7 @@ pub(crate) fn shuffles<F: PrimeField + TensorType + PartialOrd + std::hash::Hash
 
     if !region.is_dummy() {
         // Enable the selectors
-        (0..output_len)
+        (0..reference_len)
             .map(|i| {
                 let (x, y, z) =
                     config.custom_gates.inputs[0].cartesian_coord(region.linear_coord() + i);
@@ -1322,11 +1237,11 @@ pub(crate) fn shuffles<F: PrimeField + TensorType + PartialOrd + std::hash::Hash
             .collect::<Result<Vec<_>, CircuitError>>()?;
     }
 
-    region.increment_shuffle_col_coord(output_len + flush_len_ref);
+    region.increment_shuffle_col_coord(reference_len + flush_len_ref);
     region.increment_shuffle_index(1);
-    region.increment(output_len);
+    region.increment(reference_len);
 
-    Ok(output)
+    Ok(input)
 }
 
 /// One hot accumulated layout
@@ -1783,8 +1698,6 @@ pub(crate) fn get_missing_set_elements<
     // assign the claimed output
     claimed_output = region.assign(&config.custom_gates.output, &claimed_output)?;
 
-    region.increment(claimed_output.len());
-
     // input and claimed output should be the shuffles of fullset
     // concatentate input and claimed output
     let input_and_claimed_output = input.concat(claimed_output.clone())?;
@@ -1978,7 +1891,7 @@ pub(crate) fn scatter_nd<F: PrimeField + TensorType + PartialOrd + std::hash::Ha
 /// use ezkl::tensor::ValTensor;
 ///
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 ///
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///     Some(&[2, 15, 2, 1, 1, 0]),
@@ -2076,7 +1989,7 @@ pub fn sum<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::tensor::ValTensor;
 ///
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 ///
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///     Some(&[2, 15, 2, 1, 1, 0]),
@@ -2231,7 +2144,7 @@ fn axes_wise_op<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::tensor::ValTensor;
 ///
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 ///
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///     Some(&[2, 15, 2, 1, 1, 0]),
@@ -2267,7 +2180,7 @@ pub fn prod_axes<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::tensor::ValTensor;
 ///
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 ///
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///     Some(&[2, 15, 2, 1, 1, 0]),
@@ -2303,7 +2216,7 @@ pub fn sum_axes<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::tensor::ValTensor;
 ///
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 ///
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///     Some(&[2, 15, 2, 1, 1, 0]),
@@ -2345,7 +2258,7 @@ pub fn argmax_axes<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::tensor::ValTensor;
 ///
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///     Some(&[2, 15, 2, 1, 1, 0]),
 ///     &[2, 3],
@@ -2381,7 +2294,7 @@ pub fn max_axes<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::tensor::ValTensor;
 ///
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 ///
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///     Some(&[2, 15, 2, 1, 1, 0]),
@@ -2427,7 +2340,7 @@ pub fn argmin_axes<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::tensor::ValTensor;
 ///
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 ///
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///     Some(&[2, 15, 2, 1, 1, 0]),
@@ -2468,6 +2381,25 @@ pub(crate) fn pairwise<F: PrimeField + TensorType + PartialOrd + std::hash::Hash
     lhs.expand(&broadcasted_shape)?;
     rhs.expand(&broadcasted_shape)?;
 
+    // original values
+    let orig_lhs = lhs.clone();
+    let orig_rhs = rhs.clone();
+
+    let first_zero_indices = HashSet::from_iter(lhs.get_const_zero_indices());
+    let second_zero_indices = HashSet::from_iter(rhs.get_const_zero_indices());
+
+    let removal_indices = match op {
+        BaseOp::Add | BaseOp::Mult => {
+            // join the zero indices
+            first_zero_indices
+                .union(&second_zero_indices)
+                .cloned()
+                .collect()
+        }
+        BaseOp::Sub => second_zero_indices.clone(),
+        _ => return Err(CircuitError::UnsupportedOp),
+    };
+
     if lhs.len() != rhs.len() {
         return Err(CircuitError::DimMismatch(format!(
             "pairwise {} layout",
@@ -2479,7 +2411,11 @@ pub(crate) fn pairwise<F: PrimeField + TensorType + PartialOrd + std::hash::Hash
         .iter()
         .enumerate()
         .map(|(i, input)| {
-            let res = region.assign(&config.custom_gates.inputs[i], input)?;
+            let res = region.assign_with_omissions(
+                &config.custom_gates.inputs[i],
+                input,
+                &removal_indices,
+            )?;
 
             Ok(res.get_inner()?)
         })
@@ -2498,8 +2434,12 @@ pub(crate) fn pairwise<F: PrimeField + TensorType + PartialOrd + std::hash::Hash
         halo2_proofs::plonk::Error::Synthesis
     })?;
 
-    let assigned_len = op_result.len();
-    let mut output = region.assign(&config.custom_gates.output, &op_result.into())?;
+    let assigned_len = op_result.len() - removal_indices.len();
+    let mut output = region.assign_with_omissions(
+        &config.custom_gates.output,
+        &op_result.into(),
+        &removal_indices,
+    )?;
 
     // Enable the selectors
     if !region.is_dummy() {
@@ -2517,6 +2457,44 @@ pub(crate) fn pairwise<F: PrimeField + TensorType + PartialOrd + std::hash::Hash
     }
     region.increment(assigned_len);
 
+    let a_tensor = orig_lhs.get_inner_tensor()?;
+    let b_tensor = orig_rhs.get_inner_tensor()?;
+
+    // infill the zero indices with the correct values from values[0] or values[1]
+    if !removal_indices.is_empty() {
+        output
+            .get_inner_tensor_mut()?
+            .par_enum_map_mut_filtered(&removal_indices, |i| {
+                let val = match op {
+                    BaseOp::Add => {
+                        let a_is_null = first_zero_indices.contains(&i);
+                        let b_is_null = second_zero_indices.contains(&i);
+
+                        if a_is_null && b_is_null {
+                            ValType::Constant(F::ZERO)
+                        } else if a_is_null {
+                            b_tensor[i].clone()
+                        } else {
+                            a_tensor[i].clone()
+                        }
+                    }
+                    BaseOp::Sub => {
+                        let a_is_null = first_zero_indices.contains(&i);
+                        // by default b is null in this case for sub
+                        if a_is_null {
+                            ValType::Constant(F::ZERO)
+                        } else {
+                            a_tensor[i].clone()
+                        }
+                    }
+                    BaseOp::Mult => ValType::Constant(F::ZERO),
+                    // can safely panic as the prior check ensures this is not called
+                    _ => unreachable!(),
+                };
+                Ok::<_, TensorError>(val)
+            })?;
+    }
+
     output.reshape(&broadcasted_shape)?;
 
     let end = global_start.elapsed();
@@ -2544,7 +2522,7 @@ pub(crate) fn pairwise<F: PrimeField + TensorType + PartialOrd + std::hash::Hash
 /// use ezkl::tensor::ValTensor;
 ///
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 ///
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 /// Some(&[2, 15, 2, 1, 1, 0]),
@@ -2601,7 +2579,7 @@ pub(crate) fn expand<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::tensor::ValTensor;
 ///
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128, 2));
 ///
 /// let a = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///   Some(&[1, 12, 6, 4, 5, 6]),
@@ -2629,8 +2607,7 @@ pub fn greater<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 
     let diff = pairwise(config, region, &[lhs, rhs], BaseOp::Sub)?;
     let sign = sign(config, region, &[diff])?;
-    let eq = equals(config, region, &[sign, create_unit_tensor(1)])?;
-    Ok(eq)
+    equals(config, region, &[sign, create_unit_tensor(1)])
 }
 
 /// Greater equals than operation.
@@ -2649,7 +2626,7 @@ pub fn greater<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::tensor::ValTensor;
 ///
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128, 2));
 ///
 ///
 /// let a = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
@@ -2699,7 +2676,7 @@ pub fn greater_equal<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::tensor::ValTensor;
 ///
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128, 2));
 ///
 /// let a = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///  Some(&[1, 0, 5, 4, 5, 1]),
@@ -2740,7 +2717,7 @@ pub fn less<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::tensor::ValTensor;
 ///
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 ///
 /// let a = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///  Some(&[1, 0, 5, 4, 5, 1]),
@@ -2781,7 +2758,7 @@ pub fn less_equal<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::tensor::ValTensor;
 ///
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 ///
 /// let a = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///  Some(&[1, 1, 1, 1, 1, 0]),
@@ -2825,7 +2802,7 @@ pub fn and<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::tensor::ValTensor;
 ///
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 ///
 /// let a = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///   Some(&[1, 1, 1, 1, 1, 0]),
@@ -2873,7 +2850,7 @@ pub fn or<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::tensor::ValTensor;
 ///
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 ///
 /// let a = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 /// Some(&[1, 1, 1, 1, 1, 0]),
@@ -2904,7 +2881,6 @@ pub(crate) fn equals_zero<F: PrimeField + TensorType + PartialOrd + std::hash::H
 ) -> Result<ValTensor<F>, CircuitError> {
     let values = values[0].clone();
     let values_inverse = values.inverse()?;
-
     let product_values_and_invert = pairwise(
         config,
         region,
@@ -2948,7 +2924,7 @@ pub(crate) fn equals_zero<F: PrimeField + TensorType + PartialOrd + std::hash::H
 /// use ezkl::tensor::ValTensor;
 ///
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 ///
 /// let a = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///  Some(&[1, 1, 1, 1, 1, 0]),
@@ -3004,7 +2980,7 @@ pub fn xor<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::tensor::ValTensor;
 ///
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 ///
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///    Some(&[1, 1, 1, 1, 1, 0]),
@@ -3047,7 +3023,7 @@ pub fn not<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::tensor::ValTensor;
 ///
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 ///
 /// let mask = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///    Some(&[1, 0, 1, 0, 1, 0]),
@@ -3105,7 +3081,7 @@ pub fn iff<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::tensor::ValTensor;
 ///
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 ///
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///     Some(&[2, 1, 2, 1, 1, 1]),
@@ -3137,7 +3113,7 @@ pub fn neg<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::tensor::ValTensor;
 ///
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 ///
 ///
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
@@ -3219,7 +3195,7 @@ pub fn sumpool<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::tensor::ValTensor;
 ///
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 ///
 ///
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
@@ -3273,30 +3249,32 @@ pub fn max_pool<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
         .multi_cartesian_product()
         .collect::<Vec<_>>();
 
-    let inner_loop_function = |idx: usize, region: &mut RegionCtx<F>| {
-        let coord = &cartesian_coord[idx];
-        let (b, i) = (coord[0], coord[1]);
+    output
+        .iter_mut()
+        .enumerate()
+        .map(|(flat_index, o)| {
+            let coord = &cartesian_coord[flat_index];
+            let (b, i) = (coord[0], coord[1]);
 
-        let mut slice = vec![b..b + 1, i..i + 1];
-        slice.extend(
-            coord[2..]
-                .iter()
-                .zip(stride.iter())
-                .zip(pool_dims.iter())
-                .map(|((c, s), k)| {
-                    let start = c * s;
-                    let end = start + k;
-                    start..end
-                }),
-        );
+            let mut slice = vec![b..b + 1, i..i + 1];
+            slice.extend(
+                coord[2..]
+                    .iter()
+                    .zip(stride.iter())
+                    .zip(pool_dims.iter())
+                    .map(|((c, s), k)| {
+                        let start = c * s;
+                        let end = start + k;
+                        start..end
+                    }),
+            );
 
-        let slice = padded_image.get_slice(&slice)?;
-        let max_w = max(config, region, &[slice])?;
-
-        Ok::<_, CircuitError>(max_w.get_inner_tensor()?[0].clone())
-    };
-
-    region.apply_in_loop(&mut output, inner_loop_function)?;
+            let slice = padded_image.get_slice(&slice)?;
+            let max_w = max(config, region, &[slice])?;
+            *o = max_w.get_inner_tensor()?[0].clone();
+            Ok(())
+        })
+        .collect::<Result<Vec<_>, CircuitError>>()?;
 
     let res: ValTensor<F> = output.into();
 
@@ -3318,7 +3296,7 @@ pub fn max_pool<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::tensor::ValTensor;
 ///
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 ///
 /// let c = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(Some(&[6, 0, 12, 4, 0, 8, 0, 0, 3, 0, 0, 2]), &[1, 2, 2, 3]).unwrap());
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
@@ -3546,7 +3524,7 @@ pub fn deconv<
 /// use ezkl::circuit::BaseConfig;
 ///
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 ///
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///     Some(&[5, 2, 3, 0, 4, -1, 3, 1, 6]),
@@ -4060,7 +4038,7 @@ pub(crate) fn range_check<F: PrimeField + TensorType + PartialOrd + std::hash::H
     }
 
     let is_assigned = !w.any_unknowns()?;
-    if is_assigned && region.check_range() && config.check_mode.is_safe() {
+    if is_assigned && region.check_range() {
         // assert is within range
         let int_values = w.int_evals()?;
         for v in int_values.iter() {
@@ -4270,7 +4248,7 @@ pub(crate) fn argmin<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::circuit::region::RegionSettings;
 /// use ezkl::circuit::BaseConfig;
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///    Some(&[5, 2, 3, 0]),
 ///   &[1, 1, 2, 2],
@@ -4323,7 +4301,7 @@ pub fn max_comp<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::circuit::region::RegionSettings;
 /// use ezkl::circuit::BaseConfig;
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///   Some(&[5, 2, 3, 0]),
 ///  &[1, 1, 2, 2],
@@ -4362,7 +4340,10 @@ pub(crate) fn max<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
     region: &mut RegionCtx<F>,
     values: &[ValTensor<F>; 1],
 ) -> Result<ValTensor<F>, CircuitError> {
-    Ok(_sort_ascending(config, region, values)?.last()?)
+    let input_len = values[0].len();
+    _sort_ascending(config, region, values)?
+        .get_slice(&[input_len - 1..input_len])
+        .map_err(|e| e.into())
 }
 
 /// min layout
@@ -4371,7 +4352,9 @@ pub(crate) fn min<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
     region: &mut RegionCtx<F>,
     values: &[ValTensor<F>; 1],
 ) -> Result<ValTensor<F>, CircuitError> {
-    Ok(_sort_ascending(config, region, values)?.first()?)
+    _sort_ascending(config, region, values)?
+        .get_slice(&[0..1])
+        .map_err(|e| e.into())
 }
 
 /// floor layout
@@ -4394,7 +4377,7 @@ pub(crate) fn min<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::circuit::region::RegionSettings;
 /// use ezkl::circuit::BaseConfig;
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 /// Some(&[3, -2, -3, 1]),
 /// &[1, 1, 2, 2],
@@ -4506,7 +4489,7 @@ pub fn floor<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::circuit::region::RegionSettings;
 /// use ezkl::circuit::BaseConfig;
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///  Some(&[3, -2, 3, 1]),
 /// &[1, 1, 2, 2],
@@ -4619,7 +4602,7 @@ pub fn ceil<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::circuit::region::RegionSettings;
 /// use ezkl::circuit::BaseConfig;
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 /// Some(&[3, 2, 3, 1]),
 /// &[1, 1, 2, 2],
@@ -4906,7 +4889,7 @@ pub fn ln<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::circuit::region::RegionSettings;
 /// use ezkl::circuit::BaseConfig;
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 /// Some(&[3, -2, 3, 1]),
 /// &[1, 1, 2, 2],
@@ -5049,7 +5032,7 @@ pub fn round<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::circuit::region::RegionSettings;
 /// use ezkl::circuit::BaseConfig;
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 /// Some(&[3, -2, 3, 1]),
 /// &[1, 1, 2, 2],
@@ -5284,24 +5267,7 @@ pub(crate) fn decompose<F: PrimeField + TensorType + PartialOrd + std::hash::Has
     let rest = claimed_output.get_slice(&rest_slice)?;
 
     let sign = range_check(config, region, &[sign], &(-1, 1))?;
-
-    // isZero(input) * sign == 0.
-    {
-        let is_zero = equals_zero(config, region, &[input.clone()])?;
-        // take the product of the sign and is_zero
-        let sign_is_zero = pairwise(config, region, &[sign.clone(), is_zero], BaseOp::Mult)?;
-        // constrain the sign_is_zero to be 0
-        enforce_equality(
-            config,
-            region,
-            &[
-                sign_is_zero.clone(),
-                create_constant_tensor(F::ZERO, sign_is_zero.len()),
-            ],
-        )?;
-    }
-
-    let rest = range_check(config, region, &[rest], &(0, (*base - 1) as IntegerRep))?;
+    let rest = range_check(config, region, &[rest], &(0, (*base - 1) as i128))?;
 
     // equation needs to be constructed as ij,ij->i but for arbitrary n dims we need to construct this dynamically
     // indices should map in order of the alphabet
@@ -5565,7 +5531,7 @@ pub(crate) fn percent<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>
 /// use ezkl::circuit::BaseConfig;
 ///
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 ///
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///     Some(&[2, 2, 3, 2, 2, 0]),
@@ -5616,7 +5582,7 @@ pub fn softmax<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::circuit::BaseConfig;
 ///
 /// let dummy_config = BaseConfig::dummy(12, 2);
-/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
+/// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(128,2));
 ///
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///     Some(&[100, 200, 300, 400, 500, 600]),

src/circuit/tests.rs

@@ -1040,10 +1040,6 @@ mod conv {
             let a = VarTensor::new_advice(cs, K, 1, (LEN + 1) * LEN);
             let b = VarTensor::new_advice(cs, K, 1, (LEN + 1) * LEN);
             let output = VarTensor::new_advice(cs, K, 1, (LEN + 1) * LEN);
-
-            // column for constants
-            let _constant = VarTensor::constant_cols(cs, K, 8, false);
-
             Self::Config::configure(cs, &[a, b], &output, CheckMode::SAFE)
         }
 
@@ -1175,7 +1171,7 @@ mod conv_col_ultra_overflow {
 
     use super::*;
 
-    const K: usize = 6;
+    const K: usize = 4;
     const LEN: usize = 10;
 
     #[derive(Clone)]
@@ -1195,10 +1191,9 @@ mod conv_col_ultra_overflow {
         }
 
         fn configure(cs: &mut ConstraintSystem<F>) -> Self::Config {
-            let a = VarTensor::new_advice(cs, K, 1, LEN * LEN * LEN * LEN);
-            let b = VarTensor::new_advice(cs, K, 1, LEN * LEN * LEN * LEN);
-            let output = VarTensor::new_advice(cs, K, 1, LEN * LEN * LEN * LEN);
-            let _constant = VarTensor::constant_cols(cs, K, LEN * LEN * LEN * LEN, false);
+            let a = VarTensor::new_advice(cs, K, 1, LEN * LEN * LEN);
+            let b = VarTensor::new_advice(cs, K, 1, LEN * LEN * LEN);
+            let output = VarTensor::new_advice(cs, K, 1, LEN * LEN * LEN);
             Self::Config::configure(cs, &[a, b], &output, CheckMode::SAFE)
         }
 
@@ -1781,18 +1776,13 @@ mod shuffle {
 
             let d = VarTensor::new_advice(cs, K, 1, LEN);
             let e = VarTensor::new_advice(cs, K, 1, LEN);
-            let f: VarTensor = VarTensor::new_advice(cs, K, 1, LEN);
 
             let _constant = VarTensor::constant_cols(cs, K, LEN * NUM_LOOP, false);
 
             let mut config =
                 Self::Config::configure(cs, &[a.clone(), b.clone()], &c, CheckMode::SAFE);
             config
-                .configure_shuffles(
-                    cs,
-                    &[a.clone(), b.clone(), c.clone()],
-                    &[d.clone(), e.clone(), f.clone()],
-                )
+                .configure_shuffles(cs, &[a.clone(), b.clone()], &[d.clone(), e.clone()])
                 .unwrap();
             config
         }

src/commands.rs

@@ -83,7 +83,7 @@ pub const DEFAULT_VK_SOL: &str = "vk.sol";
 /// Default VK abi path
 pub const DEFAULT_VK_ABI: &str = "vk.abi";
 /// Default scale rebase multipliers for calibration
-pub const DEFAULT_SCALE_REBASE_MULTIPLIERS: &str = "1,10";
+pub const DEFAULT_SCALE_REBASE_MULTIPLIERS: &str = "1,2,10";
 /// Default use reduced srs for verification
 pub const DEFAULT_USE_REDUCED_SRS_FOR_VERIFICATION: &str = "false";
 /// Default only check for range check rebase

src/fieldutils.rs

@@ -5,7 +5,7 @@ use halo2curves::ff::PrimeField;
 /// Integer representation of a PrimeField element.
 pub type IntegerRep = i128;
 
-/// Converts an integer rep to a PrimeField element.
+/// Converts an i64 to a PrimeField element.
 pub fn integer_rep_to_felt<F: PrimeField>(x: IntegerRep) -> F {
     if x >= 0 {
         F::from_u128(x as u128)
@@ -69,7 +69,7 @@ mod test {
     fn felttointegerrep() {
         for x in -(2_i128.pow(16))..(2_i128.pow(16)) {
             let fieldx: F = integer_rep_to_felt::<F>(x);
-            let xf: IntegerRep = felt_to_integer_rep::<F>(fieldx);
+            let xf: i128 = felt_to_integer_rep::<F>(fieldx);
             assert_eq!(x, xf);
         }
     }

src/graph/input.rs

@@ -14,6 +14,7 @@ use pyo3::prelude::*;
 use pyo3::types::PyDict;
 #[cfg(feature = "python-bindings")]
 use pyo3::ToPyObject;
+use serde::ser::SerializeStruct;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use std::io::BufReader;
 use std::io::BufWriter;
@@ -514,7 +515,7 @@ impl<'de> Deserialize<'de> for DataSource {
 
 /// Input to graph as a datasource
 /// Always use JSON serialization for GraphData. Seriously.
-#[derive(Clone, Debug, Deserialize, Default, PartialEq, Serialize)]
+#[derive(Clone, Debug, Deserialize, Default, PartialEq)]
 pub struct GraphData {
     /// Inputs to the model / computational graph (can be empty vectors if inputs are coming from on-chain).
     pub input_data: DataSource,
@@ -768,6 +769,18 @@ impl ToPyObject for FileSourceInner {
     }
 }
 
+impl Serialize for GraphData {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        let mut state = serializer.serialize_struct("GraphData", 4)?;
+        state.serialize_field("input_data", &self.input_data)?;
+        state.serialize_field("output_data", &self.output_data)?;
+        state.end()
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

src/graph/mod.rs

@@ -281,7 +281,7 @@ impl GraphWitness {
 
         let reader = std::io::BufReader::with_capacity(*EZKL_BUF_CAPACITY, file);
         let witness: GraphWitness =
-            serde_json::from_reader(reader).map_err(Into::<GraphError>::into)?;
+            serde_json::from_reader(reader).map_err(|e| Into::<GraphError>::into(e))?;
 
         // check versions match
         crate::check_version_string_matches(witness.version.as_deref().unwrap_or(""));

src/graph/model.rs

@@ -630,7 +630,9 @@ impl Model {
         let mut model = tract_onnx::onnx().model_for_read(reader)?;
 
         let variables: std::collections::HashMap<String, usize> =
-            std::collections::HashMap::from_iter(variables.iter().map(|(k, v)| (k.clone(), *v)));
+            std::collections::HashMap::from_iter(
+                variables.into_iter().map(|(k, v)| (k.clone(), *v)),
+            );
 
         for (i, id) in model.clone().inputs.iter().enumerate() {
             let input = model.node_mut(id.node);
@@ -1045,8 +1047,8 @@ impl Model {
         if settings.requires_shuffle() {
             base_gate.configure_shuffles(
                 meta,
-                vars.advices[0..3].try_into()?,
-                vars.advices[3..6].try_into()?,
+                vars.advices[0..2].try_into()?,
+                vars.advices[3..5].try_into()?,
             )?;
         }
 

src/graph/vars.rs

@@ -435,7 +435,7 @@ impl<F: PrimeField + TensorType + PartialOrd + std::hash::Hash> ModelVars<F> {
             .collect_vec();
 
         if requires_dynamic_lookup || requires_shuffle {
-            let num_cols = 3;
+            let num_cols = if requires_dynamic_lookup { 3 } else { 2 };
             for _ in 0..num_cols {
                 let dynamic_lookup =
                     VarTensor::new_advice(cs, logrows, 1, dynamic_lookup_and_shuffle_size);

src/tensor/mod.rs

@@ -24,6 +24,9 @@ use std::path::PathBuf;
 pub use val::*;
 pub use var::*;
 
+#[cfg(feature = "metal")]
+use instant::Instant;
+
 use crate::{
     circuit::utils,
     fieldutils::{integer_rep_to_felt, IntegerRep},
@@ -37,6 +40,8 @@ use halo2_proofs::{
     poly::Rotation,
 };
 use itertools::Itertools;
+#[cfg(feature = "metal")]
+use metal::{Device, MTLResourceOptions, MTLSize};
 use std::error::Error;
 use std::fmt::Debug;
 use std::io::Read;
@@ -44,6 +49,31 @@ use std::iter::Iterator;
 use std::ops::{Add, Deref, DerefMut, Div, Mul, Neg, Range, Sub};
 use std::{cmp::max, ops::Rem};
 
+#[cfg(feature = "metal")]
+use std::collections::HashMap;
+
+#[cfg(feature = "metal")]
+const LIB_DATA: &[u8] = include_bytes!("metal/tensor_ops.metallib");
+
+#[cfg(feature = "metal")]
+lazy_static::lazy_static! {
+    static ref DEVICE: Device = Device::system_default().expect("no device found");
+
+    static ref LIB: metal::Library = DEVICE.new_library_with_data(LIB_DATA).unwrap();
+
+    static ref QUEUE: metal::CommandQueue = DEVICE.new_command_queue();
+
+    static ref PIPELINES: HashMap<String, metal::ComputePipelineState> = {
+        let mut map = HashMap::new();
+        for name in ["add", "sub", "mul"] {
+            let function = LIB.get_function(name, None).unwrap();
+            let pipeline = DEVICE.new_compute_pipeline_state_with_function(&function).unwrap();
+            map.insert(name.to_string(), pipeline);
+        }
+        map
+    };
+}
+
 /// The (inner) type of tensor elements.
 pub trait TensorType: Clone + Debug + 'static {
     /// Returns the zero value.
@@ -1374,6 +1404,10 @@ impl<T: TensorType + Add<Output = T> + std::marker::Send + std::marker::Sync> Ad
         let lhs = self.expand(&broadcasted_shape).unwrap();
         let rhs = rhs.expand(&broadcasted_shape).unwrap();
 
+        #[cfg(feature = "metal")]
+        let res = metal_tensor_op(&lhs, &rhs, "add");
+
+        #[cfg(not(feature = "metal"))]
         let res = {
             let mut res: Tensor<T> = lhs
                 .par_iter()
@@ -1471,6 +1505,10 @@ impl<T: TensorType + Sub<Output = T> + std::marker::Send + std::marker::Sync> Su
         let lhs = self.expand(&broadcasted_shape).unwrap();
         let rhs = rhs.expand(&broadcasted_shape).unwrap();
 
+        #[cfg(feature = "metal")]
+        let res = metal_tensor_op(&lhs, &rhs, "sub");
+
+        #[cfg(not(feature = "metal"))]
         let res = {
             let mut res: Tensor<T> = lhs
                 .par_iter()
@@ -1538,6 +1576,10 @@ impl<T: TensorType + Mul<Output = T> + std::marker::Send + std::marker::Sync> Mu
         let lhs = self.expand(&broadcasted_shape).unwrap();
         let rhs = rhs.expand(&broadcasted_shape).unwrap();
 
+        #[cfg(feature = "metal")]
+        let res = metal_tensor_op(&lhs, &rhs, "mul");
+
+        #[cfg(not(feature = "metal"))]
         let res = {
             let mut res: Tensor<T> = lhs
                 .par_iter()
@@ -1769,4 +1811,66 @@ mod tests {
         let b = Tensor::<IntegerRep>::new(Some(&[1, 4]), &[2, 1]).unwrap();
         assert_eq!(a.get_slice(&[0..2, 0..1]).unwrap(), b);
     }
+
+    #[test]
+    #[cfg(feature = "metal")]
+    fn tensor_metal_int() {
+        let a = Tensor::<i64>::new(Some(&[1, 2, 3, 4]), &[2, 2]).unwrap();
+        let b = Tensor::<i64>::new(Some(&[1, 2, 3, 4]), &[2, 2]).unwrap();
+        let c = metal_tensor_op(&a, &b, "add");
+        assert_eq!(c, Tensor::new(Some(&[2, 4, 6, 8]), &[2, 2]).unwrap());
+
+        let c = metal_tensor_op(&a, &b, "sub");
+        assert_eq!(c, Tensor::new(Some(&[0, 0, 0, 0]), &[2, 2]).unwrap());
+
+        let c = metal_tensor_op(&a, &b, "mul");
+        assert_eq!(c, Tensor::new(Some(&[1, 4, 9, 16]), &[2, 2]).unwrap());
+    }
+
+    #[test]
+    #[cfg(feature = "metal")]
+    fn tensor_metal_felt() {
+        use halo2curves::bn256::Fr;
+
+        let a = Tensor::<Fr>::new(
+            Some(&[Fr::from(1), Fr::from(2), Fr::from(3), Fr::from(4)]),
+            &[2, 2],
+        )
+        .unwrap();
+        let b = Tensor::<Fr>::new(
+            Some(&[Fr::from(1), Fr::from(2), Fr::from(3), Fr::from(4)]),
+            &[2, 2],
+        )
+        .unwrap();
+
+        let c = metal_tensor_op(&a, &b, "add");
+        assert_eq!(
+            c,
+            Tensor::<Fr>::new(
+                Some(&[Fr::from(2), Fr::from(4), Fr::from(6), Fr::from(8)]),
+                &[2, 2],
+            )
+            .unwrap()
+        );
+
+        let c = metal_tensor_op(&a, &b, "sub");
+        assert_eq!(
+            c,
+            Tensor::<Fr>::new(
+                Some(&[Fr::from(0), Fr::from(0), Fr::from(0), Fr::from(0)]),
+                &[2, 2],
+            )
+            .unwrap()
+        );
+
+        let c = metal_tensor_op(&a, &b, "mul");
+        assert_eq!(
+            c,
+            Tensor::<Fr>::new(
+                Some(&[Fr::from(1), Fr::from(4), Fr::from(9), Fr::from(16)]),
+                &[2, 2],
+            )
+            .unwrap()
+        );
+    }
 }

src/tensor/ops.rs

@@ -27,7 +27,7 @@ pub fn get_rep(
     n: usize,
 ) -> Result<Vec<IntegerRep>, DecompositionError> {
     // check if x is too large
-    if (*x).abs() > ((base as i128).pow(n as u32)) - 1 {
+    if x.abs() > (base.pow(n as u32) as IntegerRep) - 1 {
         return Err(DecompositionError::TooLarge(*x, base, n));
     }
     let mut rep = vec![0; n + 1];
@@ -43,8 +43,8 @@ pub fn get_rep(
     let mut x = x.abs();
     //
     for i in (1..rep.len()).rev() {
-        rep[i] = x % base as IntegerRep;
-        x /= base as IntegerRep;
+        rep[i] = x % base as i128;
+        x /= base as i128;
     }
 
     Ok(rep)
@@ -127,7 +127,7 @@ pub fn decompose(
         .flatten()
         .collect::<Vec<IntegerRep>>();
 
-    let output = Tensor::<IntegerRep>::new(Some(&resp), &dims)?;
+    let output = Tensor::<i128>::new(Some(&resp), &dims)?;
 
     Ok(output)
 }

src/tensor/var.rs

@@ -558,7 +558,7 @@ impl VarTensor {
 
                 // duplicates every nth element to adjust for column overflow
                 let v = v.duplicate_every_n(duplication_freq, num_repeats, duplication_offset).unwrap();
-                let mut res: ValTensor<F> =
+                let mut res: ValTensor<F> = {
                     v.enum_map(|coord, k| {
 
                     let step = self.num_inner_cols();
@@ -579,18 +579,12 @@ impl VarTensor {
                         prev_cell = Some(cell.clone());
                     } else if coord > 0 && at_beginning_of_column  {
                         if let Some(prev_cell) = prev_cell.as_ref() {
-                            let cell = if let Some(cell) = cell.cell() {
-                                cell
-                            } else {
+                            let cell = cell.cell().ok_or({
                                 error!("Error getting cell: {:?}", (x,y));
-                                return Err(halo2_proofs::plonk::Error::Synthesis);
-                            };
-                            let prev_cell = if let Some(prev_cell) = prev_cell.cell() {
-                                prev_cell
-                            } else {
-                                error!("Error getting prev cell: {:?}", (x,y));
-                                return Err(halo2_proofs::plonk::Error::Synthesis);
-                            };
+                                halo2_proofs::plonk::Error::Synthesis})?;
+                            let prev_cell = prev_cell.cell().ok_or({
+                                error!("Error getting cell: {:?}", (x,y));
+                                halo2_proofs::plonk::Error::Synthesis})?;
                             region.constrain_equal(prev_cell,cell)?;
                         } else {
                             error!("Previous cell was not set");
@@ -600,8 +594,7 @@ impl VarTensor {
 
                     Ok(cell)
 
-                })?.into();
-
+                })?.into()};
                 let total_used_len = res.len();
                 res.remove_every_n(duplication_freq, num_repeats, duplication_offset).unwrap();
 

tests/integration_tests.rs

@@ -187,14 +187,13 @@ mod native_tests {
 
     const PF_FAILURE_AGGR: &str = "examples/test_failure_aggr_proof.json";
 
-    const LARGE_TESTS: [&str; 7] = [
+    const LARGE_TESTS: [&str; 6] = [
         "self_attention",
         "nanoGPT",
         "multihead_attention",
         "mobilenet",
         "mnist_gan",
         "smallworm",
-        "fr_age",
     ];
 
     const ACCURACY_CAL_TESTS: [&str; 6] = [
@@ -396,29 +395,29 @@ mod native_tests {
     const TESTS_AGGR: [&str; 3] = ["1l_mlp", "1l_flatten", "1l_average"];
 
     const TESTS_EVM: [&str; 23] = [
-        "1l_mlp",                // 0
-        "1l_flatten",            // 1
-        "1l_average",            // 2
-        "1l_reshape",            // 3
-        "1l_sigmoid",            // 4
-        "1l_div",                // 5
-        "1l_sqrt",               // 6
-        "1l_prelu",              // 7
-        "1l_var",                // 8
-        "1l_leakyrelu",          // 9
-        "1l_gelu_noappx",        // 10
-        "1l_relu",               // 11
-        "1l_tanh",               // 12
-        "2l_relu_sigmoid_small", // 13
-        "2l_relu_small",         // 14
-        "min",                   // 15
-        "max",                   // 16
-        "1l_max_pool",           // 17
-        "idolmodel",             // 18
-        "1l_identity",           // 19
-        "lstm",                  // 20
-        "rnn",                   // 21
-        "quantize_dequantize",   // 22
+        "1l_mlp",
+        "1l_flatten",
+        "1l_average",
+        "1l_reshape",
+        "1l_sigmoid",
+        "1l_div",
+        "1l_sqrt",
+        "1l_prelu",
+        "1l_var",
+        "1l_leakyrelu",
+        "1l_gelu_noappx",
+        "1l_relu",
+        "1l_tanh",
+        "2l_relu_sigmoid_small",
+        "2l_relu_small",
+        "min",
+        "max",
+        "1l_max_pool",
+        "idolmodel",
+        "1l_identity",
+        "lstm",
+        "rnn",
+        "quantize_dequantize",
     ];
 
     const TESTS_EVM_AGGR: [&str; 18] = [
@@ -542,7 +541,7 @@ mod native_tests {
                 crate::native_tests::init_binary();
                 let test_dir = TempDir::new(test).unwrap();
                 let path = test_dir.path().to_str().unwrap(); crate::native_tests::mv_test_(path, test);
-                mock(path, test.to_string(), "public", "fixed", "public", 1, "accuracy", None, 0.0, false, None, None);
+                mock(path, test.to_string(), "public", "fixed", "public", 1, "accuracy", None, 0.0, false);
                 test_dir.close().unwrap();
             }
         });
@@ -607,7 +606,7 @@ mod native_tests {
                 crate::native_tests::init_binary();
                 let test_dir = TempDir::new(test).unwrap();
                 let path = test_dir.path().to_str().unwrap(); crate::native_tests::mv_test_(path, test);
-                mock(path, test.to_string(), "private", "private", "public", 1, "resources", None, 0.0, false, None, None);
+                mock(path, test.to_string(), "private", "private", "public", 1, "resources", None, 0.0, false);
                 test_dir.close().unwrap();
             }
 
@@ -617,7 +616,7 @@ mod native_tests {
                 crate::native_tests::init_binary();
                 let test_dir = TempDir::new(test).unwrap();
                 let path = test_dir.path().to_str().unwrap(); crate::native_tests::mv_test_(path, test);
-                mock(path, test.to_string(), "private", "private", "public", 1, "resources", None, 0.0, true, Some(8194), Some(4));
+                mock(path, test.to_string(), "private", "private", "public", 1, "resources", None, 0.0, true);
                 test_dir.close().unwrap();
             }
 
@@ -628,7 +627,7 @@ mod native_tests {
                 let path = test_dir.path().to_str().unwrap(); crate::native_tests::mv_test_(path, test);
                 // gen random number between 0.0 and 1.0
                 let tolerance = rand::thread_rng().gen_range(0.0..1.0) * 100.0;
-                mock(path, test.to_string(), "private", "private", "public", 1, "resources", None, tolerance, false, Some(8194), Some(5));
+                mock(path, test.to_string(), "private", "private", "public", 1, "resources", None, tolerance, false);
                 test_dir.close().unwrap();
             }
 
@@ -643,7 +642,7 @@ mod native_tests {
                     let path = test_dir.path().to_str().unwrap(); crate::native_tests::mv_test_(path, test);
                     let large_batch_dir = &format!("large_batches_{}", test);
                     crate::native_tests::mk_data_batches_(path, test, &large_batch_dir, 10);
-                    mock(path, large_batch_dir.to_string(), "private", "private", "public", 10, "resources", None, 0.0, false, None, None);
+                    mock(path, large_batch_dir.to_string(), "private", "private", "public", 10, "resources", None, 0.0, false);
                     test_dir.close().unwrap();
                 }
             }
@@ -653,7 +652,7 @@ mod native_tests {
                 crate::native_tests::init_binary();
                 let test_dir = TempDir::new(test).unwrap();
                 let path = test_dir.path().to_str().unwrap(); crate::native_tests::mv_test_(path, test);
-                mock(path, test.to_string(), "public", "private", "private", 1, "resources", None, 0.0, false, None, None);
+                mock(path, test.to_string(), "public", "private", "private", 1, "resources", None, 0.0, false);
                 test_dir.close().unwrap();
             }
 
@@ -662,7 +661,7 @@ mod native_tests {
                 crate::native_tests::init_binary();
                 let test_dir = TempDir::new(test).unwrap();
                 let path = test_dir.path().to_str().unwrap(); crate::native_tests::mv_test_(path, test);
-                mock(path, test.to_string(), "public", "hashed", "private", 1, "resources", None, 0.0, false, None, None);
+                mock(path, test.to_string(), "public", "hashed", "private", 1, "resources", None, 0.0, false);
                 test_dir.close().unwrap();
             }
 
@@ -671,7 +670,7 @@ mod native_tests {
                 crate::native_tests::init_binary();
                 let test_dir = TempDir::new(test).unwrap();
                 let path = test_dir.path().to_str().unwrap(); crate::native_tests::mv_test_(path, test);
-                mock(path, test.to_string(), "fixed", "private", "private", 1, "resources", None, 0.0, false, None, None);
+                mock(path, test.to_string(), "fixed", "private", "private", 1, "resources", None, 0.0, false);
                 test_dir.close().unwrap();
             }
 
@@ -680,7 +679,7 @@ mod native_tests {
                 crate::native_tests::init_binary();
                 let test_dir = TempDir::new(test).unwrap();
                 let path = test_dir.path().to_str().unwrap(); crate::native_tests::mv_test_(path, test);
-                mock(path, test.to_string(), "private", "private", "fixed", 1, "resources", None, 0.0, false, None, None);
+                mock(path, test.to_string(), "private", "private", "fixed", 1, "resources", None, 0.0, false);
                 test_dir.close().unwrap();
             }
 
@@ -689,7 +688,7 @@ mod native_tests {
                 crate::native_tests::init_binary();
                 let test_dir = TempDir::new(test).unwrap();
                 let path = test_dir.path().to_str().unwrap(); crate::native_tests::mv_test_(path, test);
-                mock(path, test.to_string(), "private", "fixed", "private", 1, "resources", None, 0.0, false, None, None);
+                mock(path, test.to_string(), "private", "fixed", "private", 1, "resources", None, 0.0, false);
                 test_dir.close().unwrap();
             }
 
@@ -698,7 +697,7 @@ mod native_tests {
                 crate::native_tests::init_binary();
                 let test_dir = TempDir::new(test).unwrap();
                 let path = test_dir.path().to_str().unwrap(); crate::native_tests::mv_test_(path, test);
-                mock(path, test.to_string(), "hashed", "private", "public", 1, "resources", None, 0.0, false, None, None);
+                mock(path, test.to_string(), "hashed", "private", "public", 1, "resources", None, 0.0, false);
                 test_dir.close().unwrap();
             }
 
@@ -707,7 +706,7 @@ mod native_tests {
                 crate::native_tests::init_binary();
                 let test_dir = TempDir::new(test).unwrap();
                 let path = test_dir.path().to_str().unwrap(); crate::native_tests::mv_test_(path, test);
-                mock(path, test.to_string(), "polycommit", "private", "public", 1, "resources", None, 0.0, false, None, None);
+                mock(path, test.to_string(), "polycommit", "private", "public", 1, "resources", None, 0.0, false);
                 test_dir.close().unwrap();
             }
 
@@ -717,7 +716,7 @@ mod native_tests {
                 crate::native_tests::init_binary();
                 let test_dir = TempDir::new(test).unwrap();
                 let path = test_dir.path().to_str().unwrap(); crate::native_tests::mv_test_(path, test);
-                mock(path, test.to_string(), "private", "hashed", "public", 1, "resources", None, 0.0, false, None, None);
+                mock(path, test.to_string(), "private", "hashed", "public", 1, "resources", None, 0.0, false);
                 test_dir.close().unwrap();
             }
 
@@ -727,7 +726,7 @@ mod native_tests {
                 crate::native_tests::init_binary();
                 let test_dir = TempDir::new(test).unwrap();
                 let path = test_dir.path().to_str().unwrap(); crate::native_tests::mv_test_(path, test);
-                mock(path, test.to_string(), "private", "polycommit", "public", 1, "resources", None, 0.0, false, None, None);
+                mock(path, test.to_string(), "private", "polycommit", "public", 1, "resources", None, 0.0, false);
                 test_dir.close().unwrap();
             }
 
@@ -736,7 +735,7 @@ mod native_tests {
                 crate::native_tests::init_binary();
                 let test_dir = TempDir::new(test).unwrap();
                 let path = test_dir.path().to_str().unwrap(); crate::native_tests::mv_test_(path, test);
-                mock(path, test.to_string(), "public", "private", "hashed", 1, "resources", None, 0.0, false, None, None);
+                mock(path, test.to_string(), "public", "private", "hashed", 1, "resources", None, 0.0, false);
                 test_dir.close().unwrap();
             }
 
@@ -746,7 +745,7 @@ mod native_tests {
                 crate::native_tests::init_binary();
                 let test_dir = TempDir::new(test).unwrap();
                 let path = test_dir.path().to_str().unwrap(); crate::native_tests::mv_test_(path, test);
-                mock(path, test.to_string(), "public", "private", "polycommit", 1, "resources", None, 0.0, false, None, None);
+                mock(path, test.to_string(), "public", "private", "polycommit", 1, "resources", None, 0.0, false);
                 test_dir.close().unwrap();
             }
 
@@ -755,7 +754,7 @@ mod native_tests {
                 crate::native_tests::init_binary();
                 let test_dir = TempDir::new(test).unwrap();
                 let path = test_dir.path().to_str().unwrap(); crate::native_tests::mv_test_(path, test);
-                mock(path, test.to_string(), "public", "fixed", "hashed", 1, "resources", None, 0.0, false, None, None);
+                mock(path, test.to_string(), "public", "fixed", "hashed", 1, "resources", None, 0.0, false);
                 test_dir.close().unwrap();
             }
 
@@ -765,7 +764,7 @@ mod native_tests {
                 crate::native_tests::init_binary();
                 let test_dir = TempDir::new(test).unwrap();
                 let path = test_dir.path().to_str().unwrap(); crate::native_tests::mv_test_(path, test);
-                mock(path, test.to_string(), "public", "polycommit", "hashed", 1, "resources", None, 0.0, false, None, None);
+                mock(path, test.to_string(), "public", "polycommit", "hashed", 1, "resources", None, 0.0, false);
                 test_dir.close().unwrap();
             }
 
@@ -775,7 +774,7 @@ mod native_tests {
                 crate::native_tests::init_binary();
                 let test_dir = TempDir::new(test).unwrap();
                 let path = test_dir.path().to_str().unwrap(); crate::native_tests::mv_test_(path, test);
-                mock(path, test.to_string(), "polycommit", "polycommit", "polycommit", 1, "resources", None, 0.0, false, None, None);
+                mock(path, test.to_string(), "polycommit", "polycommit", "polycommit", 1, "resources", None, 0.0, false);
                 test_dir.close().unwrap();
             }
 
@@ -785,7 +784,7 @@ mod native_tests {
                 crate::native_tests::init_binary();
                 let test_dir = TempDir::new(test).unwrap();
                 let path = test_dir.path().to_str().unwrap(); crate::native_tests::mv_test_(path, test);
-                mock(path, test.to_string(), "hashed", "private", "hashed", 1, "resources", None, 0.0, false, None, None);
+                mock(path, test.to_string(), "hashed", "private", "hashed", 1, "resources", None, 0.0, false);
                 test_dir.close().unwrap();
             }
 
@@ -795,7 +794,7 @@ mod native_tests {
                 let test_dir = TempDir::new(test).unwrap();
                 let path = test_dir.path().to_str().unwrap(); crate::native_tests::mv_test_(path, test);
                 // needs an extra row for the large model
-                mock(path, test.to_string(),"hashed", "hashed", "public", 1, "resources", None, 0.0, false, None, None);
+                mock(path, test.to_string(),"hashed", "hashed", "public", 1, "resources", None, 0.0, false);
                 test_dir.close().unwrap();
             }
 
@@ -805,7 +804,7 @@ mod native_tests {
                 let test_dir = TempDir::new(test).unwrap();
                 let path = test_dir.path().to_str().unwrap(); crate::native_tests::mv_test_(path, test);
                 // needs an extra row for the large model
-                mock(path, test.to_string(),"hashed", "hashed", "hashed", 1, "resources", None, 0.0, false, None, None);
+                mock(path, test.to_string(),"hashed", "hashed", "hashed", 1, "resources", None, 0.0, false);
                 test_dir.close().unwrap();
             }
 
@@ -964,7 +963,7 @@ mod native_tests {
 
             });
 
-            seq!(N in 0..=6 {
+            seq!(N in 0..=5 {
 
             #(#[test_case(LARGE_TESTS[N])])*
             #[ignore]
@@ -982,7 +981,7 @@ mod native_tests {
                 crate::native_tests::init_binary();
                 let test_dir = TempDir::new(test).unwrap();
                 let path = test_dir.path().to_str().unwrap(); crate::native_tests::mv_test_(path, test);
-                mock(path, test.to_string(), "private", "fixed", "public", 1, "resources", None, 0.0, false, None, None);
+                mock(path, test.to_string(), "private", "fixed", "public", 1, "resources", None, 0.0, false);
                 test_dir.close().unwrap();
             }
         });
@@ -1460,8 +1459,6 @@ mod native_tests {
         scales_to_use: Option<Vec<u32>>,
         tolerance: f32,
         bounded_lookup_log: bool,
-        decomp_base: Option<usize>,
-        decomp_legs: Option<usize>,
     ) {
         let mut tolerance = tolerance;
         gen_circuit_settings_and_witness(
@@ -1478,8 +1475,6 @@ mod native_tests {
             Commitments::KZG,
             2,
             bounded_lookup_log,
-            decomp_base,
-            decomp_legs,
         );
 
         if tolerance > 0.0 {
@@ -1621,8 +1616,6 @@ mod native_tests {
         commitment: Commitments,
         lookup_safety_margin: usize,
         bounded_lookup_log: bool,
-        decomp_base: Option<usize>,
-        decomp_legs: Option<usize>,
     ) {
         let mut args = vec![
             "gen-settings".to_string(),
@@ -1641,14 +1634,6 @@ mod native_tests {
             format!("--commitment={}", commitment),
         ];
 
-        if let Some(decomp_base) = decomp_base {
-            args.push(format!("--decomp-base={}", decomp_base));
-        }
-
-        if let Some(decomp_legs) = decomp_legs {
-            args.push(format!("--decomp-legs={}", decomp_legs));
-        }
-
         if bounded_lookup_log {
             args.push("--bounded-log-lookup".to_string());
         }
@@ -1766,8 +1751,6 @@ mod native_tests {
             Commitments::KZG,
             2,
             false,
-            None,
-            None,
         );
 
         println!(
@@ -2052,8 +2035,6 @@ mod native_tests {
             commitment,
             lookup_safety_margin,
             false,
-            None,
-            None,
         );
 
         let settings_path = format!("{}/{}/settings.json", test_dir, example_name);
@@ -2486,8 +2467,6 @@ mod native_tests {
             Commitments::KZG,
             2,
             false,
-            None,
-            None,
         );
 
         let model_path = format!("{}/{}/network.compiled", test_dir, example_name);
@@ -2795,10 +2774,7 @@ mod native_tests {
             "--features",
             "icicle",
         ];
-        #[cfg(feature = "macos-metal")]
-        let args = ["build", "--release", "--bin", "ezkl", "--features", "macos-metal"];
-        // not macos-metal and not icicle
-        #[cfg(all(not(feature = "icicle"), not(feature = "macos-metal")))]
+        #[cfg(not(feature = "icicle"))]
         let args = ["build", "--release", "--bin", "ezkl"];
         #[cfg(not(feature = "mv-lookup"))]
         let args = [

tests/python/binding_tests.py

@@ -873,7 +873,6 @@ def get_examples():
         'linear_regression',
         "mnist_gan",
         "smallworm",
-        "fr_age"
     ]
     examples = []
     for subdir, _, _ in os.walk(os.path.join(examples_path, "onnx")):