chore: rename package

- poetry lock required to update package name - related Makefile and licenses update to keep consistency (will be removed once the PyPi package is available) - modified compile_torch_model to only accept datasets with one input mypy error with better numpy typing hints appeared closes #1252
2026-02-08 19:44:57 -05:00 · 2022-01-03 15:04:09 +01:00
parent 1a66f2c865
commit e522f22ce8
33 changed files with 296 additions and 289 deletions
--- a/.github/workflows/continuous-integration.yaml
+++ b/.github/workflows/continuous-integration.yaml
@@ -1,4 +1,4 @@
-name: concretefhe CI Pipeline
+name: concrete-framework CI Pipeline
 on:
  pull_request:
  push:
@@ -28,10 +28,10 @@ on:

 env:
  FORCE_REBUILD_DOCKER: ${{ (github.event_name == 'workflow_dispatch' && fromJSON(github.event.inputs.rebuild-env-docker)) || (github.event_name == 'repository_dispatch' && github.event.action == 'rebuild-env-docker') }}
-  ENV_DOCKERFILE: docker/Dockerfile.concretefhe-env
-  PREFLIGHT_IMAGE_BASE: ghcr.io/zama-ai/concretefhe-env:preflight
-  LATEST_IMAGE: ghcr.io/zama-ai/concretefhe-env:latest
-  BASE_IMAGE: ghcr.io/zama-ai/concretefhe-env
+  ENV_DOCKERFILE: docker/Dockerfile.concrete-framework-env
+  PREFLIGHT_IMAGE_BASE: ghcr.io/zama-ai/concrete-framework-env:preflight
+  LATEST_IMAGE: ghcr.io/zama-ai/concrete-framework-env:latest
+  BASE_IMAGE: ghcr.io/zama-ai/concrete-framework-env
  ACTION_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
  IS_PR: ${{ github.event_name == 'pull_request' }}

@@ -41,7 +41,7 @@ jobs:
      group: ${{ github.ref }}
      cancel-in-progress: true

-    name: Build & Push the concretefhe-env preflight Docker Image
+    name: Build & Push the concrete-framework-env preflight Docker Image
    runs-on: ubuntu-20.04
    outputs:
      image: ${{ steps.set_image.outputs.image || env.LATEST_IMAGE }}
@@ -91,7 +91,7 @@ jobs:
            echo "Docker image up to date."
            echo "BUILD_DOCKER=false" >> "$GITHUB_ENV"
          fi
-      # https://github.com/zama-ai/concretefhe-internal/issues/809
+      # https://github.com/zama-ai/concrete-framework-internal/issues/809
      # Remove gh_dl_release call once package is on PyPi
      - name: Set prefligh Docker image download compiler
        id: set_image
@@ -124,7 +124,7 @@ jobs:
          registry: ghcr.io
          username: ${{ secrets.BOT_USERNAME }}
          password: ${{ secrets.BOT_TOKEN }}
-      - name: Build concretefhe-env Image
+      - name: Build concrete-framework-env Image
        if: ${{ success() && !cancelled() && fromJSON(env.BUILD_DOCKER) }}
        uses: docker/build-push-action@a66e35b9cbcf4ad0ea91ffcaf7bbad63ad9e0229
        with:
@@ -132,12 +132,12 @@ jobs:
          # builder: ${{ steps.buildx.outputs.name }}
          build-args: |
            WHEEL=${{ env.WHEEL }}
-          file: docker/Dockerfile.concretefhe-env
+          file: docker/Dockerfile.concrete-framework-env
          no-cache: true
          push: true
          tags: "${{ env.PREFLIGHT_IMAGE }}"
          labels: |
-            concretefhe_sha=${{ env.LABEL_SHA1 }}
+            concrete_framework_sha=${{ env.LABEL_SHA1 }}
      - name: Set notification report
        id: report
        if: ${{ always() }}
@@ -447,7 +447,7 @@ jobs:
            echo "::set-output name=has-preprod::true"
            echo "::set-output name=aws-bucket::${{ secrets.AWS_REPO_PREPROD_DOCUMENTATION_BUCKET_NAME }}"
            echo "::set-output name=aws-distribution::${{ secrets.AWS_REPO_PREPROD_DOCUMENTATION_DISTRIBUTION_ID }}"
-            echo "::set-output name=dest-dir::concretefhe/${REF_NAME}"
+            echo "::set-output name=dest-dir::concrete-framework/${REF_NAME}"
          else
            echo "::set-output name=has-preprod::false"
          fi
@@ -540,9 +540,9 @@ jobs:
      - name: Pull preflight image
        run: |
          docker pull "${PREFLIGHT_IMAGE}"
-      # https://github.com/zama-ai/concretefhe-internal/issues/809
+      # https://github.com/zama-ai/concrete-framework-internal/issues/809
      # update once release workflow is ok on the compiler side
-      - name: Retag to latest and concretefhe_compiler_version-concretefhe_sha1 and push
+      - name: Retag to latest and concrete_compiler_version-concrete_framework_sha1 and push
        run: |
          SHA1=$(git rev-parse HEAD)
          TAGGED_IMAGE="${BASE_IMAGE}:${COMPILER_TAG}-${SHA1}"
@@ -588,7 +588,7 @@ jobs:
    runs-on: ubuntu-20.04

    env:
-      RELEASE_IMAGE_BASE: ghcr.io/zama-ai/concretefhe
+      RELEASE_IMAGE_BASE: ghcr.io/zama-ai/concrete-framework

    steps:
      - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
@@ -622,7 +622,7 @@ jobs:
          EXISTING_TAGS=$(curl \
          -X GET \
          -H "Authorization: Bearer $(echo ${{ secrets.BOT_TOKEN }} | base64)" \
-          https://ghcr.io/v2/zama-ai/concretefhe/tags/list | jq -rc '.tags | join(" ")')
+          https://ghcr.io/v2/zama-ai/concrete-framework/tags/list | jq -rc '.tags | join(" ")')

          # We want the space separated list of versions to be expanded
          # shellcheck disable=SC2086
@@ -652,7 +652,7 @@ jobs:
          registry: ghcr.io
          username: ${{ secrets.BOT_USERNAME }}
          password: ${{ secrets.BOT_TOKEN }}
-      - name: Build concretefhe Image
+      - name: Build concrete-framework Image
        if: ${{ success() && !cancelled() }}
        uses: docker/build-push-action@a66e35b9cbcf4ad0ea91ffcaf7bbad63ad9e0229
        with:
@@ -734,7 +734,7 @@ jobs:

          aws s3api get-object \
          --bucket ${{ steps.docs-push-infos.outputs.aws-bucket }} \
-          --key concretefhe/versions.json "${DOWNLOADED_VERSIONS_JSON_FILE}"
+          --key concrete-framework/versions.json "${DOWNLOADED_VERSIONS_JSON_FILE}"

          # shellcheck disable=SC2086
          poetry run python ./script/actions_utils/generate_versions_json.py \
@@ -769,7 +769,7 @@ jobs:
          cp ./script/actions_utils/RELEASE_TEMPLATE.md "${RELEASE_BODY_FILE}"
          {
            echo "Docker Image: ${RELEASE_IMG_GIT_TAG}";
-            echo "Documentation: https://${{ steps.docs-push-infos.outputs.aws-bucket }}/concretefhe/${PROJECT_VERSION}";
+            echo "Documentation: https://${{ steps.docs-push-infos.outputs.aws-bucket }}/concrete-framework/${PROJECT_VERSION}";
            echo "";
          } >> "${RELEASE_BODY_FILE}"
          cat "${RAW_CHANGELOG_DIR}"/* >> "${RELEASE_BODY_FILE}"
@@ -782,7 +782,7 @@ jobs:
        env:
          AWS_S3_BUCKET: ${{ steps.docs-push-infos.outputs.aws-bucket }}
          SOURCE_DIR: ${{ steps.download-docs.outputs.download-path }}
-          DEST_DIR: 'concretefhe/${{ env.PROJECT_VERSION }}'
+          DEST_DIR: 'concrete-framework/${{ env.PROJECT_VERSION }}'
        run: |
          aws s3 sync "${SOURCE_DIR}" s3://"${AWS_S3_BUCKET}/${DEST_DIR}" --delete --acl public-read

@@ -791,13 +791,13 @@ jobs:
        env:
          AWS_S3_BUCKET: ${{ steps.docs-push-infos.outputs.aws-bucket }}
          SOURCE_DIR: ${{ steps.download-docs.outputs.download-path }}
-          DEST_DIR: 'concretefhe/stable'
+          DEST_DIR: 'concrete-framework/stable'
        run: |
          aws s3 sync "${SOURCE_DIR}" s3://"${AWS_S3_BUCKET}/${DEST_DIR}" --delete --acl public-read
      - name: Invalidate CloudFront Cache for stable
        if: ${{ success() && !fromJSON(env.IS_PRERELEASE) && fromJSON(env.IS_LATEST) }}
        env:
-          SOURCE_PATH: "/concretefhe/stable/*"
+          SOURCE_PATH: "/concrete-framework/stable/*"
          DISTRIBUTION_ID: ${{ steps.docs-push-infos.outputs.aws-distribution }}
        run: |
          aws cloudfront create-invalidation \
@@ -815,16 +815,18 @@ jobs:
          tag_name: ${{ env.GIT_TAG }}
          fail_on_unmatched_files: true
          token: ${{ secrets.BOT_TOKEN }}
+      # TODO: https://github.com/zama-ai/concrete-framework-internal/issues/809
+      # Remove versions.html
      - name: Push updated versions.html
        if: ${{ success() }}
        run: |
          aws s3 cp "${OUTPUT_VERSIONS_HTML_FILE}" \
-          s3://${{ steps.docs-push-infos.outputs.aws-bucket }}/concretefhe/versions.html \
+          s3://${{ steps.docs-push-infos.outputs.aws-bucket }}/concrete-framework/versions.html \
          --acl public-read

          aws cloudfront create-invalidation \
          --distribution-id ${{ steps.docs-push-infos.outputs.aws-distribution }} \
-          --paths /concretefhe/versions.html
+          --paths /concrete-framework/versions.html
      - name: Set notification report
        id: report
        if: ${{ always() }}
--- a/.github/workflows/package-watcher.yaml
+++ b/.github/workflows/package-watcher.yaml
@@ -41,7 +41,7 @@ jobs:
          --compiler-release-endpoint-url \
          https://api.github.com/repos/zama-ai/homomorphizer/releases \
          --env_img_url \
-          https://api.github.com/orgs/zama-ai/packages/container/concretefhe-env/versions \
+          https://api.github.com/orgs/zama-ai/packages/container/concrete-framework-env/versions \
          --file "${WHEEL_SPEC}" \
          --token ${{ secrets.BOT_TOKEN }} \
          --github-env "$GITHUB_ENV"