Skip to content

Replace carl-parser with Lark parser #416

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.

Sign up for GitHub

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

Open
volkm wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Replace carl-parser with Lark parser #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
11c01bb
Extended parsing tests
volkm Jun 11, 2026
f7fc21c
Added optional lark dependency to pyproject.toml
volkm Jun 9, 2026
98ffa31
Add Lark grammar for carl-parser serialization format
volkm Jun 9, 2026
3200343
Add Lark transformer for building pycarl types from parse tree
volkm Jun 9, 2026
078b61d
Rewrite parse module with pure Python Lark-based parser
volkm Jun 9, 2026
8b58151
Removed parsing via carl-parser
volkm Jun 9, 2026
d243486
CI: added optional lark parser dependency
volkm Jun 11, 2026
0cf23c1
Revised test configurations
volkm Jun 11, 2026
b55401f
Disallow . in variable names
volkm Jun 11, 2026
1b2fe89
Typo
volkm Jun 11, 2026
7e45e80
Graceful error message when lark is not available
volkm Jun 11, 2026
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
57 changes: 0 additions & 57 deletions .github/workflows/Dockerfile.fetch
View file
Open in desktop

@sjunges sjunges Jun 11, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i dont understand what this did and why we no longer need it :-)

@volkm volkm Jun 11, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was not really different from the main Dockerfile. There might have been changes at an earlier point, was introduced in #229

This file was deleted.

71 changes: 0 additions & 71 deletions .github/workflows/Dockerfile.release
View file
Open in desktop

This file was deleted.

24 changes: 1 addition & 23 deletions .github/workflows/Dockerfile.stable
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,32 +28,10 @@ ARG no_threads=2

# Install dependencies
######################
RUN apt-get update -qq
RUN apt-get install -y --no-install-recommends \
maven \
uuid-dev \
RUN apt-get update -qq && apt-get install -y --no-install-recommends \
python3 \
python3-dev \
python3-venv
# Packages maven and uuid-dev are required for carl-parser

# Build carl-parser
###################
WORKDIR /opt/

# Obtain carl-parser
RUN git clone https://github.com/stormchecker/carl-parser.git

# Switch to build directory
RUN mkdir -p /opt/carl-parser/build
WORKDIR /opt/carl-parser/build

# Configure carl-parser
# Set hint for carl directory to Storm directory
RUN cmake .. -DCMAKE_BUILD_TYPE=$build_type -DPORTABLE=ON -Dcarl_DIR=/usr/local/lib/cmake/storm/resources/carl/

# Build carl-parser
RUN make carl-parser -j $no_threads


# Set-up virtual environment
Expand Down
40 changes: 19 additions & 21 deletions .github/workflows/buildtest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ jobs:
config:
- {name: "all libraries",
setup_args: "--config-settings=cmake.define.ALLOW_STORM_FETCH=OFF",
optional_libs: "[numpy,plot,test]",
optional_libs: "[numpy,parser,plot,test]",
test_opt: ""
}
- {name: "no libraries",
setup_args: "--config-settings=cmake.define.ALLOW_STORM_FETCH=OFF --config-settings=cmake.define=USE_STORM_DFT=OFF --config-settings=cmake.define.USE_STORM_GSPN=OFF --config-settings=cmake.define.USE_STORM_PARS=OFF --config-settings=cmake.define.USE_STORM_POMDP=OFF --config-settings=cmake.define.USE_PARSER=OFF",
setup_args: "--config-settings=cmake.define.ALLOW_STORM_FETCH=OFF --config-settings=cmake.define=USE_STORM_DFT=OFF --config-settings=cmake.define.USE_STORM_GSPN=OFF --config-settings=cmake.define.USE_STORM_PARS=OFF --config-settings=cmake.define.USE_STORM_POMDP=OFF",
optional_libs: "[test]",
test_opt: "tests"
}
Expand Down Expand Up @@ -70,13 +70,13 @@ jobs:
storm_base: "stable-debug",
build_type: "Debug",
setup_args: "--config-settings=cmake.define.ALLOW_STORM_FETCH=OFF",
optional_libs: "[test,plot]"
optional_libs: "[test,parser,plot]"
}
- {name: "Release",
storm_base: "stable",
build_type: "Release",
setup_args: "--config-settings=cmake.define.ALLOW_STORM_FETCH=OFF",
optional_libs: "[test,plot]"
optional_libs: "[test,parser,plot]"
}
# Allow failures of stable versions as new features might have been added
steps:
Expand All @@ -97,7 +97,7 @@ jobs:
id: build_stormpy
shell: bash {0} // Deactivate fast-fail to handle exit code for incompatibility
run: |
docker exec ci bash -c "cd /opt/stormpy; pip install -v --config-settings=cmake.define.CMAKE_BUILD_PARALLEL_LEVEL=${NR_JOBS} --config-settings=cmake.build-type=${{ matrix.build_type.build_type }} --config-settings=cmake.define.CARLPARSER_DIR_HINT=/opt/carl-parser/build/ ${{ matrix.build_type.setup_args }} .${{ matrix.build_type.optional_libs }}"
docker exec ci bash -c "cd /opt/stormpy; pip install -v --config-settings=cmake.define.CMAKE_BUILD_PARALLEL_LEVEL=${NR_JOBS} --config-settings=cmake.build-type=${{ matrix.build_type.build_type }} ${{ matrix.build_type.setup_args }} .${{ matrix.build_type.optional_libs }}"
status=$?
if [ $status -eq 1 ]; then
# Warn about possible incompatibility but do not handle as failure
Expand All @@ -123,46 +123,44 @@ jobs:
base_image: "movesrwth/storm-basesystem:debian-12",
build_type: "Debug",
setup_args: "--config-settings=cmake.define.ALLOW_STORM_SYSTEM=OFF --config-settings=cmake.define.STORM_GIT_TAG=master",
optional_libs: "[test,plot]",
optional_libs: "[test,parser,plot]",
test_opt: ""
}
- {name: "Debian 13, Debug",
base_image: "movesrwth/storm-basesystem:debian-13",
build_type: "Debug",
setup_args: "--config-settings=cmake.define.ALLOW_STORM_SYSTEM=OFF --config-settings=cmake.define.STORM_GIT_TAG=master",
optional_libs: "[test,plot]",
optional_libs: "[test,parser,plot]",
test_opt: ""
}
- {name: "Ubuntu 24.04, Debug",
base_image: "movesrwth/storm-basesystem:ubuntu-24.04",
build_type: "Debug",
setup_args: "--config-settings=cmake.define.ALLOW_STORM_SYSTEM=OFF --config-settings=cmake.define.STORM_GIT_TAG=master",
optional_libs: "[test,plot]",
optional_libs: "[test,parser,plot]",
test_opt: ""
}
- {name: "Ubuntu 24.04, Debug, only Storm core",
base_image: "movesrwth/storm-basesystem:ubuntu-24.04",
build_type: "Debug",
setup_args: "--config-settings=cmake.define.ALLOW_STORM_SYSTEM=OFF --config-settings=cmake.define.STORM_GIT_TAG=master --config-settings=cmake.define.USE_STORM_DFT=OFF --config-settings=cmake.define.USE_STORM_GSPN=OFF --config-settings=cmake.define.USE_STORM_PARS=OFF --config-settings=cmake.define.USE_STORM_POMDP=OFF --config-settings=cmake.define.USE_PARSER=OFF",
setup_args: "--config-settings=cmake.define.ALLOW_STORM_SYSTEM=OFF --config-settings=cmake.define.STORM_GIT_TAG=master --config-settings=cmake.define.USE_STORM_DFT=OFF --config-settings=cmake.define.USE_STORM_GSPN=OFF --config-settings=cmake.define.USE_STORM_PARS=OFF --config-settings=cmake.define.USE_STORM_POMDP=OFF",
optional_libs: "[test]",
test_opt: "tests"
}
- {name: "Ubuntu 24.04, Release",
base_image: "movesrwth/storm-basesystem:ubuntu-24.04",
build_type: "Release",
setup_args: "--config-settings=cmake.define.ALLOW_STORM_SYSTEM=OFF --config-settings=cmake.define.STORM_GIT_TAG=master",
optional_libs: "[test,plot]",
optional_libs: "[test,parser,plot]",
test_opt: ""
}
steps:
- name: Git clone
uses: actions/checkout@v6
- name: Replace Dockerfile
run: cp .github/workflows/Dockerfile.fetch Dockerfile
- name: Build stormpy
run: |
docker build -t movesrwth/stormpy:ci . \
--build-arg BASE_IMAGE=${{ matrix.config.base_image }} \
--build-arg STORM_BASE=${{ matrix.config.base_image }} \
--build-arg build_type=${{ matrix.config.build_type }} \
--build-arg setup_args="${{ matrix.config.setup_args }}" \
--build-arg options=${{ matrix.config.optional_libs }} \
Expand All @@ -183,28 +181,28 @@ jobs:
xcode: "15.4",
build_type: "Debug",
setup_args: "--config-settings=cmake.define.ALLOW_STORM_SYSTEM=OFF --config-settings=cmake.define.STORM_GIT_TAG=master",
optional_libs: "[test,plot]"
optional_libs: "[test,parser,plot]"
}
- {name: "MacOS 15, ARM, Debug",
distro: "macos-15",
xcode: "16.4",
build_type: "Debug",
setup_args: "--config-settings=cmake.define.ALLOW_STORM_SYSTEM=OFF --config-settings=cmake.define.STORM_GIT_TAG=master",
optional_libs: "[test,plot]"
optional_libs: "[test,parser,plot]"
}
- {name: "MacOS 26, ARM, Debug",
distro: "macos-26",
xcode: "latest-stable",
build_type: "Debug",
setup_args: "--config-settings=cmake.define.ALLOW_STORM_SYSTEM=OFF --config-settings=cmake.define.STORM_GIT_TAG=master",
optional_libs: "[test,plot]"
optional_libs: "[test,parser,plot]"
}
- {name: "MacOS 26, Intel, Debug",
distro: "macos-26-intel",
xcode: "latest-stable",
build_type: "Debug",
setup_args: "--config-settings=cmake.define.ALLOW_STORM_SYSTEM=OFF --config-settings=cmake.define.STORM_GIT_TAG=master",
optional_libs: "[test,plot]"
optional_libs: "[test,parser,plot]"
}
runs-on: ${{ matrix.config.distro }}
steps:
Expand Down Expand Up @@ -238,14 +236,14 @@ jobs:
xcode: "latest-stable",
build_type: "Debug",
setup_args: "--config-settings=cmake.define.ALLOW_STORM_FETCH=OFF",
optional_libs: "[test,plot]"
optional_libs: "[test,parser,plot]"
}
- {name: "MacOS 26, ARM, Release",
distro: "macos-26",
xcode: "latest-stable",
build_type: "Release",
setup_args: "--config-settings=cmake.define.ALLOW_STORM_FETCH=OFF",
optional_libs: "[test,plot]"
optional_libs: "[test,parser,plot]"
}
runs-on: ${{ matrix.config.distro }}
steps:
Expand Down Expand Up @@ -299,14 +297,14 @@ jobs:
storm_base: "ci-debug",
build_type: "Debug",
setup_args: "--config-settings=cmake.define.ALLOW_STORM_FETCH=OFF",
optional_libs: "[test,plot]"
optional_libs: "[test,parser,plot]"
}
- {name: "Release",
docker_tag: "ci",
storm_base: "ci",
build_type: "Release",
setup_args: "--config-settings=cmake.define.ALLOW_STORM_FETCH=OFF",
optional_libs: "[test,plot,doc]"
optional_libs: "[test,parser,plot,doc]"
}
steps:
- name: Git clone
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/release_docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,11 @@ jobs:
image:
- {tag: "${{ inputs.tag }}-debug",
baseImg: "movesrwth/storm:${{ inputs.storm_tag }}-debug",
file: ".github/workflows/Dockerfile.release",
buildType: "Debug",
setupArgs: "--debug"
}
- {tag: "${{ inputs.tag }}",
baseImg: "movesrwth/storm:${{ inputs.storm_tag }}",
file: ".github/workflows/Dockerfile.release",
buildType: "Release",
setupArgs: ""
}
Expand Down Expand Up @@ -88,8 +86,6 @@ jobs:
id: build
uses: docker/build-push-action@v7
with:
file: ${{ matrix.image.file }}
# Set build arguments
build-args: |
STORM_BASE=${{ matrix.image.baseImg }}
build_type=${{ matrix.image.buildType }}
Expand Down
Loading
Loading