Update chip.rs

.github/workflows/pypi-gpu.yml

@@ -36,8 +36,6 @@ jobs:
 
       - name: Set pyproject.toml version to match github tag
         shell: bash
-        env:
-          RELEASE_TAG: ${{ github.ref_name }}
         run: |
             mv pyproject.toml pyproject.toml.orig
             sed "s/ezkl/ezkl-gpu/" pyproject.toml.orig >pyproject.toml

.github/workflows/pypi.yml

@@ -32,14 +32,6 @@ jobs:
           python-version: 3.12
           architecture: x64
 
-      - name: Set pyproject.toml version to match github tag
-        shell: bash
-        env:
-          RELEASE_TAG: ${{ github.ref_name }}
-        run: |
-          mv pyproject.toml pyproject.toml.orig
-          sed "s/0\\.0\\.0/${RELEASE_TAG//v}/" pyproject.toml.orig >pyproject.toml
-
       - name: Set Cargo.toml version to match github tag
         shell: bash
         env:
@@ -97,14 +89,6 @@ jobs:
           python-version: 3.12
           architecture: ${{ matrix.target }}
 
-      - name: Set pyproject.toml version to match github tag
-        shell: bash
-        env:
-          RELEASE_TAG: ${{ github.ref_name }}
-        run: |
-          mv pyproject.toml pyproject.toml.orig
-          sed "s/0\\.0\\.0/${RELEASE_TAG//v}/" pyproject.toml.orig >pyproject.toml
-
       - name: Set Cargo.toml version to match github tag
         shell: bash
         env:
@@ -154,14 +138,6 @@ jobs:
           python-version: 3.12
           architecture: x64
 
-      - name: Set pyproject.toml version to match github tag
-        shell: bash
-        env:
-          RELEASE_TAG: ${{ github.ref_name }}
-        run: |
-          mv pyproject.toml pyproject.toml.orig
-          sed "s/0\\.0\\.0/${RELEASE_TAG//v}/" pyproject.toml.orig >pyproject.toml
-
       - name: Set Cargo.toml version to match github tag
         shell: bash
         env:
@@ -172,6 +148,7 @@ jobs:
           mv Cargo.lock Cargo.lock.orig
           sed "s/0\\.0\\.0/${RELEASE_TAG//v}/" Cargo.lock.orig >Cargo.lock
 
+
       - name: Install required libraries
         shell: bash
         run: |
@@ -210,6 +187,57 @@ jobs:
           name: wheels
           path: dist
 
+  #  There's a problem with the maturin-action toolchain for arm arch leading to failed builds
+  # linux-cross:
+  #   runs-on: ubuntu-latest
+  #   strategy:
+  #     matrix:
+  #       target: [aarch64, armv7]
+  #   steps:
+  #   - uses: actions/checkout@v4
+  #   - uses: actions/setup-python@v4
+  #     with:
+  #       python-version: 3.12
+
+  #   - name: Install cross-compilation tools for aarch64
+  #     if: matrix.target == 'aarch64'
+  #     run: |
+  #       sudo apt-get update
+  #       sudo apt-get install -y gcc make gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu libc6-dev-arm64-cross libusb-1.0-0-dev libatomic1-arm64-cross
+
+  #   - name: Install cross-compilation tools for armv7
+  #     if: matrix.target == 'armv7'
+  #     run: |
+  #       sudo apt-get update
+  #       sudo apt-get install -y gcc make gcc-arm-linux-gnueabihf binutils-arm-linux-gnueabihf libc6-dev-armhf-cross libusb-1.0-0-dev libatomic1-armhf-cross
+
+  #   - name: Build wheels
+  #     uses: PyO3/maturin-action@v1
+  #     with:
+  #       target: ${{ matrix.target }}
+  #       manylinux: auto
+  #       args: --release --out dist --features python-bindings
+
+  #   - uses: uraimo/run-on-arch-action@v2.5.0
+  #     name: Install built wheel
+  #     with:
+  #       arch: ${{ matrix.target }}
+  #       distro: ubuntu20.04
+  #       githubToken: ${{ github.token }}
+  #       install: |
+  #         apt-get update
+  #         apt-get install -y --no-install-recommends python3 python3-pip
+  #         pip3 install -U pip
+  #       run: |
+  #         pip3 install ezkl --no-index --find-links dist/ --force-reinstall
+  #         python3 -c "import ezkl"
+
+  #   - name: Upload wheels
+  #     uses: actions/upload-artifact@v3
+  #     with:
+  #       name: wheels
+  #       path: dist
+
   musllinux:
     permissions:
       contents: read
@@ -245,7 +273,6 @@ jobs:
           sed "s/0\\.0\\.0/${RELEASE_TAG//v}/" Cargo.toml.orig >Cargo.toml
           mv Cargo.lock Cargo.lock.orig
           sed "s/0\\.0\\.0/${RELEASE_TAG//v}/" Cargo.lock.orig >Cargo.lock
-
       - name: Install required libraries
         shell: bash
         run: |
@@ -296,14 +323,6 @@ jobs:
         with:
           python-version: 3.12
 
-      - name: Set pyproject.toml version to match github tag
-        shell: bash
-        env:
-          RELEASE_TAG: ${{ github.ref_name }}
-        run: |
-          mv pyproject.toml pyproject.toml.orig
-          sed "s/0\\.0\\.0/${RELEASE_TAG//v}/" pyproject.toml.orig >pyproject.toml
-
       - name: Set Cargo.toml version to match github tag
         shell: bash
         env:
@@ -347,6 +366,8 @@ jobs:
     permissions:
       id-token: write
     if: "startsWith(github.ref, 'refs/tags/')"
+    # TODO: Uncomment if linux-cross is working
+    # needs: [ macos, windows, linux, linux-cross, musllinux, musllinux-cross ]
     needs: [macos, windows, linux, musllinux, musllinux-cross]
     steps:
       - uses: actions/download-artifact@v3
@@ -354,20 +375,24 @@ jobs:
           name: wheels
       - name: List Files
         run: ls -R
-      
-      # # publishes to TestPyPI
-      # - name: Publish package distribution to TestPyPI
-      #   uses: pypa/gh-action-pypi-publish@unstable/v1
-      #   with:
-      #     repository-url: https://test.pypi.org/legacy/
-      #     packages-dir: ./
+
+      # Both publish steps will fail if there is no trusted publisher setup
+      # On failure the publish step will then simply continue to the next one
 
       # publishes to PyPI
       - name: Publish package distributions to PyPI
+        continue-on-error: true
         uses: pypa/gh-action-pypi-publish@unstable/v1
         with:
           packages-dir: ./
 
+      # publishes to TestPyPI
+      - name: Publish package distribution to TestPyPI
+        continue-on-error: true
+        uses: pypa/gh-action-pypi-publish@unstable/v1
+        with:
+          repository-url: https://test.pypi.org/legacy/
+          packages-dir: ./
 
   doc-publish:
     permissions:
@@ -384,4 +409,4 @@ jobs:
         with:
           webhook_url: ${{ secrets.RTDS_WEBHOOK_URL }}
           webhook_token: ${{ secrets.RTDS_WEBHOOK_TOKEN }}
-          commit_ref: ${{ github.ref_name }}
+          commit_ref: ${{ github.ref_name }}

src/circuit/ops/layouts.rs

@@ -75,7 +75,7 @@ fn optimum_convex_function<F: PrimeField + TensorType + PartialOrd + std::hash::
     region: &mut RegionCtx<F>,
     x: &ValTensor<F>,
     f: impl Fn(&BaseConfig<F>, &mut RegionCtx<F>, &ValTensor<F>) -> Result<ValTensor<F>, CircuitError>,
-) -> Result<ValTensor<F>, CircuitError> {
+) -> Result<(), CircuitError> {
     let one = create_constant_tensor(F::from(1), 1);
 
     let f_x = f(config, region, x)?;
@@ -87,17 +87,22 @@ fn optimum_convex_function<F: PrimeField + TensorType + PartialOrd + std::hash::
     let f_x_minus_1 = f(config, region, &x_minus_1)?;
 
     // because the function is convex, the result should be the minimum of the three
-    // note that we offset the x by 1 to get the next value
-    // f(x) <= f(x+1) and f(x) < f(x-1)
+    // not that we offset the x by 1 to get the next value
+    // f(x) <= f(x+1) and f(x) <= f(x-1)
     // the result is 1 if the function is optimal solely because of the convexity of the function
-    // the distances can be equal but this is only possible if f(x) and f(x+1) are both optimal, but if (f(x) = f(x + 1))
-    // f(x+1) is not smaller than f(x + 1 - 1) = f(x) and thus f(x) is unique
+    // the distances can be equal but this is only possible if f(x) and f(x+1) are both optimal (or f(x) and f(x-1)).
     let f_x_is_opt_rhs = less_equal(config, region, &[f_x.clone(), f_x_plus_1.clone()])?;
-    let f_x_is_opt_lhs = less(config, region, &[f_x.clone(), f_x_minus_1.clone()])?;
+    let f_x_is_opt_lhs = less_equal(config, region, &[f_x.clone(), f_x_minus_1.clone()])?;
 
     let is_opt = and(config, region, &[f_x_is_opt_lhs, f_x_is_opt_rhs])?;
 
-    Ok(is_opt)
+    let mut comparison_unit = create_constant_tensor(F::ONE, is_opt.len());
+    comparison_unit.reshape(is_opt.dims())?;
+
+    // assert that the result is 1
+    enforce_equality(config, region, &[is_opt, comparison_unit])?;
+
+    Ok(())
 }
 
 /// Err is less than some constant
@@ -285,14 +290,7 @@ pub(crate) fn recip<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
         Ok(distance)
     };
 
-    // we need to add 1 to the points where it is zero to ignore the cvx opt conditions at those points
-    let mut is_opt = optimum_convex_function(config, region, &claimed_output, err_func)?;
-    is_opt = pairwise(config, region, &[is_opt, equal_zero_mask], BaseOp::Add)?;
-
-    let mut comparison_unit = create_constant_tensor(F::ONE, is_opt.len());
-    comparison_unit.reshape(is_opt.dims())?;
-    // assert that the result is 1
-    enforce_equality(config, region, &[is_opt, comparison_unit])?;
+    optimum_convex_function(config, region, &claimed_output, err_func)?;
 
     Ok(claimed_output)
 }
@@ -364,13 +362,7 @@ pub fn sqrt<F: PrimeField + TensorType + PartialOrd + std::hash::Hash>(
         Ok(distance)
     };
 
-    let is_opt = optimum_convex_function(config, region, &claimed_output, err_func)?;
-
-    let mut comparison_unit = create_constant_tensor(F::ONE, is_opt.len());
-    comparison_unit.reshape(is_opt.dims())?;
-
-    // assert that the result is 1
-    enforce_equality(config, region, &[is_opt, comparison_unit])?;
+    optimum_convex_function(config, region, &claimed_output, err_func)?;
 
     Ok(claimed_output)
 }