bump to 1d_conv

move to large test
Update binding_tests.py
2026-01-13 08:17:57 -05:00 · 2025-02-09 14:16:34 -05:00 · 2025-02-09 09:30:26 -05:00 · 2025-02-08 20:38:28 -05:00 · 2025-02-08 20:08:19 -05:00 · 2025-02-08 20:06:59 -05:00
38 changed files with 2119 additions and 392 deletions
--- a/.github/workflows/benchmarks.yml
+++ b/.github/workflows/benchmarks.yml
@@ -12,10 +12,10 @@ jobs:
      contents: read
    runs-on: self-hosted
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2023-06-27
          override: true
@@ -29,10 +29,10 @@ jobs:
    runs-on: self-hosted
    needs: [bench_poseidon]
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2023-06-27
          override: true
@@ -46,10 +46,10 @@ jobs:
    runs-on: self-hosted
    needs: [bench_poseidon]
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2023-06-27
          override: true
@@ -63,10 +63,10 @@ jobs:
    runs-on: self-hosted
    needs: [bench_poseidon]
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2023-06-27
          override: true
@@ -80,10 +80,10 @@ jobs:
    runs-on: self-hosted
    needs: [bench_poseidon]
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2023-06-27
          override: true
@@ -97,10 +97,10 @@ jobs:
    runs-on: self-hosted
    needs: [bench_poseidon]
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2023-06-27
          override: true
@@ -114,10 +114,10 @@ jobs:
    runs-on: self-hosted
    needs: [bench_poseidon]
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2023-06-27
          override: true
@@ -131,10 +131,10 @@ jobs:
    runs-on: self-hosted
    needs: [bench_poseidon]
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2023-06-27
          override: true
@@ -148,10 +148,10 @@ jobs:
    runs-on: self-hosted
    needs: [bench_poseidon]
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2023-06-27
          override: true
@@ -165,10 +165,10 @@ jobs:
    runs-on: self-hosted
    needs: [bench_poseidon]
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2023-06-27
          override: true
@@ -182,10 +182,10 @@ jobs:
    runs-on: self-hosted
    needs: [bench_poseidon]
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2023-06-27
          override: true
--- a/.github/workflows/engine.yml
+++ b/.github/workflows/engine.yml
@@ -24,15 +24,15 @@ jobs:
    runs-on: ubuntu-latest
    if: startsWith(github.ref, 'refs/tags/')
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2024-07-18
          override: true
          components: rustfmt, clippy
-      - uses: jetli/wasm-pack-action@v0.4.0
+      - uses: jetli/wasm-pack-action@0d096b08b4e5a7de8c28de67e11e945404e9eefa  #v0.4.0
        with:
          # Pin to version 0.12.1
          version: 'v0.12.1'
@@ -176,7 +176,7 @@ jobs:
          curl -s "https://raw.githubusercontent.com/zkonduit/ezkljs-engine/main/README.md" > ./pkg/README.md

      - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7  #v3.8.2
        with:
          node-version: "18.12.1"
          registry-url: "https://registry.npmjs.org"
@@ -201,7 +201,7 @@ jobs:
        RELEASE_TAG: ${{ github.ref_name }}
    if: startsWith(github.ref, 'refs/tags/')
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
      - name: Update version in package.json
@@ -230,13 +230,13 @@ jobs:
          NR==30{$0="    specifier: \"" tag "\""}
          NR==31{$0="    version: \"" tag "\""}
          NR==400{$0="  /@ezkljs/engine@" tag ":"}
-          NR==401{$0="    resolution: {integrity: \"" integrity "\"}"} 1' in-browser-evm-verifier/pnpm-lock.yaml > temp.yaml && mv temp.yaml in-browser-evm-verifier/pnpm-lock.yaml  
+          NR==401{$0="    resolution: {integrity: \"" integrity "\"}"} 1' in-browser-evm-verifier/pnpm-lock.yaml > temp.yaml && mv temp.yaml in-browser-evm-verifier/pnpm-lock.yaml
      - name: Use pnpm 8
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@eae0cfeb286e66ffb5155f1a79b90583a127a68b  #v2.4.1
        with:
          version: 8
      - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7  #v3.8.2
        with:
          node-version: "18.12.1"
          registry-url: "https://registry.npmjs.org"
@@ -247,4 +247,4 @@ jobs:
          pnpm run build
          pnpm publish --no-git-checks
        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}  
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
--- a/.github/workflows/large-tests.yml
+++ b/.github/workflows/large-tests.yml
@@ -10,10 +10,10 @@ jobs:
      contents: read
    runs-on: kaiju
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2024-07-18
          override: true
--- a/.github/workflows/pypi-gpu.yml
+++ b/.github/workflows/pypi-gpu.yml
@@ -28,37 +28,36 @@ jobs:
    env:
      RELEASE_TAG: ${{ github.ref_name }}
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@b64ffcaf5b410884ad320a9cfac8866006a109aa  #v4.8.0
        with:
          python-version: 3.12
          architecture: x64

-      - name: Set pyproject.toml version to match github tag
+      - name: Set pyproject.toml version to match github tag and rename ezkl to ezkl-gpu
        shell: bash
        run: |
            mv pyproject.toml pyproject.toml.orig
-            sed "s/ezkl/ezkl-gpu/" pyproject.toml.orig >pyproject.toml
-            sed "s/0\\.0\\.0/${RELEASE_TAG//v}/" pyproject.toml.orig >pyproject.toml
+            sed "s/ezkl/ezkl-gpu/" pyproject.toml.orig > pyproject.toml.tmp
+            sed "s/0\\.0\\.0/${RELEASE_TAG//v}/" pyproject.toml.tmp > pyproject.toml

-      - name: rename ezkl.pyi to ezkl-gpu.pyi
-        run: mv ezkl.pyi ezkl-gpu.pyi
-
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2023-06-27
          override: true
          components: rustfmt, clippy

-      - name: Set Cargo.toml version to match github tag
+      - name: Set Cargo.toml version to match github tag and rename ezkl to ezkl-gpu
        shell: bash
+        # the ezkl substitution here looks for the first instance of name = "ezkl" and changes it to "ezkl-gpu"
        run: |
          mv Cargo.toml Cargo.toml.orig
-          sed "s/0\\.0\\.0/${RELEASE_TAG//v}/" Cargo.toml.orig >Cargo.toml
+          sed "0,/name = \"ezkl\"/s/name = \"ezkl\"/name = \"ezkl-gpu\"/" Cargo.toml.orig > Cargo.toml.tmp
+          sed "s/0\\.0\\.0/${RELEASE_TAG//v}/" Cargo.toml.tmp > Cargo.toml
          mv Cargo.lock Cargo.lock.orig
-          sed "s/0\\.0\\.0/${RELEASE_TAG//v}/" Cargo.lock.orig >Cargo.lock
+          sed "s/0\\.0\\.0/${RELEASE_TAG//v}/" Cargo.lock.orig > Cargo.lock

      - name: Install required libraries
        shell: bash
@@ -66,7 +65,7 @@ jobs:
          sudo apt-get update && sudo apt-get install -y openssl pkg-config libssl-dev

      - name: Build wheels
-        uses: PyO3/maturin-action@v1
+        uses: PyO3/maturin-action@5f8a1b3b0aad13193f46c9131f9b9e663def8ce5  #v1.46.0
        with:
          target: ${{ matrix.target }}
          manylinux: auto
@@ -79,7 +78,7 @@ jobs:
          pip install ezkl-gpu --no-index --find-links dist --force-reinstall

      - name: Upload wheels
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08  #v4.6.0
        with:
          name: wheels
          path: dist
@@ -95,7 +94,7 @@ jobs:
    # needs: [ macos, windows, linux, linux-cross, musllinux, musllinux-cross ]
    needs: [linux]
    steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16  #v4.1.8
        with:
          name: wheels
      - name: List Files
@@ -107,14 +106,14 @@ jobs:
      # publishes to PyPI
      - name: Publish package distributions to PyPI
        continue-on-error: true
-        uses: pypa/gh-action-pypi-publish@unstable/v1
+        uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc  #v1.12.4
        with:
-          packages-dir: ./
+          packages-dir: ./wheels

      # publishes to TestPyPI
      - name: Publish package distribution to TestPyPI
        continue-on-error: true
-        uses: pypa/gh-action-pypi-publish@unstable/v1
+        uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc  #v1.12.4
        with:
          repository-url: https://test.pypi.org/legacy/
-          packages-dir: ./
+          packages-dir: ./wheels
--- a/.github/workflows/pypi.yml
+++ b/.github/workflows/pypi.yml
@@ -26,10 +26,10 @@ jobs:
    env:
        RELEASE_TAG: ${{ github.ref_name }}
    steps:
-      - uses: actions/checkout@v4
-        with: 
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
+        with:
          persist-credentials: false
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@b64ffcaf5b410884ad320a9cfac8866006a109aa  #v4.8.0
        with:
          python-version: 3.12
          architecture: x64
@@ -48,7 +48,7 @@ jobs:
          mv Cargo.lock Cargo.lock.orig
          sed "s/0\\.0\\.0/${RELEASE_TAG//v}/" Cargo.lock.orig >Cargo.lock

-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2024-07-18
          override: true
@@ -56,13 +56,13 @@ jobs:

      - name: Build wheels
        if: matrix.target == 'universal2-apple-darwin'
-        uses: PyO3/maturin-action@v1
+        uses: PyO3/maturin-action@5f8a1b3b0aad13193f46c9131f9b9e663def8ce5  #v1.46.0
        with:
          target: ${{ matrix.target }}
          args: --release --out dist --features python-bindings
      - name: Build wheels
        if: matrix.target == 'x86_64'
-        uses: PyO3/maturin-action@v1
+        uses: PyO3/maturin-action@5f8a1b3b0aad13193f46c9131f9b9e663def8ce5  #v1.46.0
        with:
          target: ${{ matrix.target }}
          args: --release --out dist --features python-bindings
@@ -73,7 +73,7 @@ jobs:
          python -c "import ezkl"

      - name: Upload wheels
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08  #v4.6.0
        with:
          name: dist-macos-${{ matrix.target }}
          path: dist
@@ -87,10 +87,10 @@ jobs:
      matrix:
        target: [x64, x86]
    steps:
-      - uses: actions/checkout@v4
-        with: 
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
+        with:
          persist-credentials: false
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@b64ffcaf5b410884ad320a9cfac8866006a109aa  #v4.8.0
        with:
          python-version: 3.12
          architecture: ${{ matrix.target }}
@@ -113,14 +113,14 @@ jobs:
          mv Cargo.lock Cargo.lock.orig
          sed "s/0\\.0\\.0/${RELEASE_TAG//v}/" Cargo.lock.orig >Cargo.lock

-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2024-07-18
          override: true
          components: rustfmt, clippy

      - name: Build wheels
-        uses: PyO3/maturin-action@v1
+        uses: PyO3/maturin-action@5f8a1b3b0aad13193f46c9131f9b9e663def8ce5  #v1.46.0
        with:
          target: ${{ matrix.target }}
          args: --release --out dist --features python-bindings
@@ -130,7 +130,7 @@ jobs:
          python -c "import ezkl"

      - name: Upload wheels
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08  #v4.6.0 #v4.6.0
        with:
          name: dist-windows-${{ matrix.target }}
          path: dist
@@ -144,10 +144,10 @@ jobs:
      matrix:
        target: [x86_64]
    steps:
-      - uses: actions/checkout@v4
-        with: 
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
+        with:
          persist-credentials: false
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@b64ffcaf5b410884ad320a9cfac8866006a109aa  #v4.8.0
        with:
          python-version: 3.12
          architecture: x64
@@ -176,7 +176,7 @@ jobs:
          sudo apt-get update && sudo apt-get install -y openssl pkg-config libssl-dev

      - name: Build wheels
-        uses: PyO3/maturin-action@v1
+        uses: PyO3/maturin-action@5f8a1b3b0aad13193f46c9131f9b9e663def8ce5  #v1.46.0
        with:
          target: ${{ matrix.target }}
          manylinux: auto
@@ -203,7 +203,7 @@ jobs:
          python -c "import ezkl"

      - name: Upload wheels
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08  #v4.6.0
        with:
          name: dist-linux-${{ matrix.target }}
          path: dist
@@ -218,10 +218,10 @@ jobs:
        target:
          - x86_64-unknown-linux-musl
    steps:
-      - uses: actions/checkout@v4
-        with: 
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
+        with:
          persist-credentials: false
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@b64ffcaf5b410884ad320a9cfac8866006a109aa  #v4.8.0
        with:
          python-version: 3.12
          architecture: x64
@@ -250,7 +250,7 @@ jobs:
          sudo apt-get update && sudo apt-get install -y pkg-config libssl-dev

      - name: Build wheels
-        uses: PyO3/maturin-action@v1
+        uses: PyO3/maturin-action@5f8a1b3b0aad13193f46c9131f9b9e663def8ce5  #v1.46.0
        with:
          target: ${{ matrix.target }}
          manylinux: musllinux_1_2
@@ -271,7 +271,7 @@ jobs:
            python3 -c "import ezkl"

      - name: Upload wheels
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08  #v4.6.0
        with:
          name: dist-musllinux-${{ matrix.target }}
          path: dist
@@ -287,10 +287,10 @@ jobs:
          - target: aarch64-unknown-linux-musl
            arch: aarch64
    steps:
-      - uses: actions/checkout@v4
-        with: 
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
+        with:
          persist-credentials: false
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@b64ffcaf5b410884ad320a9cfac8866006a109aa  #v4.8.0
        with:
          python-version: 3.12

@@ -313,13 +313,13 @@ jobs:
          sed "s/0\\.0\\.0/${RELEASE_TAG//v}/" Cargo.lock.orig >Cargo.lock

      - name: Build wheels
-        uses: PyO3/maturin-action@v1
+        uses: PyO3/maturin-action@5f8a1b3b0aad13193f46c9131f9b9e663def8ce5  #v1.46.0
        with:
          target: ${{ matrix.platform.target }}
          manylinux: musllinux_1_2
          args: --release --out dist --features python-bindings

-      - uses: uraimo/run-on-arch-action@v2.8.1
+      - uses: uraimo/run-on-arch-action@5397f9e30a9b62422f302092631c99ae1effcd9e  #v2.8.1
        name: Install built wheel
        with:
          arch: ${{ matrix.platform.arch }}
@@ -334,7 +334,7 @@ jobs:
            python3 -c "import ezkl"

      - name: Upload wheels
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08  #v4.6.0
        with:
          name: dist-musllinux-${{ matrix.platform.target }}
          path: dist
@@ -347,26 +347,26 @@ jobs:
    if: "startsWith(github.ref, 'refs/tags/')"
    needs: [macos, windows, linux, musllinux, musllinux-cross]
    steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16  #v4.1.8
        with:
          pattern: dist-*
          merge-multiple: true
-          path: dist
+          path: wheels
      - name: List Files
        run: ls -R
-      
+
      # # publishes to TestPyPI
      # - name: Publish package distribution to TestPyPI
-      #   uses: pypa/gh-action-pypi-publish@unstable/v1
+      #   uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc  #v1.12.4
      #   with:
      #     repository-url: https://test.pypi.org/legacy/
      #     packages-dir: ./

      # publishes to PyPI
      - name: Publish package distributions to PyPI
-        uses: pypa/gh-action-pypi-publish@unstable/v1
+        uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc  #v1.12.4
        with:
-          packages-dir: ./
+          packages-dir: ./wheels


  doc-publish:
@@ -377,7 +377,7 @@ jobs:
    needs: pypi-publish
    steps:
      - uses: actions/checkout@v4
-        with: 
+        with:
          persist-credentials: false
      - name: Trigger RTDs build
        uses: dfm/rtds-action@v1
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -30,7 +30,7 @@ jobs:

      - name: Create Github Release
        id: create-release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda  #v2.2.1
        with:
          token: ${{ secrets.RELEASE_TOKEN }}
          tag_name: ${{ env.EZKL_VERSION }}
@@ -49,14 +49,14 @@ jobs:
      RUST_BACKTRACE: 1
      PCRE2_SYS_STATIC: 1
    steps:
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2024-07-18
          override: true
          components: rustfmt, clippy
      - name: Checkout repo
-        uses: actions/checkout@v4
-        with: 
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
+        with:
          persist-credentials: false


@@ -90,7 +90,7 @@ jobs:
          echo "ASSET=build-artifacts/ezkl-linux-gpu.tar.gz" >> $GITHUB_ENV

      - name: Upload release archive
-        uses: actions/upload-release-asset@v1.0.2
+        uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5  #v1.0.2
        env:
          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
        with:
@@ -144,8 +144,8 @@ jobs:

    steps:
      - name: Checkout repo
-        uses: actions/checkout@v4
-        with: 
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
+        with:
          persist-credentials: false

      - name: Get release version from tag
@@ -170,7 +170,7 @@ jobs:
          fi

      - name: Install Rust
-        uses: dtolnay/rust-toolchain@nightly
+        uses: dtolnay/rust-toolchain@4f94fbe7e03939b0e674bcc9ca609a16088f63ff  #nightly branch, TODO: update when required
        with:
          target: ${{ matrix.target }}

@@ -196,7 +196,7 @@ jobs:
          echo "target flag is: ${{ env.TARGET_FLAGS }}"
          echo "target dir is: ${{ env.TARGET_DIR }}"

-      - name: Build release binary (no asm or metal) 
+      - name: Build release binary (no asm or metal)
        if: matrix.build != 'linux-gnu' && matrix.build != 'macos-aarch64'
        run: ${{ env.CARGO }} build --release ${{ env.TARGET_FLAGS }} -Z sparse-registry

@@ -233,7 +233,7 @@ jobs:
          echo "ASSET=build-artifacts/ezkl-win.zip" >> $GITHUB_ENV

      - name: Upload release archive
-        uses: actions/upload-release-asset@v1.0.2
+        uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5  #v1.0.2
        env:
          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
        with:
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -25,10 +25,10 @@ jobs:
      contents: read
    runs-on: large-self-hosted
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2024-07-18
          override: true
@@ -45,10 +45,10 @@ jobs:
      contents: read
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2024-07-18
          override: true
@@ -61,10 +61,10 @@ jobs:
      contents: read
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2024-07-18
          override: true
@@ -77,15 +77,15 @@ jobs:
      contents: read
    runs-on: ubuntu-latest-32-cores
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2024-07-18
          override: true
          components: rustfmt, clippy
-      - uses: baptiste0928/cargo-install@v1
+      - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
        with:
          crate: cargo-nextest
          locked: true
@@ -102,19 +102,19 @@ jobs:
  #   env:
  #     ENABLE_ICICLE_GPU: true
  #   steps:
-  #     - uses: actions/checkout@v4
+  #     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
  # with:
  #   persist-credentials: false
-  #     - uses: actions-rs/toolchain@v1
+  #     - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
  #       with:
  #         toolchain: nightly-2024-07-18
  #         override: true
  #         components: rustfmt, clippy
-  #     - uses: baptiste0928/cargo-install@v1
+  #     - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
  #       with:
  #         crate: cargo-nextest
  #         locked: true
-  #     - uses: mwilliamson/setup-wasmtime-action@v2
+  #     - uses: mwilliamson/setup-wasmtime-action@bf814d7d8fc3c3a77dfe114bd9fb8a2c575f6ad6  #v2.0.0
  #       with:
  #         wasmtime-version: "3.0.1"
  #     - name: Install wasm32-wasi
@@ -139,19 +139,19 @@ jobs:
      contents: read
    runs-on: non-gpu
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2024-07-18
          override: true
          components: rustfmt, clippy
-      - uses: baptiste0928/cargo-install@v1
+      - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
        with:
          crate: cargo-nextest
          locked: true
-      - uses: mwilliamson/setup-wasmtime-action@v2
+      - uses: mwilliamson/setup-wasmtime-action@bf814d7d8fc3c3a77dfe114bd9fb8a2c575f6ad6  #v2.0.0
        with:
          wasmtime-version: "3.0.1"
      - name: Install wasm32-wasi
@@ -176,19 +176,19 @@ jobs:
      contents: read
    runs-on: non-gpu
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2024-07-18
          override: true
          components: rustfmt, clippy
-      - uses: baptiste0928/cargo-install@v1
+      - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
        with:
          crate: cargo-nextest
          locked: true
-      - uses: mwilliamson/setup-wasmtime-action@v2
+      - uses: mwilliamson/setup-wasmtime-action@bf814d7d8fc3c3a77dfe114bd9fb8a2c575f6ad6  #v2.0.0
        with:
          wasmtime-version: "3.0.1"
      - name: Install wasm32-wasi
@@ -213,15 +213,15 @@ jobs:
      contents: read
    runs-on: ubuntu-latest-16-cores
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2024-07-18
          override: true
          components: rustfmt, clippy
-      - uses: baptiste0928/cargo-install@v1
+      - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
        with:
          crate: cargo-nextest
          locked: true
@@ -233,19 +233,19 @@ jobs:
      contents: read
    runs-on: non-gpu
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2024-07-18
          override: true
          components: rustfmt, clippy
-      - uses: jetli/wasm-pack-action@v0.4.0
+      - uses: jetli/wasm-pack-action@0d096b08b4e5a7de8c28de67e11e945404e9eefa  #v0.4.0
        with:
          # Pin to version 0.12.1
          version: "v0.12.1"
-      - uses: nanasess/setup-chromedriver@v2
+      - uses: nanasess/setup-chromedriver@e93e57b843c0c92788f22483f1a31af8ee48db25  #v2.3.0
        # with:
        #   chromedriver-version: "115.0.5790.102"
      - name: Install wasm32-unknown-unknown
@@ -262,20 +262,22 @@ jobs:
      contents: read
    runs-on: non-gpu
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2024-07-18
          override: true
          components: rustfmt, clippy
-      - uses: baptiste0928/cargo-install@v1
+      - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
        with:
          crate: cargo-nextest
          locked: true
      # - name: The Worm Mock
      #   run: cargo nextest run --verbose tests::large_mock_::large_tests_5_expects -- --include-ignored
+      - name: Large 1D Conv Mock
+        run: cargo nextest run --verbose tests::large_mock_::large_tests_7_expects -- --include-ignored
      - name: MNIST Gan Mock
        run: cargo nextest run --verbose tests::large_mock_::large_tests_4_expects -- --include-ignored
      - name: NanoGPT Mock
@@ -329,27 +331,27 @@ jobs:
    runs-on: non-gpu
    needs: [build, library-tests, docs, python-tests, python-integration-tests]
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2024-07-18
          override: true
          components: rustfmt, clippy
-      - uses: baptiste0928/cargo-install@v1
+      - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
        with:
          crate: cargo-nextest
          locked: true
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
      - name: Use pnpm 8
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@eae0cfeb286e66ffb5155f1a79b90583a127a68b  #v2.4.1
        with:
          version: 8
      - name: Use Node.js 18.12.1
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7  #v3.8.2
        with:
          node-version: "18.12.1"
          cache: "pnpm"
@@ -414,28 +416,28 @@ jobs:
  #   runs-on: macos-13
  #   # needs: [build, library-tests, docs]
  #   steps:
-  #     - uses: actions/checkout@v4
+  #     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
  #       with:
  #         persist-credentials: false
-  #     - uses: actions-rs/toolchain@v1
+  #     - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
  #       with:
  #         toolchain: nightly-2024-07-18
  #         override: true
  #         components: rustfmt, clippy
-  #     - uses: jetli/wasm-pack-action@v0.4.0
+  #     - uses: jetli/wasm-pack-action@0d096b08b4e5a7de8c28de67e11e945404e9eefa  #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
+  #     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
  #       with:
  #         persist-credentials: false
  #     - name: Use pnpm 8
-  #       uses: pnpm/action-setup@v2
+  #       uses: pnpm/action-setup@eae0cfeb286e66ffb5155f1a79b90583a127a68b  #v2.4.1
  #       with:
  #         version: 8
-  #     - uses: baptiste0928/cargo-install@v1
+  #     - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
  #       with:
  #         crate: cargo-nextest
  #         locked: true
@@ -448,15 +450,15 @@ jobs:
    runs-on: non-gpu
    needs: [build, library-tests, docs]
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2024-07-18
          override: true
          components: rustfmt, clippy
-      - uses: jetli/wasm-pack-action@v0.4.0
+      - uses: jetli/wasm-pack-action@0d096b08b4e5a7de8c28de67e11e945404e9eefa  #v0.4.0
        with:
          # Pin to version 0.12.1
          version: "v0.12.1"
@@ -465,15 +467,15 @@ 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
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
      - name: Use pnpm 8
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@eae0cfeb286e66ffb5155f1a79b90583a127a68b  #v2.4.1
        with:
          version: 8
      - name: Use Node.js 18.12.1
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7  #v3.8.2
        with:
          node-version: "18.12.1"
          cache: "pnpm"
@@ -483,7 +485,7 @@ jobs:
        env:
          CI: false
          NODE_ENV: development
-      - uses: baptiste0928/cargo-install@v1
+      - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
        with:
          crate: cargo-nextest
          locked: true
@@ -529,18 +531,18 @@ jobs:
  #   env:
  #     ENABLE_ICICLE_GPU: true
  #   steps:
-  #     - uses: actions/checkout@v4
+  #     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
  # with:
  #   persist-credentials: false
-  #     - uses: actions-rs/toolchain@v1
+  #     - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
  #       with:
  #         toolchain: nightly-2024-07-18
  #         override: true
  #         components: rustfmt, clippy
  #     - name: Add rust-src
  #       run: rustup component add rust-src --toolchain nightly-2024-07-18-x86_64-unknown-linux-gnu
-  #     - uses: actions/checkout@v3
-  #     - uses: baptiste0928/cargo-install@v1
+  #     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
+  #     - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
  #       with:
  #         crate: cargo-nextest
  #         locked: true
@@ -567,15 +569,15 @@ jobs:
    runs-on: self-hosted
    needs: [build, library-tests, docs, python-tests, python-integration-tests]
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@4f94fbe7e03939b0e674bcc9ca609a16088f63ff  #nightly branch, TODO: update when required
        with:
          toolchain: nightly-2024-07-18
          override: true
          components: rustfmt, clippy
-      - uses: baptiste0928/cargo-install@v1
+      - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
        with:
          crate: cargo-nextest
          locked: true
@@ -587,15 +589,15 @@ jobs:
  #   env:
  #     ENABLE_ICICLE_GPU: true
  #   steps:
-  #     - uses: actions/checkout@v4
+  #     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
  # with:
  #   persist-credentials: false
-  #     - uses: actions-rs/toolchain@v1
+  #     - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
  #       with:
  #         toolchain: nightly-2024-07-18
  #         override: true
  #         components: rustfmt, clippy
-  #     - uses: baptiste0928/cargo-install@v1
+  #     - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
  #       with:
  #         crate: cargo-nextest
  #         locked: true
@@ -608,15 +610,15 @@ jobs:
    runs-on: large-self-hosted
    needs: [build, library-tests, docs, python-tests, python-integration-tests]
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2024-07-18
          override: true
          components: rustfmt, clippy
-      - uses: baptiste0928/cargo-install@v1
+      - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
        with:
          crate: cargo-nextest
          locked: true
@@ -629,15 +631,15 @@ jobs:
    runs-on: large-self-hosted
    needs: [build, library-tests, docs, python-tests, python-integration-tests]
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2024-07-18
          override: true
          components: rustfmt, clippy
-      - uses: baptiste0928/cargo-install@v1
+      - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
        with:
          crate: cargo-nextest
          locked: true
@@ -654,15 +656,15 @@ jobs:
    runs-on: ubuntu-latest-32-cores
    needs: [build, library-tests, docs]
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2024-07-18
          override: true
          components: rustfmt, clippy
-      - uses: baptiste0928/cargo-install@v1
+      - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
        with:
          crate: cargo-nextest
          locked: true
@@ -675,13 +677,13 @@ jobs:
    runs-on: non-gpu
    needs: [build, library-tests, docs]
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@b64ffcaf5b410884ad320a9cfac8866006a109aa  #v4.8.0
        with:
          python-version: "3.12"
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2024-07-18
          override: true
@@ -705,18 +707,18 @@ jobs:
    runs-on: non-gpu
    needs: [build, library-tests, docs, python-tests, python-integration-tests]
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@b64ffcaf5b410884ad320a9cfac8866006a109aa  #v4.8.0
        with:
          python-version: "3.12"
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2024-07-18
          override: true
          components: rustfmt, clippy
-      - uses: baptiste0928/cargo-install@v1
+      - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
        with:
          crate: cargo-nextest
          locked: true
@@ -756,18 +758,18 @@ jobs:
          # Maps tcp port 5432 on service container to the host
          - 5432:5432
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@b64ffcaf5b410884ad320a9cfac8866006a109aa  #v4.8.0
        with:
          python-version: "3.11"
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2024-07-18
          override: true
          components: rustfmt, clippy
-      - uses: baptiste0928/cargo-install@v1
+      - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
        with:
          crate: cargo-nextest
          locked: true
@@ -781,6 +783,8 @@ jobs:
        run: python -m venv .env --clear; source .env/bin/activate; pip install -r requirements.txt; python -m ensurepip --upgrade
      - name: Build python ezkl
        run: source .env/bin/activate; unset CONDA_PREFIX; maturin develop --features python-bindings --profile=test-runs
+      - name: Cat and Dog notebook
+        run: source .env/bin/activate; cargo nextest run py_tests::tests::cat_and_dog_notebook_
      - name: All notebooks
        run: source .env/bin/activate; cargo nextest run py_tests::tests::run_notebook_ --test-threads 1
      - name: Voice tutorial
@@ -812,15 +816,15 @@ jobs:
      contents: read
    runs-on: macos-latest
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2024-07-18
          override: true
          components: rustfmt, clippy
-      - uses: baptiste0928/cargo-install@v1
+      - uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3  #v3.3.0
        with:
          crate: cargo-nextest
          locked: true
@@ -834,10 +838,10 @@ jobs:
    needs: [ios-integration-tests]

    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2024-07-18
          override: true
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -12,10 +12,10 @@ jobs:
      contents: read
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly-2024-07-18
          override: true
@@ -30,4 +30,3 @@ jobs:
        run: zizmor .


-    
--- a/.github/workflows/swift-pm.yml
+++ b/.github/workflows/swift-pm.yml
@@ -19,8 +19,8 @@ jobs:

    steps:
      - name: Checkout EZKL
-        uses: actions/checkout@v3
-        with: 
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
+        with:
          persist-credentials: false

      - name: Extract TAG from github.ref_name
@@ -34,7 +34,7 @@ jobs:
          echo "TAG=$NEW_TAG" >> $GITHUB_ENV

      - name: Install Rust (nightly)
-        uses: actions-rs/toolchain@v1
+        uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f  #v1.0.6
        with:
          toolchain: nightly
          override: true
--- a/.github/workflows/tagging.yml
+++ b/.github/workflows/tagging.yml
@@ -11,12 +11,12 @@ jobs:
      contents: write

    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  #v4.2.2
        with:
          persist-credentials: false
      - name: Bump version and push tag
        id: tag_version
-        uses: mathieudutour/github-tag-action@v6.2
+        uses: mathieudutour/github-tag-action@a22cf08638b34d5badda920f9daf6e72c477b07b  #v6.2
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}

@@ -46,7 +46,7 @@ jobs:
          git tag $RELEASE_TAG

      - name: Push changes
-        uses: ad-m/github-push-action@master
+        uses: ad-m/github-push-action@77c5b412c50b723d2a4fbc6d71fb5723bcd439aa  #master
        env:
          RELEASE_TAG: ${{ steps.tag_version.outputs.new_tag }}
        with:
--- a/benches/accum_conv.rs
+++ b/benches/accum_conv.rs
@@ -73,6 +73,8 @@ impl Circuit<Fr> for MyCircuit {
                            padding: vec![(0, 0)],
                            stride: vec![1; 2],
                            group: 1,
+                            data_format: DataFormat::NCHW,
+                            kernel_format: KernelFormat::OIHW,
                        }),
                    )
                    .unwrap();
--- a/benches/poseidon.rs
+++ b/benches/poseidon.rs
@@ -23,8 +23,6 @@ use halo2curves::bn256::{Bn256, Fr};
 use rand::rngs::OsRng;
 use snark_verifier::system::halo2::transcript::evm::EvmTranscript;

-const L: usize = 10;
-
 #[derive(Clone, Debug)]
 struct MyCircuit {
    image: ValTensor<Fr>,
@@ -40,7 +38,7 @@ impl Circuit<Fr> for MyCircuit {
    }

    fn configure(cs: &mut ConstraintSystem<Fr>) -> Self::Config {
-        PoseidonChip::<PoseidonSpec, POSEIDON_WIDTH, POSEIDON_RATE, 10>::configure(cs, ())
+        PoseidonChip::<PoseidonSpec, POSEIDON_WIDTH, POSEIDON_RATE>::configure(cs, ())
    }

    fn synthesize(
@@ -48,7 +46,7 @@ impl Circuit<Fr> for MyCircuit {
        config: Self::Config,
        mut layouter: impl Layouter<Fr>,
    ) -> Result<(), Error> {
-        let chip: PoseidonChip<PoseidonSpec, POSEIDON_WIDTH, POSEIDON_RATE, L> =
+        let chip: PoseidonChip<PoseidonSpec, POSEIDON_WIDTH, POSEIDON_RATE> =
            PoseidonChip::new(config);
        chip.layout(&mut layouter, &[self.image.clone()], 0, &mut HashMap::new())?;
        Ok(())
@@ -59,7 +57,7 @@ fn runposeidon(c: &mut Criterion) {
    let mut group = c.benchmark_group("poseidon");

    for size in [64, 784, 2352, 12288].iter() {
-        let k = (PoseidonChip::<PoseidonSpec, POSEIDON_WIDTH, POSEIDON_RATE, L>::num_rows(*size)
+        let k = (PoseidonChip::<PoseidonSpec, POSEIDON_WIDTH, POSEIDON_RATE>::num_rows(*size)
            as f32)
            .log2()
            .ceil() as u32;
@@ -67,7 +65,7 @@ fn runposeidon(c: &mut Criterion) {

        let message = (0..*size).map(|_| Fr::random(OsRng)).collect::<Vec<_>>();
        let _output =
-            PoseidonChip::<PoseidonSpec, POSEIDON_WIDTH, POSEIDON_RATE, L>::run(message.to_vec())
+            PoseidonChip::<PoseidonSpec, POSEIDON_WIDTH, POSEIDON_RATE>::run(message.to_vec())
                .unwrap();

        let mut image = Tensor::from(message.into_iter().map(Value::known));
--- a/examples/conv2d_mnist/main.rs
+++ b/examples/conv2d_mnist/main.rs
@@ -32,6 +32,7 @@ use mnist::*;
 use rand::rngs::OsRng;
 use std::marker::PhantomData;

+
 mod params;

 const K: usize = 20;
@@ -208,6 +209,8 @@ where
                        padding: vec![(PADDING, PADDING); 2],
                        stride: vec![STRIDE; 2],
                        group: 1,
+                        data_format: DataFormat::NCHW,
+                        kernel_format: KernelFormat::OIHW,
                    };
                    let x = config
                        .layer_config
--- a/examples/notebooks/cat_and_dog.ipynb
+++ b/examples/notebooks/cat_and_dog.ipynb
--- a/examples/notebooks/cat_and_dog_data.sh
+++ b/examples/notebooks/cat_and_dog_data.sh
@@ -0,0 +1,13 @@
+# download tess data
+# check if first argument has been set 
+if [ ! -z "$1" ]; then
+    DATA_DIR=$1
+else
+    DATA_DIR=data
+fi
+
+echo "Downloading data to $DATA_DIR"
+
+if [ ! -d "$DATA_DIR/CATDOG" ]; then
+    kaggle datasets download tongpython/cat-and-dog -p $DATA_DIR/CATDOG --unzip
+fi
--- a/examples/onnx/1d_conv/input.json
+++ b/examples/onnx/1d_conv/input.json
@@ -0,0 +1,106 @@
+{
+  "input_data": [
+    [
+      8761,
+      7654,
+      8501,
+      2404,
+      6929,
+      8858,
+      5946,
+      3673,
+      4131,
+      3854,
+      8137,
+      8239,
+      9038,
+      6299,
+      1118,
+      9737,
+      208,
+      7954,
+      3691,
+      610,
+      3468,
+      3314,
+      8658,
+      8366,
+      2850,
+      477,
+      6114,
+      232,
+      4601,
+      7420,
+      5713,
+      2936,
+      6061,
+      2870,
+      8421,
+      177,
+      7107,
+      7382,
+      6115,
+      5487,
+      8502,
+      2559,
+      1875,
+      129,
+      8533,
+      8201,
+      8414,
+      4775,
+      9817,
+      3127,
+      8761,
+      7654,
+      8501,
+      2404,
+      6929,
+      8858,
+      5946,
+      3673,
+      4131,
+      3854,
+      8137,
+      8239,
+      9038,
+      6299,
+      1118,
+      9737,
+      208,
+      7954,
+      3691,
+      610,
+      3468,
+      3314,
+      8658,
+      8366,
+      2850,
+      477,
+      6114,
+      232,
+      4601,
+      7420,
+      5713,
+      2936,
+      6061,
+      2870,
+      8421,
+      177,
+      7107,
+      7382,
+      6115,
+      5487,
+      8502,
+      2559,
+      1875,
+      129,
+      8533,
+      8201,
+      8414,
+      4775,
+      9817,
+      3127
+    ]
+  ]
+}
--- a/examples/onnx/1d_conv/network.onnx
+++ b/examples/onnx/1d_conv/network.onnx
--- a/src/bindings/python.rs
+++ b/src/bindings/python.rs
@@ -337,6 +337,8 @@ enum PyInputType {
    Int,
    ///
    TDim,
+    ///
+    Unknown,
 }

 impl From<InputType> for PyInputType {
@@ -348,6 +350,7 @@ impl From<InputType> for PyInputType {
            InputType::F64 => PyInputType::F64,
            InputType::Int => PyInputType::Int,
            InputType::TDim => PyInputType::TDim,
+            InputType::Unknown => PyInputType::Unknown,
        }
    }
 }
@@ -361,6 +364,7 @@ impl From<PyInputType> for InputType {
            PyInputType::F64 => InputType::F64,
            PyInputType::Int => InputType::Int,
            PyInputType::TDim => InputType::TDim,
+            PyInputType::Unknown => InputType::Unknown,
        }
    }
 }
@@ -375,6 +379,7 @@ impl FromStr for PyInputType {
            "f64" => Ok(PyInputType::F64),
            "int" => Ok(PyInputType::Int),
            "tdim" => Ok(PyInputType::TDim),
+            "unknown" => Ok(PyInputType::Unknown),
            _ => Err("Invalid value for InputType".to_string()),
        }
    }
@@ -592,7 +597,7 @@ fn poseidon_hash(message: Vec<PyFelt>) -> PyResult<Vec<PyFelt>> {
 /// Arguments
 /// -------
 /// message: list[str]
-///     List of field elements represnted as strings
+///     List of field elements represented as strings
 ///
 /// vk_path: str
 ///     Path to the verification key
@@ -651,7 +656,7 @@ fn kzg_commit(
 /// Arguments
 /// -------
 /// message: list[str]
-///     List of field elements represnted as strings
+///     List of field elements represented as strings
 ///
 /// vk_path: str
 ///     Path to the verification key
@@ -1945,7 +1950,7 @@ fn deploy_da_evm(
 ///     does the verifier use data attestation ?
 ///
 /// addr_vk: str
-///     The addess of the separate VK contract (if the verifier key is rendered as a separate contract)
+///     The address of the separate VK contract (if the verifier key is rendered as a separate contract)
 /// Returns
 /// -------
 /// bool
--- a/src/circuit/modules/polycommit.rs
+++ b/src/circuit/modules/polycommit.rs
@@ -1,7 +1,7 @@
 /*
 An easy-to-use implementation of the Poseidon Hash in the form of a Halo2 Chip. While the Poseidon Hash function
 is already implemented in halo2_gadgets, there is no wrapper chip that makes it easy to use in other circuits.
-Thanks to https://github.com/summa-dev/summa-solvency/blob/master/src/chips/poseidon/hash.rs for the inspiration (and also helping us understand how to use this).
+Thanks to https://github.com/summa-dev/summa-solvency/blob/master/zk_prover/src/chips/poseidon/hash.rs for the inspiration (and also helping us understand how to use this).
 */

 use std::collections::HashMap;
--- a/src/circuit/modules/poseidon.rs
+++ b/src/circuit/modules/poseidon.rs
@@ -1,7 +1,7 @@
 /*
 An easy-to-use implementation of the Poseidon Hash in the form of a Halo2 Chip. While the Poseidon Hash function
 is already implemented in halo2_gadgets, there is no wrapper chip that makes it easy to use in other circuits.
-Thanks to https://github.com/summa-dev/summa-solvency/blob/master/src/chips/poseidon/hash.rs for the inspiration (and also helping us understand how to use this).
+Thanks to https://github.com/summa-dev/summa-solvency/blob/master/zk_prover/src/chips/poseidon/hash.rs for the inspiration (and also helping us understand how to use this).
 */

 pub mod poseidon_params;
--- a/src/circuit/ops/hybrid.rs
+++ b/src/circuit/ops/hybrid.rs
@@ -3,7 +3,7 @@ use crate::{
    circuit::{layouts, utils, Tolerance},
    fieldutils::{integer_rep_to_felt, IntegerRep},
    graph::multiplier_to_scale,
-    tensor::{self, Tensor, TensorType, ValTensor},
+    tensor::{self, DataFormat, Tensor, TensorType, ValTensor},
 };
 use halo2curves::ff::PrimeField;
 use serde::{Deserialize, Serialize};
@@ -57,11 +57,13 @@ pub enum HybridOp {
        stride: Vec<usize>,
        kernel_shape: Vec<usize>,
        normalized: bool,
+        data_format: DataFormat,
    },
    MaxPool {
        padding: Vec<(usize, usize)>,
        stride: Vec<usize>,
        pool_dims: Vec<usize>,
+        data_format: DataFormat,
    },
    ReduceMin {
        axes: Vec<usize>,
@@ -154,10 +156,10 @@ impl<F: PrimeField + TensorType + PartialOrd + std::hash::Hash> Op<F> for Hybrid
                padding,
                stride,
                kernel_shape,
-                normalized,
+                normalized, data_format
            } => format!(
-                "SUMPOOL (padding={:?}, stride={:?}, kernel_shape={:?}, normalized={})",
-                padding, stride, kernel_shape, normalized
+                "SUMPOOL (padding={:?}, stride={:?}, kernel_shape={:?}, normalized={}, data_format={:?})",
+                padding, stride, kernel_shape, normalized, data_format
            ),
            HybridOp::ReduceMax { axes } => format!("REDUCEMAX (axes={:?})", axes),
            HybridOp::ReduceArgMax { dim } => format!("REDUCEARGMAX (dim={})", dim),
@@ -165,9 +167,10 @@ impl<F: PrimeField + TensorType + PartialOrd + std::hash::Hash> Op<F> for Hybrid
                padding,
                stride,
                pool_dims,
+                data_format,
            } => format!(
-                "MaxPool (padding={:?}, stride={:?}, pool_dims={:?})",
-                padding, stride, pool_dims
+                "MaxPool (padding={:?}, stride={:?}, pool_dims={:?}, data_format={:?})",
+                padding, stride, pool_dims, data_format
            ),
            HybridOp::ReduceMin { axes } => format!("REDUCEMIN (axes={:?})", axes),
            HybridOp::ReduceArgMin { dim } => format!("REDUCEARGMIN (dim={})", dim),
@@ -239,6 +242,7 @@ impl<F: PrimeField + TensorType + PartialOrd + std::hash::Hash> Op<F> for Hybrid
                stride,
                kernel_shape,
                normalized,
+                data_format,
            } => layouts::sumpool(
                config,
                region,
@@ -247,6 +251,7 @@ impl<F: PrimeField + TensorType + PartialOrd + std::hash::Hash> Op<F> for Hybrid
                stride,
                kernel_shape,
                *normalized,
+                *data_format,
            )?,
            HybridOp::Recip {
                input_scale,
@@ -287,6 +292,7 @@ impl<F: PrimeField + TensorType + PartialOrd + std::hash::Hash> Op<F> for Hybrid
                padding,
                stride,
                pool_dims,
+                data_format,
            } => layouts::max_pool(
                config,
                region,
@@ -294,6 +300,7 @@ impl<F: PrimeField + TensorType + PartialOrd + std::hash::Hash> Op<F> for Hybrid
                padding,
                stride,
                pool_dims,
+                *data_format,
            )?,
            HybridOp::ReduceMax { axes } => {
                layouts::max_axes(config, region, values[..].try_into()?, axes)?
--- a/src/circuit/ops/layouts.rs
+++ b/src/circuit/ops/layouts.rs
@@ -24,6 +24,7 @@ use crate::{
        ops::{accumulated, add, mult, sub},
        Tensor, TensorError, ValType,
    },
+    tensor::{DataFormat, KernelFormat},
 };

 use super::*;
@@ -349,7 +350,7 @@ pub fn sqrt<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
        .into()
    };
    claimed_output.reshape(input_dims)?;
-    // force the output to be positive or zero, also implicitly checks that the ouput is in range
+    // force the output to be positive or zero, also implicitly checks that the output is in range
    let claimed_output = abs(config, region, &[claimed_output.clone()])?;
    // rescaled input
    let rescaled_input = pairwise(config, region, &[input.clone(), unit_scale], BaseOp::Mult)?;
@@ -1841,7 +1842,7 @@ pub(crate) fn get_missing_set_elements<

        // get the difference between the two vectors
        for eval in input_evals.iter() {
-            // delete first occurence of that value
+            // delete first occurrence of that value
            if let Some(pos) = fullset_evals.iter().position(|x| x == eval) {
                fullset_evals.remove(pos);
            }
@@ -1869,7 +1870,7 @@ pub(crate) fn get_missing_set_elements<
    region.increment(claimed_output.len());

    // input and claimed output should be the shuffles of fullset
-    // concatentate input and claimed output
+    // concatenate input and claimed output
    let input_and_claimed_output = input.concat(claimed_output.clone())?;

    // assert that this is a permutation/shuffle
@@ -3225,6 +3226,7 @@ pub fn neg<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::circuit::region::RegionSettings;
 /// use ezkl::circuit::BaseConfig;
 /// use ezkl::tensor::ValTensor;
+/// use ezkl::tensor::DataFormat;
 ///
 /// let dummy_config = BaseConfig::dummy(12, 2);
 /// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
@@ -3234,12 +3236,12 @@ pub fn neg<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 ///     Some(&[5, 2, 3, 0, 4, -1, 3, 1, 6]),
 ///     &[1, 1, 3, 3],
 /// ).unwrap());
-/// let pooled = sumpool::<Fp>(&dummy_config, &mut dummy_region, &[x.clone()], &vec![(0, 0); 2], &vec![1;2], &vec![2, 2], false).unwrap();
+/// let pooled = sumpool::<Fp>(&dummy_config, &mut dummy_region, &[x.clone()], &vec![(0, 0); 2], &vec![1;2], &vec![2, 2], false, DataFormat::default()).unwrap();
 /// let expected: Tensor<IntegerRep> = Tensor::<IntegerRep>::new(Some(&[11, 8, 8, 10]), &[1, 1, 2, 2]).unwrap();
 /// assert_eq!(pooled.int_evals().unwrap(), expected);
 ///
 /// // This time with normalization
-/// let pooled = sumpool::<Fp>(&dummy_config, &mut dummy_region, &[x], &vec![(0, 0); 2], &vec![1;2],  &vec![2, 2], true).unwrap();
+/// let pooled = sumpool::<Fp>(&dummy_config, &mut dummy_region, &[x], &vec![(0, 0); 2], &vec![1;2],  &vec![2, 2], true, DataFormat::default()).unwrap();
 /// let expected: Tensor<IntegerRep> = Tensor::<IntegerRep>::new(Some(&[3, 2, 2, 3]), &[1, 1, 2, 2]).unwrap();
 /// assert_eq!(pooled.int_evals().unwrap(), expected);
 /// ```
@@ -3251,9 +3253,19 @@ pub fn sumpool<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
    stride: &[usize],
    kernel_shape: &[usize],
    normalized: bool,
+    data_format: DataFormat,
 ) -> Result<ValTensor<F>, CircuitError> {
-    let batch_size = values[0].dims()[0];
-    let image_channels = values[0].dims()[1];
+    let mut image = values[0].clone();
+    data_format.to_canonical(&mut image)?;
+
+    if data_format.has_no_batch() {
+        let mut dims = image.dims().to_vec();
+        dims.insert(0, 1);
+        image.reshape(&dims)?;
+    }
+
+    let batch_size = image.dims()[0];
+    let image_channels = image.dims()[1];

    let kernel_len = kernel_shape.iter().product();

@@ -3278,7 +3290,16 @@ pub fn sumpool<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
        .map(|coord| {
            let (b, i) = (coord[0], coord[1]);
            let input = values[0].get_slice(&[b..b + 1, i..i + 1])?;
-            let output = conv(config, region, &[input, kernel.clone()], padding, stride, 1)?;
+            let output = conv(
+                config,
+                region,
+                &[input, kernel.clone()],
+                padding,
+                stride,
+                1,
+                DataFormat::default(),
+                KernelFormat::default(),
+            )?;
            res.push(output);
            Ok(())
        })
@@ -3293,6 +3314,9 @@ pub fn sumpool<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
    if normalized {
        last_elem = div(config, region, &[last_elem], F::from(kernel_len as u64))?;
    }
+
+    data_format.from_canonical(&mut last_elem)?;
+
    Ok(last_elem)
 }

@@ -3302,6 +3326,7 @@ pub fn sumpool<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 /// use ezkl::tensor::Tensor;
 /// use ezkl::fieldutils::IntegerRep;
 /// use ezkl::circuit::ops::layouts::max_pool;
+/// use ezkl::tensor::DataFormat;
 /// use halo2curves::bn256::Fr as Fp;
 /// use ezkl::circuit::region::RegionCtx;
 /// use ezkl::circuit::region::RegionSettings;
@@ -3316,7 +3341,7 @@ pub fn sumpool<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 ///     Some(&[5, 2, 3, 0, 4, -1, 3, 1, 6]),
 ///     &[1, 1, 3, 3],
 /// ).unwrap());
-/// let pooled = max_pool::<Fp>(&dummy_config, &mut dummy_region, &[x], &vec![(0, 0); 2], &vec![1;2], &vec![2;2]).unwrap();
+/// let pooled = max_pool::<Fp>(&dummy_config, &mut dummy_region, &[x], &vec![(0, 0); 2], &vec![1;2], &vec![2;2], DataFormat::default()).unwrap();
 /// let expected: Tensor<IntegerRep> = Tensor::<IntegerRep>::new(Some(&[5, 4, 4, 6]), &[1, 1, 2, 2]).unwrap();
 /// assert_eq!(pooled.int_evals().unwrap(), expected);
 ///
@@ -3328,8 +3353,16 @@ pub fn max_pool<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
    padding: &[(usize, usize)],
    stride: &[usize],
    pool_dims: &[usize],
+    data_format: DataFormat,
 ) -> Result<ValTensor<F>, CircuitError> {
-    let image = values[0].clone();
+    let mut image = values[0].clone();
+    data_format.to_canonical(&mut image)?;
+
+    if data_format.has_no_batch() {
+        let mut dims = image.dims().to_vec();
+        dims.insert(0, 1);
+        image.reshape(&dims)?;
+    }

    let image_dims = image.dims();

@@ -3388,38 +3421,38 @@ pub fn max_pool<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(

    region.apply_in_loop(&mut output, inner_loop_function)?;

-    let res: ValTensor<F> = output.into();
+    let mut res: ValTensor<F> = output.into();
+
+    data_format.from_canonical(&mut res)?;

    Ok(res)
 }

 /// Performs a deconvolution on the given input tensor.
-/// # Examples
 /// ```
-// // expected ouputs are taken from pytorch torch.nn.functional.conv_transpose2d
-///
 /// use ezkl::tensor::Tensor;
 /// use ezkl::fieldutils::IntegerRep;
 /// use ezkl::circuit::ops::layouts::deconv;
+/// use ezkl::tensor::{val::ValTensor, DataFormat, KernelFormat};
 /// use halo2curves::bn256::Fr as Fp;
 /// use ezkl::circuit::region::RegionCtx;
 /// use ezkl::circuit::region::RegionSettings;
 /// 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));
 ///
+/// // Original test case 1: Channel expansion
 /// 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(
 ///     Some(&[2, 4, 0, 1]),
 ///     &[1, 1, 2, 2],
 /// ).unwrap());
-///
-/// let result = deconv::<Fp>(&dummy_config, &mut dummy_region, &[x, c], &vec![(1, 1); 2], &vec![1;2], &vec![2;2], 1).unwrap();
-/// let expected = Tensor::<IntegerRep>::new(Some(&[0, 32, 0, 32, 0, 6, 0, 12, 0, 4, 0, 8, 0, 4, 0, 8, 0, 0, 0, 3, 0, 0, 0, 2]), &[1, 2, 3, 4]).unwrap();
+/// let result = deconv::<Fp>(&dummy_config, &mut dummy_region, &[x, c], &vec![(1, 1); 2], &vec![0;2], &vec![2;2], 1, DataFormat::NCHW, KernelFormat::OIHW).unwrap();
+/// let expected = Tensor::<IntegerRep>::new(Some(&[0, 32, 0, 0, 6, 0, 0, 4, 0, 0, 0, 0]), &[1, 2, 2, 3]).unwrap();
 /// assert_eq!(result.int_evals().unwrap(), expected);
 ///
+/// // Original test case 2: Basic deconvolution
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///     Some(&[2, 4, 0, 1]),
 ///     &[1, 1, 2, 2],
@@ -3428,11 +3461,11 @@ pub fn max_pool<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 ///     Some(&[3, 1, 1, 5]),
 ///     &[1, 1, 2, 2],
 /// ).unwrap());
-/// let result = deconv::<Fp>(&dummy_config, &mut dummy_region, &[x, k], &vec![(0, 0); 2], &vec![0;2], &vec![1;2], 1).unwrap();
+/// let result = deconv::<Fp>(&dummy_config, &mut dummy_region, &[x, k], &vec![(0, 0); 2], &vec![0;2], &vec![1;2], 1, DataFormat::NCHW, KernelFormat::OIHW).unwrap();
 /// let expected = Tensor::<IntegerRep>::new(Some(&[6, 14, 4, 2, 17, 21, 0, 1, 5]), &[1, 1, 3, 3]).unwrap();
 /// assert_eq!(result.int_evals().unwrap(), expected);
 ///
-///
+/// // Original test case 3: With padding
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///     Some(&[2, 4, 0, 1]),
 ///     &[1, 1, 2, 2],
@@ -3441,11 +3474,11 @@ pub fn max_pool<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 ///     Some(&[3, 1, 1, 5]),
 ///     &[1, 1, 2, 2],
 /// ).unwrap());
-/// let result = deconv::<Fp>(&dummy_config, &mut dummy_region, &[x, k], &vec![(1, 1); 2], &vec![0;2], &vec![1;2], 1).unwrap();
+/// let result = deconv::<Fp>(&dummy_config, &mut dummy_region, &[x, k], &vec![(1, 1); 2], &vec![0;2], &vec![1;2], 1, DataFormat::NCHW, KernelFormat::OIHW).unwrap();
 /// let expected = Tensor::<IntegerRep>::new(Some(&[17]), &[1, 1, 1, 1]).unwrap();
 /// assert_eq!(result.int_evals().unwrap(), expected);
 ///
-///
+/// // Original test case 4: With stride
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///     Some(&[2, 4, 0, 1]),
 ///     &[1, 1, 2, 2],
@@ -3454,10 +3487,11 @@ pub fn max_pool<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 ///     Some(&[3, 1, 1, 5]),
 ///     &[1, 1, 2, 2],
 /// ).unwrap());
-/// let result = deconv::<Fp>(&dummy_config, &mut dummy_region, &[x, k], &vec![(1, 1); 2], &vec![0;2], &vec![2; 2], 1).unwrap();
+/// let result = deconv::<Fp>(&dummy_config, &mut dummy_region, &[x, k], &vec![(1, 1); 2], &vec![0;2], &vec![2; 2], 1, DataFormat::NCHW, KernelFormat::OIHW).unwrap();
 /// let expected = Tensor::<IntegerRep>::new(Some(&[10, 4, 0, 3]), &[1, 1, 2, 2]).unwrap();
 /// assert_eq!(result.int_evals().unwrap(), expected);
 ///
+/// // Original test case 5: Zero padding with stride
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///     Some(&[2, 4, 0, 1]),
 ///     &[1, 1, 2, 2],
@@ -3466,10 +3500,11 @@ pub fn max_pool<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 ///     Some(&[3, 1, 1, 5]),
 ///     &[1, 1, 2, 2],
 /// ).unwrap());
-/// let result = deconv::<Fp>(&dummy_config, &mut dummy_region, &[x, k], &vec![(0, 0); 2], &vec![0;2], &vec![2; 2], 1).unwrap();
+/// let result = deconv::<Fp>(&dummy_config, &mut dummy_region, &[x, k], &vec![(0, 0); 2], &vec![0;2], &vec![2; 2], 1, DataFormat::NCHW, KernelFormat::OIHW).unwrap();
 /// let expected = Tensor::<IntegerRep>::new(Some(&[6, 2, 12, 4, 2, 10, 4, 20, 0, 0, 3, 1, 0, 0, 1, 5]), &[1, 1, 4, 4]).unwrap();
 /// assert_eq!(result.int_evals().unwrap(), expected);
 ///
+/// // Original test case 6: Different kernel shape
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///     Some(&[2, 4, 0, 1]),
 ///     &[1, 1, 2, 2],
@@ -3478,10 +3513,11 @@ pub fn max_pool<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 ///     Some(&[3, 2]),
 ///     &[1, 1, 2, 1],
 /// ).unwrap());
-/// let result = deconv::<Fp>(&dummy_config, &mut dummy_region, &[x, k], &vec![(1, 1); 2], &vec![0;2], &vec![2; 2], 1).unwrap();
+/// let result = deconv::<Fp>(&dummy_config, &mut dummy_region, &[x, k], &vec![(1, 1); 2], &vec![0;2], &vec![2; 2], 1, DataFormat::NCHW, KernelFormat::OIHW).unwrap();
 /// let expected = Tensor::<IntegerRep>::new(Some(&[0, 0]), &[1, 1, 2, 1]).unwrap();
 /// assert_eq!(result.int_evals().unwrap(), expected);
 ///
+/// // Original test case 7: Different kernel shape without padding
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///     Some(&[2, 4, 0, 1]),
 ///     &[1, 1, 2, 2],
@@ -3490,20 +3526,21 @@ pub fn max_pool<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 ///     Some(&[3, 2]),
 ///     &[1, 1, 2, 1],
 /// ).unwrap());
-/// let result = deconv::<Fp>(&dummy_config, &mut dummy_region, &[x, k], &vec![(0, 0); 2], &vec![0;2], &vec![2; 2], 1).unwrap();
+/// let result = deconv::<Fp>(&dummy_config, &mut dummy_region, &[x, k], &vec![(0, 0); 2], &vec![0;2], &vec![2; 2], 1, DataFormat::NCHW, KernelFormat::OIHW).unwrap();
 /// let expected = Tensor::<IntegerRep>::new(Some(&[6, 0, 12, 4, 0, 8, 0, 0, 3, 0, 0, 2]), &[1, 1, 4, 3]).unwrap();
 /// assert_eq!(result.int_evals().unwrap(), expected);
 ///
-///
+/// // Original test case 8: Channel expansion with stride
 /// 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(
 ///     Some(&[2, 4, 0, 1]),
 ///     &[1, 1, 2, 2],
 /// ).unwrap());
-///
-/// let result = deconv::<Fp>(&dummy_config, &mut dummy_region, &[x, c], &vec![(1, 1); 2], &vec![0;2], &vec![2;2], 1).unwrap();
+/// let result = deconv::<Fp>(&dummy_config, &mut dummy_region, &[x, c], &vec![(1, 1); 2], &vec![0;2], &vec![2;2], 1, DataFormat::NCHW, KernelFormat::OIHW).unwrap();
 /// let expected = Tensor::<IntegerRep>::new(Some(&[0, 32, 0, 0, 6, 0, 0, 4, 0, 0, 0, 0]), &[1, 2, 2, 3]).unwrap();
 /// assert_eq!(result.int_evals().unwrap(), expected);
+///
+/// // Original test case 9: With bias
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///     Some(&[3, 8, 0, 8, 4, 9, 8, 1, 8]),
 ///     &[1, 1, 3, 3],
@@ -3516,11 +3553,89 @@ pub fn max_pool<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
 ///     Some(&[1]),
 ///     &[1],
 /// ).unwrap());
-/// let result = deconv::<Fp>(&dummy_config, &mut dummy_region, &[x, k, b], &vec![(1, 1); 2], &vec![0;2], &vec![1;2], 1).unwrap();
+/// let result = deconv::<Fp>(&dummy_config, &mut dummy_region, &[x, k, b], &vec![(1, 1); 2], &vec![0;2], &vec![1;2], 1, DataFormat::NCHW, KernelFormat::OIHW).unwrap();
 /// let expected = Tensor::<IntegerRep>::new(Some(&[55, 58, 66, 69]), &[1, 1, 2, 2]).unwrap();
 /// assert_eq!(result.int_evals().unwrap(), expected);
 ///
+/// // Additional test case 1: NHWC format with HWIO kernel
+/// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
+///     Some(&[2, 4, 0, 1]),
+///     &[1, 2, 2, 1],  // NHWC format
+/// ).unwrap());
+/// let k = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
+///     Some(&[1, 1, 5, 3]),
+///     &[2, 2, 1, 1],  // HWIO format
+/// ).unwrap());
+/// let result = deconv::<Fp>(&dummy_config, &mut dummy_region, &[x, k], &vec![(1, 1); 2], &vec![0;2], &vec![1;2], 1, DataFormat::NHWC, KernelFormat::HWIO).unwrap();
+/// let expected = Tensor::<IntegerRep>::new(Some(&[27]), &[1, 1, 1, 1]).unwrap();
+/// assert_eq!(result.int_evals().unwrap(), expected);
+///
+/// // Additional test case 2: 1D deconvolution with NCHW format
+/// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
+///     Some(&[1, 2, 3]),
+///     &[1, 1, 3],  // NCH format
+/// ).unwrap());
+/// let k = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
+///     Some(&[1, 2]),
+///     &[1, 1, 2],  // OIH format
+/// ).unwrap());
+/// let result = deconv::<Fp>(&dummy_config, &mut dummy_region, &[x, k], &vec![(0, 0)], &vec![0], &vec![1], 1, DataFormat::NCHW, KernelFormat::OIHW).unwrap();
+/// let expected = Tensor::<IntegerRep>::new(Some(&[1, 4, 7, 6]), &[1, 1, 4]).unwrap();
+/// assert_eq!(result.int_evals().unwrap(), expected);
+///
+/// // Additional test case 3: 3D deconvolution with NCHW format
+/// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
+///     Some(&[1, 2, 3, 4]),
+///     &[1, 1, 2, 2, 1],  // NCDHW format
+/// ).unwrap());
+/// let k = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
+///     Some(&[1, 1]),
+///     &[1, 1, 1, 1, 2],  // OIDHW format
+/// ).unwrap());
+/// let result = deconv::<Fp>(&dummy_config, &mut dummy_region, &[x, k], &vec![(0, 0); 3], &vec![0; 3], &vec![1; 3], 1, DataFormat::NCHW, KernelFormat::OIHW).unwrap();
+/// let expected = Tensor::<IntegerRep>::new(Some(&[1, 1, 2, 2, 3, 3, 4, 4]), &[1, 1, 2, 2, 2]).unwrap();
+/// assert_eq!(result.int_evals().unwrap(), expected);
+///
+/// // Additional test case 4: Multi-channel with NHWC format and OHWI kernel
+/// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
+///     Some(&[2, 4, 0, 1, 3, 2, 1, 4]),  // 2 channels, 2x2 spatial
+///     &[1, 2, 2, 2],  // NHWC format [batch, height, width, channels]
+/// ).unwrap());
+/// let k = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
+///     Some(&[1, 2, 3, 4, 5, 6, 7, 8]),
+///     &[1, 2, 2, 2],  // OHWI format [out_channels, height, width, in_channels]
+/// ).unwrap());
+/// let result = deconv::<Fp>(&dummy_config, &mut dummy_region, &[x, k], &vec![(0, 0); 2], &vec![0;2], &vec![1;2], 1, DataFormat::NHWC, KernelFormat::OHWI).unwrap();
+/// let expected = Tensor::<IntegerRep>::new(Some(&[10, 24, 4, 41, 78, 27, 27, 66, 39]), &[1, 3, 3, 1]).unwrap();
+/// assert_eq!(result.int_evals().unwrap(), expected);
+///
+/// // Additional test case 5: CHW format (no batch dimension)
+/// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
+///     Some(&[2, 4, 0, 1]),
+///     &[1, 2, 2],  // CHW format [channels, height, width]
+/// ).unwrap());
+/// let k = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
+///     Some(&[1, 2, 3, 4]),
+///     &[1, 1, 2, 2],  // OIHW format [out_channels, in_channels, height, width]
+/// ).unwrap());
+/// let result = deconv::<Fp>(&dummy_config, &mut dummy_region, &[x, k], &vec![(0, 0); 2], &vec![0;2], &vec![1;2], 1, DataFormat::CHW, KernelFormat::OIHW).unwrap();
+/// let expected = Tensor::<IntegerRep>::new(Some(&[6, 6, 6]), &[1, 1, 1, 3]).unwrap();
+/// assert_eq!(result.int_evals().unwrap(), expected);
+///
+/// // Additional test case 6: HWC format with HWIO kernel
+/// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
+///     Some(&[2, 3, 4, 1]),
+///     &[2, 2, 1],  // HWC format [height, width, channels]
+/// ).unwrap());
+/// let k = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
+///     Some(&[1, 2, 1, 2]),
+///     &[2, 2, 1, 1],  // HWIO format [height, width, in_channels, out_channels]
+/// ).unwrap());
+/// let result = deconv::<Fp>(&dummy_config, &mut dummy_region, &[x, k], &vec![(0, 0); 2], &vec![0;2], &vec![1;2], 1, DataFormat::HWC, KernelFormat::HWIO).unwrap();
+/// let expected = Tensor::<IntegerRep>::new(Some(&[6, 6, 6]), &[1, 1, 3, 1]).unwrap();
+/// assert_eq!(result.int_evals().unwrap(), expected);
 /// ```
+///
 pub fn deconv<
    F: PrimeField + TensorType + PartialOrd + std::hash::Hash + std::marker::Send + std::marker::Sync,
 >(
@@ -3531,9 +3646,14 @@ pub fn deconv<
    output_padding: &[usize],
    stride: &[usize],
    num_groups: usize,
+    data_format: DataFormat,
+    kernel_format: KernelFormat,
 ) -> Result<ValTensor<F>, CircuitError> {
    let has_bias = inputs.len() == 3;
-    let (image, kernel) = (&inputs[0], &inputs[1]);
+    let (mut working_image, mut working_kernel) = (inputs[0].clone(), inputs[1].clone());
+
+    data_format.to_canonical(&mut working_image)?;
+    kernel_format.to_canonical(&mut working_kernel)?;

    if stride.iter().any(|&s| s == 0) {
        return Err(TensorError::DimMismatch(
@@ -3543,26 +3663,23 @@ pub fn deconv<
    }

    let null_val = ValType::Constant(F::ZERO);
+    let mut expanded_image = working_image.clone();

-    let mut expanded_image = image.clone();
-
+    // Expand image by inserting zeros according to stride
    for (i, s) in stride.iter().enumerate() {
        expanded_image.intercalate_values(null_val.clone(), *s, 2 + i)?;
    }

+    // Pad to kernel size for each spatial dimension
    expanded_image.pad(
-        kernel.dims()[2..]
+        working_kernel.dims()[2..]
            .iter()
            .map(|d| (d - 1, d - 1))
            .collect::<Vec<_>>(),
        2,
-    )?; // pad to the kernel size
-
-    // flip order
-    let channel_coord = (0..kernel.dims()[0])
-        .cartesian_product(0..kernel.dims()[1])
-        .collect::<Vec<_>>();
+    )?;

+    // Calculate slice coordinates considering padding and output padding
    let slice_coord = expanded_image
        .dims()
        .iter()
@@ -3578,26 +3695,34 @@ pub fn deconv<

    let sliced_expanded_image = expanded_image.get_slice(&slice_coord)?;

-    let mut inverted_kernels = vec![];
+    // Generate channel coordinates for kernel transformation
+    let (in_ch_dim, out_ch_dim) =
+        KernelFormat::default().get_channel_dims(working_kernel.dims().len());
+    let channel_coord = (0..working_kernel.dims()[out_ch_dim])
+        .cartesian_product(0..working_kernel.dims()[in_ch_dim])
+        .collect::<Vec<_>>();

+    // Invert kernels for deconvolution
+    let mut inverted_kernels = vec![];
    for (i, j) in channel_coord {
-        let channel = kernel.get_slice(&[i..i + 1, j..j + 1])?;
+        let channel = working_kernel.get_slice(&[i..i + 1, j..j + 1])?;
        let mut channel = Tensor::from(channel.get_inner_tensor()?.clone().into_iter().rev());
-        channel.reshape(&kernel.dims()[2..])?;
+        channel.reshape(&working_kernel.dims()[2..])?;
        inverted_kernels.push(channel);
    }

    let mut deconv_kernel =
        Tensor::new(Some(&inverted_kernels), &[inverted_kernels.len()])?.combine()?;
-    deconv_kernel.reshape(kernel.dims())?;
+    deconv_kernel.reshape(working_kernel.dims())?;

-    // tensorflow formatting patch
-    if kernel.dims()[0] == sliced_expanded_image.dims()[1] {
+    // Handle tensorflow-style input/output channel ordering
+    if working_kernel.dims()[0] == sliced_expanded_image.dims()[1] {
        let mut dims = deconv_kernel.dims().to_vec();
        dims.swap(0, 1);
        deconv_kernel.reshape(&dims)?;
    }

+    // Prepare inputs for convolution
    let conv_input = if has_bias {
        vec![
            sliced_expanded_image,
@@ -3608,28 +3733,32 @@ pub fn deconv<
        vec![sliced_expanded_image, deconv_kernel.clone().into()]
    };

-    let conv_dim = kernel.dims()[2..].len();
+    let conv_dim = working_kernel.dims()[2..].len();

-    let output = conv(
+    // Perform convolution with canonical formats
+    let mut output = conv(
        config,
        region,
        &conv_input,
        &vec![(0, 0); conv_dim],
        &vec![1; conv_dim],
        num_groups,
+        data_format.canonical(),   // Use canonical format
+        kernel_format.canonical(), // Use canonical format
    )?;

+    // Convert output back to requested format
+    data_format.from_canonical(&mut output)?;
+
    Ok(output)
 }

 /// Applies convolution over a ND tensor of shape C x H x D1...DN (and adds a bias).
 /// ```
-/// // expected ouputs are taken from pytorch torch.nn.functional.conv2d
-///
 /// use ezkl::tensor::Tensor;
 /// use ezkl::fieldutils::IntegerRep;
 /// use ezkl::circuit::ops::layouts::conv;
-/// use ezkl::tensor::val::ValTensor;
+/// use ezkl::tensor::{val::ValTensor, DataFormat, KernelFormat};
 /// use halo2curves::bn256::Fr as Fp;
 /// use ezkl::circuit::region::RegionCtx;
 /// use ezkl::circuit::region::RegionSettings;
@@ -3638,6 +3767,7 @@ pub fn deconv<
 /// let dummy_config = BaseConfig::dummy(12, 2);
 /// let mut dummy_region = RegionCtx::new_dummy(0,2,RegionSettings::all_true(65536, 4));
 ///
+/// // Test case 1: Basic 2D convolution with NCHW format (default)
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///     Some(&[5, 2, 3, 0, 4, -1, 3, 1, 6]),
 ///     &[1, 1, 3, 3],
@@ -3650,44 +3780,64 @@ pub fn deconv<
 ///     Some(&[0]),
 ///     &[1],
 /// ).unwrap());
-/// let result = conv::<Fp>(&dummy_config, &mut dummy_region, &[x, k, b], &vec![(0, 0); 2], &vec![1;2], 1).unwrap();
+/// let result = conv::<Fp>(&dummy_config, &mut dummy_region, &[x, k, b], &vec![(0, 0); 2], &vec![1;2], 1, DataFormat::NCHW, KernelFormat::OIHW).unwrap();
 /// let expected = Tensor::<IntegerRep>::new(Some(&[31, 16, 8, 26]), &[1, 1, 2, 2]).unwrap();
 /// assert_eq!(result.int_evals().unwrap(), expected);
 ///
-/// // Now test single channel
+/// // Test case 2: NHWC format with HWIO kernel
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
-///     Some(&[5, 2, 3, 0, 4, -1, 3, 1, 6, 5, 2, 3, 0, 4, -1, 3, 1, 6]),
-///     &[1, 2, 3, 3],
+///     Some(&[5, 2, 3, 0, 4, -1, 3, 1, 6]),
+///     &[1, 3, 3, 1],  // NHWC format
 /// ).unwrap());
 /// let k = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
-///     Some(&[5, 1, 1, 1, 5, 2, 1, 1]),
-///     &[2, 1, 2, 2],
+///     Some(&[1, 1, 5, 1]),
+///     &[2, 2, 1, 1],  // HWIO format
+/// ).unwrap());
+/// let result = conv::<Fp>(&dummy_config, &mut dummy_region, &[x, k], &vec![(0, 0); 2], &vec![1;2], 1, DataFormat::NHWC, KernelFormat::HWIO).unwrap();
+/// let expected = Tensor::<IntegerRep>::new(Some(&[11, 24, 20, 14]), &[1, 2, 2, 1]).unwrap();
+/// assert_eq!(result.int_evals().unwrap(), expected);
+///
+/// // Test case 3: Multi-channel NHWC with OHWI kernel
+/// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
+///     Some(&[5, 2, 3, 0, 4, -1, 3, 1, 6, 5, 2, 3, 0, 4, -1, 3, 1, 6]),
+///     &[1, 3, 3, 2],  // NHWC format
+/// ).unwrap());
+/// let k = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
+///     Some(&[5, 1, 1, 2, 5, 2, 1, 2]),
+///     &[1, 2, 2, 2],  // OHWI format
 /// ).unwrap());
 /// let b = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
 ///     Some(&[1, 1]),
 ///     &[2],
 /// ).unwrap());
-///
-/// let result = conv::<Fp>(&dummy_config, &mut dummy_region, &[x, k, b], &vec![(0, 0); 2], &vec![1;2], 2).unwrap();
-/// let expected =  Tensor::<IntegerRep>::new(Some(&[32, 17, 9, 27, 34, 20, 13, 26]), &[1, 2, 2, 2]).unwrap();
+/// let result = conv::<Fp>(&dummy_config, &mut dummy_region, &[x, k, b], &vec![(0, 0); 2], &vec![1;2], 1, DataFormat::NHWC, KernelFormat::OHWI).unwrap();
+/// let expected = Tensor::<IntegerRep>::new(Some(&[64, 66, 46, 58]), &[1, 2, 2, 1]).unwrap();
 /// assert_eq!(result.int_evals().unwrap(), expected);
 ///
-/// // Now test multi channel
+/// // Test case 4: 1D convolution with NCHW format
 /// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
-///     Some(&[5, 2, 3, 0, 4, -1, 3, 1, 6, 5, 2, 3, 0, 4, -1, 3, 1, 6]),
-///     &[1, 2, 3, 3],
+///     Some(&[1, 2, 3, 4, 5]),
+///     &[1, 1, 5],  // NCHW format
 /// ).unwrap());
 /// let k = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
-///     Some(&[5, 1, 1, 1, 5, 2, 1, 1, 5, 3, 1, 1, 5, 4, 1, 1, 5, 1, 1, 1, 5, 2, 1, 1, 5, 3, 1, 1, 5, 4, 1, 1]),
-///     &[4, 2, 2, 2],
-/// ).unwrap());
-/// let b = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
-///     Some(&[1, 1, 1, 1]),
-///     &[4],
+///     Some(&[1, 2, 3]),
+///     &[1, 1, 3],  // OIHW format
 /// ).unwrap());
+/// let result = conv::<Fp>(&dummy_config, &mut dummy_region, &[x, k], &vec![(0, 0)], &vec![1], 1, DataFormat::NCHW, KernelFormat::OIHW).unwrap();
+/// let expected = Tensor::<IntegerRep>::new(Some(&[14, 20, 26]), &[1, 1, 3]).unwrap();
+/// assert_eq!(result.int_evals().unwrap(), expected);
 ///
-/// let result =conv(&dummy_config, &mut dummy_region, &[x, k, b], &vec![(0, 0); 2], &vec![1;2], 1).unwrap();
-/// let expected = Tensor::<IntegerRep>::new(Some(&[65, 36, 21, 52, 73, 48, 37, 48, 65, 36, 21, 52, 73, 48, 37, 48]), &[1, 4, 2, 2]).unwrap();
+/// // Test case 5: 3D convolution with NCHW format
+/// let x = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
+///     Some(&[1, 2, 3, 4, 5, 6, 7, 8]),
+///     &[1, 1, 2, 2, 2],  // NCDHW format
+/// ).unwrap());
+/// let k = ValTensor::from_integer_rep_tensor(Tensor::<IntegerRep>::new(
+///     Some(&[1, 1]),
+///     &[1, 1, 1, 1, 2],  // OIDHW format
+/// ).unwrap());
+/// let result = conv::<Fp>(&dummy_config, &mut dummy_region, &[x, k], &vec![(0, 0); 3], &vec![1; 3], 1, DataFormat::NCHW, KernelFormat::OIHW).unwrap();
+/// let expected = Tensor::<IntegerRep>::new(Some(&[3, 7, 11, 15]), &[1, 1, 2, 2, 1]).unwrap();
 /// assert_eq!(result.int_evals().unwrap(), expected);
 /// ```
 ///
@@ -3700,9 +3850,14 @@ pub fn conv<
    padding: &[(usize, usize)],
    stride: &[usize],
    num_groups: usize,
+    data_format: DataFormat,
+    kernel_format: KernelFormat,
 ) -> Result<ValTensor<F>, CircuitError> {
    let has_bias = values.len() == 3;
-    let (mut image, mut kernel) = (values[0].clone(), values[1].clone());
+    let (mut working_image, mut working_kernel) = (values[0].clone(), values[1].clone());
+
+    data_format.to_canonical(&mut working_image)?;
+    kernel_format.to_canonical(&mut working_kernel)?;

    if stride.iter().any(|&s| s == 0) {
        return Err(TensorError::DimMismatch(
@@ -3711,47 +3866,40 @@ pub fn conv<
        .into());
    }

-    // we specifically want to use the same kernel and image for all the convolutions and need to enforce this by assigning them
-    // 1. assign the kernel
+    // Assign tensors
    let mut assigned_len = vec![];
-
-    if !kernel.all_prev_assigned() {
-        kernel = region.assign(&config.custom_gates.inputs[0], &kernel)?;
-        assigned_len.push(kernel.len());
+    if !working_kernel.all_prev_assigned() {
+        working_kernel = region.assign(&config.custom_gates.inputs[0], &working_kernel)?;
+        assigned_len.push(working_kernel.len());
    }
-    // 2. assign the image
-    if !image.all_prev_assigned() {
-        image = region.assign(&config.custom_gates.inputs[1], &image)?;
-        assigned_len.push(image.len());
+    if !working_image.all_prev_assigned() {
+        working_image = region.assign(&config.custom_gates.inputs[1], &working_image)?;
+        assigned_len.push(working_image.len());
    }

    if !assigned_len.is_empty() {
-        // safe to unwrap since we've just checked it has at least one element
        region.increment(*assigned_len.iter().max().unwrap());
    }

-    // if image is 3d add a dummy batch dimension
-    if image.dims().len() == kernel.dims().len() - 1 {
-        image.reshape(&[1, image.dims()[0], image.dims()[1], image.dims()[2]])?;
+    if data_format.has_no_batch() {
+        let mut dim = working_image.dims().to_vec();
+        dim.insert(0, 1);
+        working_image.reshape(&dim)?;
    }

-    let image_dims = image.dims();
-    let kernel_dims = kernel.dims();
+    let image_dims = working_image.dims();
+    let kernel_dims = working_kernel.dims();

-    let mut padded_image = image.clone();
+    // Apply padding
+    let mut padded_image = working_image.clone();
    padded_image.pad(padding.to_vec(), 2)?;

+    // Extract dimensions
    let batch_size = image_dims[0];
    let input_channels = image_dims[1];
    let output_channels = kernel_dims[0];

-    log::debug!(
-        "batch_size: {}, output_channels: {}, input_channels: {}",
-        batch_size,
-        output_channels,
-        input_channels
-    );
-
+    // Calculate slides for each spatial dimension
    let slides = image_dims[2..]
        .iter()
        .enumerate()
@@ -3766,8 +3914,6 @@ pub fn conv<
        })
        .collect::<Result<Vec<_>, TensorError>>()?;

-    log::debug!("slides: {:?}", slides);
-
    let input_channels_per_group = input_channels / num_groups;
    let output_channels_per_group = output_channels / num_groups;

@@ -3775,24 +3921,15 @@ pub fn conv<
        return Err(TensorError::DimMismatch(format!(
            "Given groups={}, expected input channels and output channels to be divisible by groups, but got input_channels={}, output_channels={}",
            num_groups, input_channels, output_channels
-        ))
-        .into());
+        )).into());
    }

-    log::debug!(
-        "num_groups: {}, input_channels_per_group: {}, output_channels_per_group: {}",
-        num_groups,
-        input_channels_per_group,
-        output_channels_per_group
-    );
-
    let num_outputs =
        batch_size * num_groups * output_channels_per_group * slides.iter().product::<usize>();

-    log::debug!("num_outputs: {}", num_outputs);
-
    let mut output: Tensor<ValType<F>> = Tensor::new(None, &[num_outputs])?;

+    // Create iteration space
    let mut iterations = vec![0..batch_size, 0..num_groups, 0..output_channels_per_group];
    for slide in slides.iter() {
        iterations.push(0..*slide);
@@ -3804,6 +3941,13 @@ pub fn conv<
        .multi_cartesian_product()
        .collect::<Vec<_>>();

+    let batch_offset = if data_format.has_no_batch() {
+        2 // No batch dimension, start coordinates after channels
+    } else {
+        3 // Has batch dimension, start coordinates after batch and channels
+    };
+
+    // Main convolution loop
    let inner_loop_function = |idx: usize, region: &mut RegionCtx<F>| {
        let cartesian_coord_per_group = &cartesian_coord[idx];
        let (batch, group, i) = (
@@ -3817,22 +3961,19 @@ pub fn conv<

        let mut slices = vec![batch..batch + 1, start_channel..end_channel];
        for (i, stride) in stride.iter().enumerate() {
-            let coord = cartesian_coord_per_group[3 + i] * stride;
+            let coord = cartesian_coord_per_group[batch_offset + i] * stride;
            let kernel_dim = kernel_dims[2 + i];
            slices.push(coord..(coord + kernel_dim));
        }

        let mut local_image = padded_image.get_slice(&slices)?;
-
        local_image.flatten();

        let start_kernel_index = group * output_channels_per_group + i;
        let end_kernel_index = start_kernel_index + 1;
-        let mut local_kernel = kernel.get_slice(&[start_kernel_index..end_kernel_index])?;
-
+        let mut local_kernel = working_kernel.get_slice(&[start_kernel_index..end_kernel_index])?;
        local_kernel.flatten();

-        // this is dot product notation in einsum format
        let mut res = einsum(config, region, &[local_image, local_kernel], "i,i->")?;

        if has_bias {
@@ -3853,21 +3994,16 @@ pub fn conv<
    region.flush()?;
    region.apply_in_loop(&mut output, inner_loop_function)?;

-    let reshape_output = |output: &mut Tensor<ValType<F>>| -> Result<(), TensorError> {
-        // remove dummy batch dimension if we added one
-        let mut dims = vec![batch_size, output_channels];
-        dims.extend(slides.iter().cloned());
-        output.reshape(&dims)?;
+    // Reshape output
+    let mut dims = vec![batch_size, output_channels];
+    dims.extend(slides.iter().cloned());
+    output.reshape(&dims)?;

-        Ok(())
-    };
+    // Convert output back to requested format
+    let mut final_output: ValTensor<F> = output.into();
+    data_format.from_canonical(&mut final_output)?;

-    // remove dummy batch dimension if we added one
-    reshape_output(&mut output)?;
-
-    let output: ValTensor<_> = output.into();
-
-    Ok(output)
+    Ok(final_output)
 }

 /// Power accumulated layout
@@ -3908,7 +4044,7 @@ pub(crate) fn rescale<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>
    Ok(rescaled_inputs)
 }

-/// Dummy (no contraints) reshape layout
+/// Dummy (no constraints) reshape layout
 pub(crate) fn reshape<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
    values: &[ValTensor<F>; 1],
    new_dims: &[usize],
@@ -3918,7 +4054,7 @@ pub(crate) fn reshape<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>
    Ok(t)
 }

-/// Dummy (no contraints) move_axis layout
+/// Dummy (no constraints) move_axis layout
 pub(crate) fn move_axis<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
    values: &[ValTensor<F>; 1],
    source: usize,
--- a/src/circuit/ops/mod.rs
+++ b/src/circuit/ops/mod.rs
@@ -1,6 +1,8 @@
 use std::any::Any;

 use serde::{Deserialize, Serialize};
+#[cfg(all(feature = "ezkl", not(target_arch = "wasm32")))]
+use tract_onnx::prelude::DatumType;

 use crate::{
    graph::quantize_tensor,
@@ -96,6 +98,8 @@ pub enum InputType {
    Int,
    ///
    TDim,
+    ///
+    Unknown,
 }

 impl InputType {
@@ -132,6 +136,7 @@ impl InputType {
                let int_input = input.clone().to_i64().unwrap();
                *input = T::from_i64(int_input).unwrap();
            }
+            InputType::Unknown => {}
        }
    }
 }
@@ -152,6 +157,28 @@ impl std::str::FromStr for InputType {
    }
 }

+#[cfg(all(feature = "ezkl", not(target_arch = "wasm32")))]
+impl From<DatumType> for InputType {
+    fn from(datum_type: DatumType) -> Self {
+        match datum_type {
+            DatumType::Bool => InputType::Bool,
+            DatumType::F16 => InputType::F16,
+            DatumType::F32 => InputType::F32,
+            DatumType::F64 => InputType::F64,
+            DatumType::I8 => InputType::Int,
+            DatumType::I16 => InputType::Int,
+            DatumType::I32 => InputType::Int,
+            DatumType::I64 => InputType::Int,
+            DatumType::U8 => InputType::Int,
+            DatumType::U16 => InputType::Int,
+            DatumType::U32 => InputType::Int,
+            DatumType::U64 => InputType::Int,
+            DatumType::TDim => InputType::TDim,
+            _ => unimplemented!(),
+        }
+    }
+}
+
 ///
 #[derive(Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize)]
 pub struct Input {
--- a/src/circuit/ops/poly.rs
+++ b/src/circuit/ops/poly.rs
@@ -4,6 +4,7 @@ use crate::{
        utils::{self, F32},
    },
    tensor::{self, Tensor, TensorError},
+    tensor::{DataFormat, KernelFormat},
 };

 use super::{base::BaseOp, *};
@@ -43,6 +44,8 @@ pub enum PolyOp {
        padding: Vec<(usize, usize)>,
        stride: Vec<usize>,
        group: usize,
+        data_format: DataFormat,
+        kernel_format: KernelFormat,
    },
    Downsample {
        axis: usize,
@@ -54,6 +57,8 @@ pub enum PolyOp {
        output_padding: Vec<usize>,
        stride: Vec<usize>,
        group: usize,
+        data_format: DataFormat,
+        kernel_format: KernelFormat,
    },
    Add,
    Sub,
@@ -165,10 +170,12 @@ impl<
                stride,
                padding,
                group,
+                data_format,
+                kernel_format,
            } => {
                format!(
-                    "CONV (stride={:?}, padding={:?}, group={})",
-                    stride, padding, group
+                    "CONV (stride={:?}, padding={:?}, group={}, data_format={:?}, kernel_format={:?})",
+                    stride, padding, group, data_format, kernel_format
                )
            }
            PolyOp::DeConv {
@@ -176,11 +183,12 @@ impl<
                padding,
                output_padding,
                group,
+                data_format,
+                kernel_format,
            } => {
                format!(
-                    "DECONV (stride={:?}, padding={:?}, output_padding={:?}, group={})",
-                    stride, padding, output_padding, group
-                )
+                    "DECONV (stride={:?}, padding={:?}, output_padding={:?}, group={}, data_format={:?}, kernel_format={:?})",
+                    stride, padding, output_padding, group, data_format, kernel_format)
            }
            PolyOp::Concat { axis } => format!("CONCAT (axis={})", axis),
            PolyOp::Slice { axis, start, end } => {
@@ -242,6 +250,8 @@ impl<
                padding,
                stride,
                group,
+                data_format,
+                kernel_format,
            } => layouts::conv(
                config,
                region,
@@ -249,6 +259,8 @@ impl<
                padding,
                stride,
                *group,
+                *data_format,
+                *kernel_format,
            )?,
            PolyOp::GatherElements { dim, constant_idx } => {
                if let Some(idx) = constant_idx {
@@ -309,6 +321,8 @@ impl<
                output_padding,
                stride,
                group,
+                data_format,
+                kernel_format,
            } => layouts::deconv(
                config,
                region,
@@ -317,6 +331,8 @@ impl<
                output_padding,
                stride,
                *group,
+                *data_format,
+                *kernel_format,
            )?,
            PolyOp::Add => layouts::pairwise(config, region, values[..].try_into()?, BaseOp::Add)?,
            PolyOp::Sub => layouts::pairwise(config, region, values[..].try_into()?, BaseOp::Sub)?,
--- a/src/circuit/tests.rs
+++ b/src/circuit/tests.rs
@@ -1,5 +1,6 @@
 use crate::circuit::ops::poly::PolyOp;
 use crate::circuit::*;
+use crate::tensor::{DataFormat, KernelFormat};
 use crate::tensor::{Tensor, TensorType, ValTensor, VarTensor};
 use halo2_proofs::{
    circuit::{Layouter, SimpleFloorPlanner, Value},
@@ -1065,6 +1066,8 @@ mod conv {
                                    padding: vec![(1, 1); 2],
                                    stride: vec![2; 2],
                                    group: 1,
+                                    data_format: DataFormat::default(),
+                                    kernel_format: KernelFormat::default(),
                                }),
                            )
                            .map_err(|_| Error::Synthesis)
@@ -1220,6 +1223,8 @@ mod conv_col_ultra_overflow {
                                    padding: vec![(1, 1); 2],
                                    stride: vec![2; 2],
                                    group: 1,
+                                    data_format: DataFormat::default(),
+                                    kernel_format: KernelFormat::default(),
                                }),
                            )
                            .map_err(|_| Error::Synthesis)
@@ -1377,6 +1382,8 @@ mod conv_relu_col_ultra_overflow {
                                    padding: vec![(1, 1); 2],
                                    stride: vec![2; 2],
                                    group: 1,
+                                    data_format: DataFormat::default(),
+                                    kernel_format: KernelFormat::default(),
                                }),
                            )
                            .map_err(|_| Error::Synthesis);
--- a/src/graph/errors.rs
+++ b/src/graph/errors.rs
@@ -33,7 +33,7 @@ pub enum GraphError {
    #[error("a node is missing required params: {0}")]
    MissingParams(String),
    /// A node has missing parameters
-    #[error("a node is has misformed params: {0}")]
+    #[error("a node has misformed params: {0}")]
    MisformedParams(String),
    /// Error in the configuration of the visibility of variables
    #[error("there should be at least one set of public variables")]
--- a/src/graph/input.rs
+++ b/src/graph/input.rs
@@ -609,8 +609,12 @@ impl GraphData {
            if input.len() % input_size != 0 {
                return Err(GraphError::InvalidDims(
                    0,
-                    "calibration data length must be evenly divisible by the original input_size"
-                        .to_string(),
+                    format!(
+                        "calibration data length (={}) must be evenly divisible by the original input_size(={})",
+                        input.len(),
+                        input_size
+                    ),
+                    
                ));
            }

--- a/src/graph/mod.rs
+++ b/src/graph/mod.rs
@@ -455,6 +455,10 @@ pub struct GraphSettings {
    pub num_blinding_factors: Option<usize>,
    /// unix time timestamp
    pub timestamp: Option<u128>,
+    /// Model inputs types (if any)
+    pub input_types: Option<Vec<InputType>>,
+    /// Model outputs types (if any)
+    pub output_types: Option<Vec<InputType>>,
 }

 impl GraphSettings {
--- a/src/graph/model.rs
+++ b/src/graph/model.rs
@@ -379,9 +379,15 @@ pub struct ParsedNodes {
    pub nodes: BTreeMap<usize, NodeType>,
    inputs: Vec<usize>,
    outputs: Vec<Outlet>,
+    output_types: Vec<InputType>,
 }

 impl ParsedNodes {
+    /// Returns the output types of the computational graph.
+    pub fn get_output_types(&self) -> Vec<InputType> {
+        self.output_types.clone()
+    }
+
    /// Returns the number of the computational graph's inputs
    pub fn num_inputs(&self) -> usize {
        self.inputs.len()
@@ -491,6 +497,16 @@ impl Model {
        Ok(om)
    }

+    /// Gets the input types from the parsed nodes
+    pub fn get_input_types(&self) -> Result<Vec<InputType>, GraphError> {
+        self.graph.get_input_types()
+    }
+
+    /// Gets the output types from the parsed nodes
+    pub fn get_output_types(&self) -> Vec<InputType> {
+        self.graph.get_output_types()
+    }
+
    ///
    pub fn save(&self, path: PathBuf) -> Result<(), GraphError> {
        let f = std::fs::File::create(&path).map_err(|e| {
@@ -574,6 +590,11 @@ impl Model {
            required_range_checks: res.range_checks.into_iter().collect(),
            model_output_scales: self.graph.get_output_scales()?,
            model_input_scales: self.graph.get_input_scales(),
+            input_types: match self.get_input_types() {
+                Ok(x) => Some(x),
+                Err(_) => None,
+            },
+            output_types: Some(self.get_output_types()),
            num_dynamic_lookups: res.num_dynamic_lookups,
            total_dynamic_col_size: res.dynamic_lookup_col_coord,
            num_shuffles: res.num_shuffles,
@@ -704,6 +725,11 @@ impl Model {
            nodes,
            inputs: model.inputs.iter().map(|o| o.node).collect(),
            outputs: model.outputs.iter().map(|o| (o.node, o.slot)).collect(),
+            output_types: model
+                .outputs
+                .iter()
+                .map(|o| Ok::<InputType, GraphError>(model.outlet_fact(*o)?.datum_type.into()))
+                .collect::<Result<Vec<_>, GraphError>>()?,
        };

        let duration = start_time.elapsed();
@@ -862,6 +888,15 @@ impl Model {
                        nodes: subgraph_nodes,
                        inputs: model.inputs.iter().map(|o| o.node).collect(),
                        outputs: model.outputs.iter().map(|o| (o.node, o.slot)).collect(),
+                        output_types: model
+                            .outputs
+                            .iter()
+                            .map(|o| {
+                                Ok::<InputType, GraphError>(
+                                    model.outlet_fact(*o)?.datum_type.into(),
+                                )
+                            })
+                            .collect::<Result<Vec<_>, GraphError>>()?,
                    };

                    let om = Model {
@@ -1579,4 +1614,16 @@ impl Model {
        }
        Ok(instance_shapes)
    }
+
+    /// Input types of the computational graph's public inputs (if any)
+    pub fn instance_types(&self) -> Result<Vec<InputType>, GraphError> {
+        let mut instance_types = vec![];
+        if self.visibility.input.is_public() {
+            instance_types.extend(self.graph.get_input_types()?);
+        }
+        if self.visibility.output.is_public() {
+            instance_types.extend(self.graph.get_output_types());
+        }
+        Ok(instance_types)
+    }
 }
--- a/src/graph/utilities.rs
+++ b/src/graph/utilities.rs
@@ -39,9 +39,8 @@ use tract_onnx::tract_hir::{
    ops::array::{Pad, PadMode, TypedConcat},
    ops::cnn::PoolSpec,
    ops::konst::Const,
-    ops::nn::DataFormat,
    tract_core::ops::cast::Cast,
-    tract_core::ops::cnn::{conv::KernelFormat, MaxPool, SumPool},
+    tract_core::ops::cnn::{MaxPool, SumPool},
 };

 /// Quantizes an iterable of f64 to a [Tensor] of IntegerRep using a fixed point representation.
@@ -1146,13 +1145,6 @@ pub fn new_op_from_onnx(

            let pool_spec: &PoolSpec = &sumpool_node.pool_spec;

-            // only support pytorch type formatting for now
-            if pool_spec.data_format != DataFormat::NCHW {
-                return Err(GraphError::MissingParams(
-                    "data in wrong format".to_string(),
-                ));
-            }
-
            let stride = extract_strides(pool_spec)?;
            let padding = extract_padding(pool_spec, &input_dims[0])?;
            let kernel_shape = &pool_spec.kernel_shape;
@@ -1161,6 +1153,7 @@ pub fn new_op_from_onnx(
                padding,
                stride: stride.to_vec(),
                pool_dims: kernel_shape.to_vec(),
+                data_format: pool_spec.data_format.into(),
            })
        }
        "Ceil" => {
@@ -1314,15 +1307,6 @@ pub fn new_op_from_onnx(
                }
            }

-            if ((conv_node.pool_spec.data_format != DataFormat::NCHW)
-                && (conv_node.pool_spec.data_format != DataFormat::CHW))
-                || (conv_node.kernel_fmt != KernelFormat::OIHW)
-            {
-                return Err(GraphError::MisformedParams(
-                    "data or kernel in wrong format".to_string(),
-                ));
-            }
-
            let pool_spec = &conv_node.pool_spec;

            let stride = extract_strides(pool_spec)?;
@@ -1350,6 +1334,8 @@ pub fn new_op_from_onnx(
                padding,
                stride,
                group,
+                data_format: conv_node.pool_spec.data_format.into(),
+                kernel_format: conv_node.kernel_fmt.into(),
            })
        }
        "Not" => SupportedOp::Linear(PolyOp::Not),
@@ -1373,14 +1359,6 @@ pub fn new_op_from_onnx(
                }
            }

-            if (deconv_node.pool_spec.data_format != DataFormat::NCHW)
-                || (deconv_node.kernel_format != KernelFormat::OIHW)
-            {
-                return Err(GraphError::MisformedParams(
-                    "data or kernel in wrong format".to_string(),
-                ));
-            }
-
            let pool_spec = &deconv_node.pool_spec;

            let stride = extract_strides(pool_spec)?;
@@ -1406,6 +1384,8 @@ pub fn new_op_from_onnx(
                output_padding: deconv_node.adjustments.to_vec(),
                stride,
                group: deconv_node.group,
+                data_format: deconv_node.pool_spec.data_format.into(),
+                kernel_format: deconv_node.kernel_format.into(),
            })
        }
        "Downsample" => {
@@ -1489,13 +1469,6 @@ pub fn new_op_from_onnx(

            let pool_spec: &PoolSpec = &sumpool_node.pool_spec;

-            // only support pytorch type formatting for now
-            if pool_spec.data_format != DataFormat::NCHW {
-                return Err(GraphError::MissingParams(
-                    "data in wrong format".to_string(),
-                ));
-            }
-
            let stride = extract_strides(pool_spec)?;
            let padding = extract_padding(pool_spec, &input_dims[0])?;

@@ -1504,6 +1477,7 @@ pub fn new_op_from_onnx(
                stride: stride.to_vec(),
                kernel_shape: pool_spec.kernel_shape.to_vec(),
                normalized: sumpool_node.normalize,
+                data_format: pool_spec.data_format.into(),
            })
        }
        "Pad" => {
--- a/src/tensor/errors.rs
+++ b/src/tensor/errors.rs
@@ -1,6 +1,6 @@
 use thiserror::Error;

-use super::ops::DecompositionError;
+use super::{ops::DecompositionError, DataFormat};

 /// A wrapper for tensor related errors.
 #[derive(Debug, Error)]
@@ -44,4 +44,7 @@ pub enum TensorError {
    /// Index out of bounds
    #[error("index {0} out of bounds for dimension {1}")]
    IndexOutOfBounds(usize, usize),
+    /// Invalid data conversion
+    #[error("invalid data conversion from format {0} to {1}")]
+    InvalidDataConversion(DataFormat, DataFormat),
 }
--- a/src/tensor/mod.rs
+++ b/src/tensor/mod.rs
@@ -9,6 +9,7 @@ pub mod var;

 pub use errors::TensorError;

+use core::hash::Hash;
 use halo2curves::ff::PrimeField;
 use maybe_rayon::{
    prelude::{
@@ -1767,6 +1768,229 @@ pub fn get_broadcasted_shape(
    }
 }
 ////////////////////////
+///
+
+/// The shape of data for some operations
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Default, Copy)]
+pub enum DataFormat {
+    /// NCHW
+    #[default]
+    NCHW,
+    /// NHWC
+    NHWC,
+    /// CHW
+    CHW,
+    /// HWC
+    HWC,
+}
+
+// as str
+impl core::fmt::Display for DataFormat {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            DataFormat::NCHW => write!(f, "NCHW"),
+            DataFormat::NHWC => write!(f, "NHWC"),
+            DataFormat::CHW => write!(f, "CHW"),
+            DataFormat::HWC => write!(f, "HWC"),
+        }
+    }
+}
+
+impl DataFormat {
+    /// Get the format's canonical form
+    pub fn canonical(&self) -> DataFormat {
+        match self {
+            DataFormat::NHWC => DataFormat::NCHW,
+            DataFormat::HWC => DataFormat::CHW,
+            _ => self.clone(),
+        }
+    }
+
+    /// no batch dim
+    pub fn has_no_batch(&self) -> bool {
+        match self {
+            DataFormat::CHW | DataFormat::HWC => true,
+            _ => false,
+        }
+    }
+
+    /// Convert tensor to canonical format (NCHW or CHW)
+    pub fn to_canonical<F: PrimeField + TensorType + PartialOrd + Hash>(
+        &self,
+        tensor: &mut ValTensor<F>,
+    ) -> Result<(), TensorError> {
+        match self {
+            DataFormat::NHWC => {
+                // For ND: Move channels from last axis to position after batch
+                let ndims = tensor.dims().len();
+                if ndims > 2 {
+                    tensor.move_axis(ndims - 1, 1)?;
+                }
+            }
+            DataFormat::HWC => {
+                // For ND: Move channels from last axis to first position
+                let ndims = tensor.dims().len();
+                if ndims > 1 {
+                    tensor.move_axis(ndims - 1, 0)?;
+                }
+            }
+            _ => {} // NCHW/CHW are already in canonical format
+        }
+        Ok(())
+    }
+
+    /// Convert tensor from canonical format to target format
+    pub fn from_canonical<F: PrimeField + TensorType + PartialOrd + Hash>(
+        &self,
+        tensor: &mut ValTensor<F>,
+    ) -> Result<(), TensorError> {
+        match self {
+            DataFormat::NHWC => {
+                // Move channels from position 1 to end
+                let ndims = tensor.dims().len();
+                if ndims > 2 {
+                    tensor.move_axis(1, ndims - 1)?;
+                }
+            }
+            DataFormat::HWC => {
+                // Move channels from position 0 to end
+                let ndims = tensor.dims().len();
+                if ndims > 1 {
+                    tensor.move_axis(0, ndims - 1)?;
+                }
+            }
+            _ => {} // NCHW/CHW don't need conversion
+        }
+        Ok(())
+    }
+
+    /// Get the position of the channel dimension
+    pub fn get_channel_dim(&self, ndims: usize) -> usize {
+        match self {
+            DataFormat::NCHW => 1,
+            DataFormat::NHWC => ndims - 1,
+            DataFormat::CHW => 0,
+            DataFormat::HWC => ndims - 1,
+        }
+    }
+}
+/// The shape of the kernel for some operations
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Default, Copy)]
+pub enum KernelFormat {
+    /// HWIO
+    HWIO,
+    /// OIHW
+    #[default]
+    OIHW,
+    /// OHWI
+    OHWI,
+}
+
+impl core::fmt::Display for KernelFormat {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            KernelFormat::HWIO => write!(f, "HWIO"),
+            KernelFormat::OIHW => write!(f, "OIHW"),
+            KernelFormat::OHWI => write!(f, "OHWI"),
+        }
+    }
+}
+
+impl KernelFormat {
+    /// Get the format's canonical form
+    pub fn canonical(&self) -> KernelFormat {
+        match self {
+            KernelFormat::HWIO => KernelFormat::OIHW,
+            KernelFormat::OHWI => KernelFormat::OIHW,
+            _ => self.clone(),
+        }
+    }
+
+    /// Convert kernel to canonical format (OIHW)
+    pub fn to_canonical<F: PrimeField + TensorType + PartialOrd + Hash>(
+        &self,
+        kernel: &mut ValTensor<F>,
+    ) -> Result<(), TensorError> {
+        match self {
+            KernelFormat::HWIO => {
+                let kdims = kernel.dims().len();
+                // Move output channels from last to first
+                kernel.move_axis(kdims - 1, 0)?;
+                // Move input channels from new last to second position
+                kernel.move_axis(kdims - 1, 1)?;
+            }
+            KernelFormat::OHWI => {
+                let kdims = kernel.dims().len();
+                // Move input channels from last to second position
+                kernel.move_axis(kdims - 1, 1)?;
+            }
+            _ => {} // OIHW is already canonical
+        }
+        Ok(())
+    }
+
+    /// Convert kernel from canonical format to target format
+    pub fn from_canonical<F: PrimeField + TensorType + PartialOrd + Hash>(
+        &self,
+        kernel: &mut ValTensor<F>,
+    ) -> Result<(), TensorError> {
+        match self {
+            KernelFormat::HWIO => {
+                let kdims = kernel.dims().len();
+                // Move input channels from second position to last
+                kernel.move_axis(1, kdims - 1)?;
+                // Move output channels from first to last
+                kernel.move_axis(0, kdims - 1)?;
+            }
+            KernelFormat::OHWI => {
+                let kdims = kernel.dims().len();
+                // Move input channels from second position to last
+                kernel.move_axis(1, kdims - 1)?;
+            }
+            _ => {} // OIHW doesn't need conversion
+        }
+        Ok(())
+    }
+
+    /// Get the position of input and output channel dimensions
+    pub fn get_channel_dims(&self, ndims: usize) -> (usize, usize) {
+        // (input_ch, output_ch)
+        match self {
+            KernelFormat::OIHW => (1, 0),
+            KernelFormat::HWIO => (ndims - 2, ndims - 1),
+            KernelFormat::OHWI => (ndims - 1, 0),
+        }
+    }
+}
+
+#[cfg(all(feature = "ezkl", not(target_arch = "wasm32")))]
+impl From<tract_onnx::tract_hir::ops::nn::DataFormat> for DataFormat {
+    fn from(fmt: tract_onnx::tract_hir::ops::nn::DataFormat) -> Self {
+        match fmt {
+            tract_onnx::tract_hir::ops::nn::DataFormat::NCHW => DataFormat::NCHW,
+            tract_onnx::tract_hir::ops::nn::DataFormat::NHWC => DataFormat::NHWC,
+            tract_onnx::tract_hir::ops::nn::DataFormat::CHW => DataFormat::CHW,
+            tract_onnx::tract_hir::ops::nn::DataFormat::HWC => DataFormat::HWC,
+        }
+    }
+}
+
+#[cfg(all(feature = "ezkl", not(target_arch = "wasm32")))]
+impl From<tract_onnx::tract_hir::tract_core::ops::cnn::conv::KernelFormat> for KernelFormat {
+    fn from(fmt: tract_onnx::tract_hir::tract_core::ops::cnn::conv::KernelFormat) -> Self {
+        match fmt {
+            tract_onnx::tract_hir::tract_core::ops::cnn::conv::KernelFormat::HWIO => {
+                KernelFormat::HWIO
+            }
+            tract_onnx::tract_hir::tract_core::ops::cnn::conv::KernelFormat::OIHW => {
+                KernelFormat::OIHW
+            }
+            tract_onnx::tract_hir::tract_core::ops::cnn::conv::KernelFormat::OHWI => {
+                KernelFormat::OHWI
+            }
+        }
+    }
+}

 #[cfg(test)]
 mod tests {
--- a/src/tensor/ops.rs
+++ b/src/tensor/ops.rs
@@ -387,7 +387,7 @@ pub fn add<T: TensorType + Add<Output = T> + std::marker::Send + std::marker::Sy
 ) -> Result<Tensor<T>, TensorError> {
    if t.len() == 1 {
        return Ok(t[0].clone());
-    } else if t.len() == 0 {
+    } else if t.is_empty() {
        return Err(TensorError::DimMismatch("add".to_string()));
    }

@@ -441,7 +441,7 @@ pub fn sub<T: TensorType + Sub<Output = T> + std::marker::Send + std::marker::Sy
 ) -> Result<Tensor<T>, TensorError> {
    if t.len() == 1 {
        return Ok(t[0].clone());
-    } else if t.len() == 0 {
+    } else if t.is_empty() {
        return Err(TensorError::DimMismatch("sub".to_string()));
    }
    // calculate value of output
@@ -492,7 +492,7 @@ pub fn mult<T: TensorType + Mul<Output = T> + std::marker::Send + std::marker::S
 ) -> Result<Tensor<T>, TensorError> {
    if t.len() == 1 {
        return Ok(t[0].clone());
-    } else if t.len() == 0 {
+    } else if t.is_empty() {
        return Err(TensorError::DimMismatch("mult".to_string()));
    }
    // calculate value of output
@@ -1326,7 +1326,6 @@ pub fn pad<T: TensorType>(
 ///
 /// # Errors
 /// Returns a TensorError if the tensors in `inputs` have incompatible dimensions for concatenation along the specified `axis`.
-
 pub fn concat<T: TensorType + Send + Sync>(
    inputs: &[&Tensor<T>],
    axis: usize,
@@ -2102,7 +2101,6 @@ pub mod nonlinearities {
    /// let expected = Tensor::<IntegerRep>::new(Some(&[4, 25, 8, 1, 1, 0]), &[2, 3]).unwrap();
    /// assert_eq!(result, expected);
    /// ```
-
    pub fn tanh(a: &Tensor<IntegerRep>, scale_input: f64) -> Tensor<IntegerRep> {
        a.par_enum_map(|_, a_i| {
            let kix = (a_i as f64) / scale_input;
--- a/tests/assets/model.compiled
+++ b/tests/assets/model.compiled
--- a/tests/integration_tests.rs
+++ b/tests/integration_tests.rs
@@ -187,7 +187,7 @@ mod native_tests {

    const PF_FAILURE_AGGR: &str = "examples/test_failure_aggr_proof.json";

-    const LARGE_TESTS: [&str; 7] = [
+    const LARGE_TESTS: [&str; 8] = [
        "self_attention",
        "nanoGPT",
        "multihead_attention",
@@ -195,6 +195,7 @@ mod native_tests {
        "mnist_gan",
        "smallworm",
        "fr_age",
+        "1d_conv",
    ];

    const ACCURACY_CAL_TESTS: [&str; 6] = [
@@ -965,7 +966,7 @@ mod native_tests {

            });

-            seq!(N in 0..=6 {
+            seq!(N in 0..=7 {

            #(#[test_case(LARGE_TESTS[N])])*
            #[ignore]
@@ -1633,13 +1634,17 @@ mod native_tests {
                "--settings-path={}/{}/settings.json",
                test_dir, example_name
            ),
-            format!("--variables=batch_size->{}", batch_size),
+            format!(
+                "--variables=batch_size->{},sequence_length->100,<Sym1>->1",
+                batch_size
+            ),
            format!("--input-visibility={}", input_visibility),
            format!("--param-visibility={}", param_visibility),
            format!("--output-visibility={}", output_visibility),
            format!("--num-inner-cols={}", num_inner_columns),
            format!("--tolerance={}", tolerance),
            format!("--commitment={}", commitment),
+            format!("--logrows={}", 22),
        ];

        // if output-visibility is fixed set --range-check-inputs-outputs to False
@@ -1725,7 +1730,6 @@ mod native_tests {
                    test_dir, example_name
                ),
            ])
-            .stdout(std::process::Stdio::null())
            .status()
            .expect("failed to execute process");
        assert!(status.success());
--- a/tests/py_integration_tests.rs
+++ b/tests/py_integration_tests.rs
@@ -49,6 +49,23 @@ mod py_tests {
        std::env::set_var("VOICE_DATA_DIR", format!("{}", voice_data_dir));
    }

+    fn download_catdog_data() {
+        let cat_and_dog_data_dir = shellexpand::tilde("~/data/catdog_data");
+
+        DOWNLOAD_VOICE_DATA.call_once(|| {
+            let status = Command::new("bash")
+                .args([
+                    "examples/notebooks/cat_and_dog_data.sh",
+                    &cat_and_dog_data_dir,
+                ])
+                .status()
+                .expect("failed to execute process");
+            assert!(status.success());
+        });
+        // set VOICE_DATA_DIR environment variable
+        std::env::set_var("CATDOG_DATA_DIR", format!("{}", cat_and_dog_data_dir));
+    }
+
    fn setup_py_env() {
        ENV_SETUP.call_once(|| {
            // supposes that you have a virtualenv called .env and have run the following
@@ -225,6 +242,20 @@ mod py_tests {
                anvil_child.kill().unwrap();
            }

+
+            #[test]
+            fn cat_and_dog_notebook_() {
+                crate::py_tests::init_binary();
+                let mut anvil_child = crate::py_tests::start_anvil(false);
+                crate::py_tests::download_catdog_data();
+                let test_dir: TempDir = TempDir::new("cat_and_dog").unwrap();
+                let path = test_dir.path().to_str().unwrap();
+                crate::py_tests::mv_test_(path, "cat_and_dog.ipynb");
+                run_notebook(path, "cat_and_dog.ipynb");
+                test_dir.close().unwrap();
+                anvil_child.kill().unwrap();
+            }
+
            #[test]
            fn reusable_verifier_notebook_() {
                crate::py_tests::init_binary();
--- a/tests/python/binding_tests.py
+++ b/tests/python/binding_tests.py
@@ -873,7 +873,8 @@ def get_examples():
        'linear_regression',
        "mnist_gan",
        "smallworm",
-        "fr_age"
+        "fr_age",
+        "1d_conv",
    ]
    examples = []
    for subdir, _, _ in os.walk(os.path.join(examples_path, "onnx")):
@@ -900,7 +901,12 @@ async def test_all_examples(model_file, input_file):
    proof_path = os.path.join(folder_path, 'proof.json')

    print("Testing example: ", model_file)
-    res = ezkl.gen_settings(model_file, settings_path)
+
+    run_args = ezkl.PyRunArgs()
+    run_args.variables = [("batch_size", 1), ("sequence_length", 100), ("<Sym1>", 1)]
+    run_args.logrows = 22
+
+    res = ezkl.gen_settings(model_file, settings_path, py_run_args=run_args)
    assert res

    res = await ezkl.calibrate_settings(
--- a/tests/wasm.rs
+++ b/tests/wasm.rs
@@ -337,7 +337,7 @@ mod wasm32 {
        // Run compiled circuit validation on onnx network (should fail)
        let circuit = compiledCircuitValidation(wasm_bindgen::Clamped(NETWORK.to_vec()));
        assert!(circuit.is_err());
-        // Run compiled circuit validation on comiled network (should pass)
+        // Run compiled circuit validation on compiled network (should pass)
        let circuit = compiledCircuitValidation(wasm_bindgen::Clamped(NETWORK_COMPILED.to_vec()));
        assert!(circuit.is_ok());
        // Run input validation on witness (should fail)
Author	SHA1	Message	Date
dante	c2d0bbb60f	bump to 1d_conv	2025-02-09 14:16:34 -05:00
dante	27465a89d6	move to large test	2025-02-09 09:30:26 -05:00
dante	a8cccee4c8	Update binding_tests.py	2025-02-08 20:38:28 -05:00
dante	6a8358d471	bump tests	2025-02-08 20:08:19 -05:00
dante	07d192a630	Merge branch 'main' into ac/layoutytpe	2025-02-08 20:06:59 -05:00
dante	70b49538c1	Update main.rs	2025-02-08 19:29:49 -05:00
rebustron	eb205d0c73	chore: fix typos in comments and docs (#934 )	2025-02-08 19:13:17 -05:00
dante	6c038f2623	Update integration_tests.rs	2025-02-08 18:48:15 -05:00
dante	db498f8d7c	docs: cat-dog example (#929 )	2025-02-08 17:30:13 -05:00
dante	3cd9d2ad80	patch conv	2025-02-08 17:14:22 -05:00
dante	8f0c460f6a	patch	2025-02-08 17:08:09 -05:00
dante	03d25cdbcb	generalized layout and conv nd	2025-02-08 16:50:05 -05:00
Cypher Pepe	a363c91160	fix: broken links in polycommit.rs and poseidon.rs (#932 )	2025-02-08 12:40:53 -05:00
dante	f7f04415fa	chore!: add model input/output types to settings (#933 ) BREAKING CHANGE: compiled model serialization is not backwards compatible	2025-02-07 16:05:59 -05:00
dante	27ed57ad83	moar	2025-02-07 14:30:36 -05:00
dante	e320e07711	dataformat	2025-02-07 14:30:23 -05:00
Jseam	de8d419e5d	ci: change to sha hashes (#922 )	2025-02-07 12:27:35 -05:00
dante	a38d318923	fix: pypi publication pipeline (#931 )	2025-02-05 23:03:21 -05:00
dante	864990fe2d	fix: publishing path	2025-02-05 19:57:13 -05:00
dante	29c3e4f977	fix: bump download artifact to v4	2025-02-05 19:05:29 -05:00