diff --git a/.github/workflows/build-docker-from-tag.yml b/.github/workflows/build-docker-from-tag.yml index b3f442ff4662..e48539c90738 100644 --- a/.github/workflows/build-docker-from-tag.yml +++ b/.github/workflows/build-docker-from-tag.yml @@ -23,7 +23,7 @@ concurrency: docker-build jobs: setup: name: Setup - runs-on: [ ubuntu-latest ] + runs-on: [ubuntu-latest] outputs: image_tag_suffix: ${{ steps.set.outputs.image_tag_suffix }} prover_fri_gpu_key_id: ${{ steps.extract-prover-fri-setup-key-ids.outputs.gpu_short_commit_sha }} @@ -48,7 +48,7 @@ jobs: build-push-core-images: name: Build and push image - needs: [ setup ] + needs: [setup] uses: ./.github/workflows/new-build-core-template.yml if: contains(github.ref_name, 'core') secrets: @@ -61,7 +61,7 @@ jobs: build-push-tee-prover-images: name: Build and push images - needs: [ setup ] + needs: [setup] uses: ./.github/workflows/build-tee-prover-template.yml if: contains(github.ref_name, 'core') secrets: @@ -73,7 +73,7 @@ jobs: build-push-contract-verifier: name: Build and push image - needs: [ setup ] + needs: [setup] uses: ./.github/workflows/new-build-contract-verifier-template.yml if: contains(github.ref_name, 'contract_verifier') secrets: @@ -85,13 +85,12 @@ jobs: build-push-prover-images: name: Build and push image - needs: [ setup ] + needs: [setup] uses: ./.github/workflows/new-build-prover-template.yml if: contains(github.ref_name, 'prover') with: image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }} ERA_BELLMAN_CUDA_RELEASE: ${{ vars.ERA_BELLMAN_CUDA_RELEASE }} - CUDA_ARCH: "60;70;75;80;89" action: "push" secrets: DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }} @@ -99,13 +98,12 @@ jobs: build-push-witness-generator-image-avx512: name: Build and push image - needs: [ setup ] + needs: [setup] uses: ./.github/workflows/new-build-witness-generator-template.yml if: contains(github.ref_name, 'prover') with: image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}-avx512 ERA_BELLMAN_CUDA_RELEASE: ${{ vars.ERA_BELLMAN_CUDA_RELEASE }} - CUDA_ARCH: "60;70;75;80;89" WITNESS_GENERATOR_RUST_FLAGS: "-Ctarget_feature=+avx512bw,+avx512cd,+avx512dq,+avx512f,+avx512vl" action: "push" secrets: @@ -114,7 +112,7 @@ jobs: build-gar-prover-fri-gpu-and-circuit-prover-gpu-gar: name: Build GAR prover FRI GPU - needs: [ setup, build-push-prover-images ] + needs: [setup, build-push-prover-images] uses: ./.github/workflows/build-prover-fri-gpu-gar-and-circuit-prover-gpu-gar.yml if: contains(github.ref_name, 'prover') with: diff --git a/.github/workflows/build-prover-template.yml b/.github/workflows/build-prover-template.yml index 91de5dd51ecf..762ec496943c 100644 --- a/.github/workflows/build-prover-template.yml +++ b/.github/workflows/build-prover-template.yml @@ -30,7 +30,7 @@ on: CUDA_ARCH: description: "CUDA Arch to build" type: string - default: "89" + default: "75;80;89" required: false outputs: protocol_version: diff --git a/.github/workflows/build-witness-generator-template.yml b/.github/workflows/build-witness-generator-template.yml index d9493f97cae1..95053b89d3d8 100644 --- a/.github/workflows/build-witness-generator-template.yml +++ b/.github/workflows/build-witness-generator-template.yml @@ -27,11 +27,6 @@ on: type: boolean default: false required: false - CUDA_ARCH: - description: "CUDA Arch to build" - type: string - default: "89" - required: false WITNESS_GENERATOR_RUST_FLAGS: description: "Rust flags for witness_generator compilation" type: string @@ -49,10 +44,9 @@ jobs: IMAGE_TAG_SUFFIX: ${{ inputs.image_tag_suffix }} RUNNER_COMPOSE_FILE: "docker-compose-runner-nightly.yml" ERA_BELLMAN_CUDA_RELEASE: ${{ inputs.ERA_BELLMAN_CUDA_RELEASE }} - CUDA_ARCH: ${{ inputs.CUDA_ARCH }} WITNESS_GENERATOR_RUST_FLAGS: ${{ inputs.WITNESS_GENERATOR_RUST_FLAGS }} ZKSYNC_USE_CUDA_STUBS: true - runs-on: [ matterlabs-ci-runner-c3d ] + runs-on: [matterlabs-ci-runner-c3d] strategy: matrix: component: @@ -91,7 +85,6 @@ jobs: run: | ci_run run_retried curl -LO https://storage.googleapis.com/matterlabs-setup-keys-us/setup-keys/setup_2\^24.key - - name: login to Docker registries if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')) run: | @@ -162,11 +155,11 @@ jobs: DOCKER_ACTION: ${{ inputs.action }} COMPONENT: ${{ matrix.component }} run: | - PASSED_ENV_VARS="ERA_BELLMAN_CUDA_RELEASE,CUDA_ARCH,PROTOCOL_VERSION,RUST_FLAGS" \ + PASSED_ENV_VARS="ERA_BELLMAN_CUDA_RELEASE,PROTOCOL_VERSION,RUST_FLAGS" \ ci_run zk docker $DOCKER_ACTION $COMPONENT - name: Show sccache stats if: always() run: | ci_run sccache --show-stats || true - ci_run cat /tmp/sccache_log.txt || true \ No newline at end of file + ci_run cat /tmp/sccache_log.txt || true diff --git a/.github/workflows/new-build-prover-template.yml b/.github/workflows/new-build-prover-template.yml index cb254f602fc5..3a721e4425a8 100644 --- a/.github/workflows/new-build-prover-template.yml +++ b/.github/workflows/new-build-prover-template.yml @@ -30,8 +30,12 @@ on: CUDA_ARCH: description: "CUDA Arch to build" type: string - default: "89" + default: "75;80;89" required: false + # Details: https://arnon.dk/matching-sm-architectures-arch-and-gencode-for-various-nvidia-cards/ + # L4: 89 + # T4: 75 + # A100: 80 outputs: protocol_version: description: "Protocol version of the binary" @@ -210,7 +214,6 @@ jobs: --tag asia-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.component }}:2.0-${{ inputs.image_tag_suffix }} \ us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.component }}:2.0-${{ inputs.image_tag_suffix }} - - name: Login and push to Europe GAR run: | gcloud auth print-access-token --lifetime=7200 --impersonate-service-account=gha-ci-runners@matterlabs-infra.iam.gserviceaccount.com | docker login -u oauth2accesstoken --password-stdin https://europe-docker.pkg.dev diff --git a/.github/workflows/new-build-witness-generator-template.yml b/.github/workflows/new-build-witness-generator-template.yml index bbd6aee23ed1..a96d217da832 100644 --- a/.github/workflows/new-build-witness-generator-template.yml +++ b/.github/workflows/new-build-witness-generator-template.yml @@ -21,11 +21,6 @@ on: type: string default: non-push required: false - CUDA_ARCH: - description: "CUDA Arch to build" - type: string - default: "89" - required: false WITNESS_GENERATOR_RUST_FLAGS: description: "Rust flags for witness_generator compilation" type: string @@ -39,7 +34,7 @@ on: jobs: get-protocol-version: name: Get protocol version - runs-on: [ matterlabs-ci-runner-high-performance ] + runs-on: [matterlabs-ci-runner-high-performance] outputs: protocol_version: ${{ steps.protocolversion.outputs.protocol_version }} steps: @@ -85,7 +80,7 @@ jobs: needs: get-protocol-version env: PROTOCOL_VERSION: ${{ needs.get-protocol-version.outputs.protocol_version }} - runs-on: [ matterlabs-ci-runner-c3d ] + runs-on: [matterlabs-ci-runner-c3d] strategy: matrix: components: @@ -126,7 +121,6 @@ jobs: context: . push: ${{ inputs.action == 'push' }} build-args: | - CUDA_ARCH=${{ inputs.CUDA_ARCH }} SCCACHE_GCS_BUCKET=matterlabs-infra-sccache-storage SCCACHE_GCS_SERVICE_ACCOUNT=gha-ci-runners@matterlabs-infra.iam.gserviceaccount.com SCCACHE_GCS_RW_MODE=READ_WRITE diff --git a/.github/workflows/release-test-stage.yml b/.github/workflows/release-test-stage.yml index eb75ab179b8e..2e6c7882aa98 100644 --- a/.github/workflows/release-test-stage.yml +++ b/.github/workflows/release-test-stage.yml @@ -102,7 +102,6 @@ jobs: with: image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }} ERA_BELLMAN_CUDA_RELEASE: ${{ vars.ERA_BELLMAN_CUDA_RELEASE }} - CUDA_ARCH: "60;70;75;80;89" action: "push" secrets: DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }} @@ -116,7 +115,6 @@ jobs: with: image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}-avx512 ERA_BELLMAN_CUDA_RELEASE: ${{ vars.ERA_BELLMAN_CUDA_RELEASE }} - CUDA_ARCH: "60;70;75;80;89" WITNESS_GENERATOR_RUST_FLAGS: "-Ctarget_feature=+avx512bw,+avx512cd,+avx512dq,+avx512f,+avx512vl " action: "push" secrets: