Skip to content

Rename test-stages, improve parallel parameterization #2507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions .github/workflows/test-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
make -C kevm-pyk profile

test-concrete-execution:
name: 'Build and Test KEVM concrete execution'
name: 'Conformance Tests'
needs: kevm-pyk-code-quality-checks
runs-on: [self-hosted, linux, normal]
timeout-minutes: 45
Expand Down Expand Up @@ -103,25 +103,33 @@ jobs:
docker stop --time=0 kevm-ci-concrete-${{ github.sha }}

test-prove:
name: 'Build and Test KEVM proofs'
name: 'Proofs: ${{ matrix.name }}'
needs: kevm-pyk-code-quality-checks
runs-on: [self-hosted, linux, fast]
strategy:
fail-fast: false
matrix:
include:
- test-suite: 'test-prove-pyk'
- name: 'Rules (booster)'
test-suite: 'test-prove-pyk'
test-args:
timeout: 150
- test-suite: 'test-prove-pyk'
parallel: 6
- name: 'Rules (booster-dev)'
test-suite: 'test-prove-pyk'
test-args: '--use-booster-dev'
timeout: 45
- test-suite: 'test-prove-optimizations'
parallel: 8
- name: 'Optimizations'
test-suite: 'test-prove-optimizations'
test-args:
timeout: 45
- test-suite: 'test-prove-dss'
parallel: 1
- name: 'DSS'
test-suite: 'test-prove-dss'
test-args:
timeout: 45
parallel: 1
timeout-minutes: ${{ matrix.timeout }}
steps:
- name: 'Check out code'
Expand All @@ -139,7 +147,7 @@ jobs:
- name: 'Build distribution'
run: docker exec -u github-user kevm-ci-haskell-${{ matrix.test-suite }}-${{ github.sha }} /bin/bash -c 'CXX=clang++-14 poetry -C kevm-pyk run kdist --verbose build -j`nproc` evm-semantics.plugin evm-semantics.haskell'
- name: 'Prove Haskell'
run: docker exec -u github-user kevm-ci-haskell-${{ matrix.test-suite }}-${{ github.sha }} /bin/bash -c "make ${{ matrix.test-suite }} PYTEST_ARGS='-vv ${{ matrix.test-args }}' PYTEST_PARALLEL=4"
run: docker exec -u github-user kevm-ci-haskell-${{ matrix.test-suite }}-${{ github.sha }} /bin/bash -c "make ${{ matrix.test-suite }} PYTEST_ARGS='-vv ${{ matrix.test-args }}' PYTEST_PARALLEL=${{ matrix.parallel }}"
- name: 'Tear down Docker'
if: always()
run: |
Expand Down
2 changes: 1 addition & 1 deletion kevm-pyk/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"

[tool.poetry]
name = "kevm-pyk"
version = "1.0.622"
version = "1.0.623"
description = ""
authors = [
"Runtime Verification, Inc. <[email protected]>",
Expand Down
2 changes: 1 addition & 1 deletion kevm-pyk/src/kevm_pyk/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
if TYPE_CHECKING:
from typing import Final

VERSION: Final = '1.0.622'
VERSION: Final = '1.0.623'
2 changes: 1 addition & 1 deletion package/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.622
1.0.623