Scikit for CmakeUpdates

.github/workflows/Dockerfile.fetch

@@ -0,0 +1,56 @@
+# Base Dockerfile for using stormpy
+###################################
+# The Docker image can be built by executing:
+# docker build -t yourusername/stormpy .
+# A different Linux base image can be set from the commandline with:
+# --build-arg BASE_IMAGE=<new_base_image>
+
+# Set base image
+ARG BASE_IMAGE=movesrwth/storm:stable
+FROM $BASE_IMAGE
+LABEL org.opencontainers.image.authors="dev@stormchecker.org"
+
+
+# Configuration arguments
+#########################
+# The arguments can be set from the commandline with:
+# --build-arg <arg_name>=<value>
+
+# CMake build type
+ARG build_type=Release
+# Additional arguments for compiling stormpy
+ARG setup_args=""
+# Optional support to install for stormpy, such as '[test,doc]'
+ARG options=""
+# Number of threads to use for parallel compilation
+ARG no_threads=2
+
+
+# Install dependencies
+######################
+RUN apt-get update -qq
+RUN apt-get install -y --no-install-recommends \
+    python3 \
+    python3-venv
+
+
+# Set-up virtual environment
+############################
+ENV VIRTUAL_ENV=/opt/venv
+RUN python3 -m venv $VIRTUAL_ENV
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+
+
+# Build stormpy
+###############
+RUN mkdir /opt/stormpy
+WORKDIR /opt/stormpy
+
+# Copy the content of the current local stormpy repository into the Docker image
+COPY . .
+
+# Build stormpy
+RUN pip install -v \
+    --config-settings=cmake.define.CMAKE_BUILD_PARALLEL_LEVEL=$no_threads \
+    --config-settings=cmake.build-type=$build_type \
+    $setup_args .$options

.github/workflows/Dockerfile.stable

@@ -8,7 +8,7 @@
 # Set Storm base image
 ARG STORM_BASE=movesrwth/storm:stable
 FROM $STORM_BASE
-MAINTAINER Matthias Volk <m.volk@utwente.nl>
+LABEL org.opencontainers.image.authors="dev@stormchecker.org"
 
 
 # Configuration arguments

.github/workflows/before-all-linux.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# Inspired by build process of spead2
+
+set -e -u
+
+sccache_version=0.10.0
+boost_version=1.88.0
+boost_version_under=${boost_version//./_}
+ginac_version=1.8.9
+
+dnf install -y boost-devel cln-devel gmp-devel glpk-devel hwloc-devel z3-devel xerces-c-devel eigen3-devel # missing ginac and boost
+
+cd /tmp
+
+# Install sccache
+curl -fsSLO https://github.com/mozilla/sccache/releases/download/v${sccache_version}/sccache-v${sccache_version}-$(arch)-unknown-linux-musl.tar.gz
+tar -zxf sccache-v${sccache_version}-$(arch)-unknown-linux-musl.tar.gz
+cp sccache-v${sccache_version}-$(arch)-unknown-linux-musl/sccache /usr/bin
+
+## Install boost
+#curl -fsSLO https://archives.boost.io/release/${boost_version}/source/boost_${boost_version_under}.tar.bz2
+#tar -jxf boost_${boost_version_under}.tar.bz2
+## Quick-n-dirty approach (much faster than doing the install, which copies thousands of files)
+#ln -s /tmp/boost_${boost_version_under}/boost /usr/include/boost
+
+# Install ginac
+curl -fsSLO https://www.ginac.de/ginac-${ginac_version}.tar.bz2
+tar -jxf ginac-${ginac_version}.tar.bz2
+cd ginac-${ginac_version}
+export CXXFLAGS="-Wall -O2"
+./configure
+make
+make install

.github/workflows/buildtest.yml

@@ -19,53 +19,85 @@ env:
 
 jobs:
   indepthTests:
-    name: Indepth Tests (${{ matrix.buildType.name }}, ${{ matrix.configuration.name }})
+    name: Indepth Tests (${{ matrix.build_type.name }}, ${{ matrix.config.name }})
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        buildType:
-          - {name: "Debug", dockerTag: "ci-debug", stormTag: "ci-debug", buildArgs: "Debug", setupArgs: "--config-settings=cmake.build-type='Debug'"}
-          - {name: "Release", dockerTag: "ci", stormTag: "ci", buildArgs: "Release", setupArgs: ""}
-        configuration:
-          - {name: "all libraries", disableFlags: "", optionalLibs: "[numpy,plot,test]", testOpt: ""}
-          - {name: "no libraries", disableFlags: "--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", optionalLibs: "[test]", testOpt: "tests"}
+        build_type:
+          - {name: "Debug",
+             storm_base: "ci-debug",
+             build_args: "Debug",
+          }
+          - {name: "Release",
+             storm_base: "ci",
+             build_args: "Release",
+          }
+        config:
+          - {name: "all libraries",
+             setup_args: "",
+             optional_libs: "[numpy,plot,test]",
+             test_opt: ""
+          }
+          - {name: "no libraries",
+             setup_args: "--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",
+             optional_libs: "[test]",
+             test_opt: "tests"
+          }
     steps:
       - name: Git clone
         uses: actions/checkout@v4
       - name: Build stormpy from Dockerfile
-        run: docker build -t movesrwth/stormpy:${{ matrix.buildType.dockerTag }} . --build-arg STORM_BASE=movesrwth/storm:${{ matrix.buildType.stormTag }} --build-arg build_type=${{ matrix.buildType.buildArgs }} --build-arg setup_args="${{ matrix.buildType.setupArgs }} ${{ matrix.configuration.disableFlags }}" --build-arg options=${{ matrix.configuration.optionalLibs }} --build-arg no_threads=${NR_JOBS}
+        run: |
+          docker build -t movesrwth/stormpy:ci . \
+            --build-arg STORM_BASE=movesrwth/storm:${{ matrix.build_type.storm_base }} \
+            --build-arg build_type=${{ matrix.build_type.name }} \
+            --build-arg setup_args="${{ matrix.config.setup_args }}" \
+            --build-arg options=${{ matrix.config.optional_libs }} \
+            --build-arg no_threads=${NR_JOBS}
       - name: Run Docker
-        run: docker run -d -it --name ci movesrwth/stormpy:${{ matrix.buildType.dockerTag }}
+        run: docker run -d -it --name ci movesrwth/stormpy:ci
       - name: Run tests
-        run: docker exec ci bash -c "cd /opt/stormpy; pytest ${{ matrix.configuration.testOpt }}"
+        run: docker exec ci bash -c "cd /opt/stormpy; pytest ${{ matrix.config.test_opt }}"
 
 
-  stableTest:
-    name: Test on stable (${{ matrix.buildType.name }})
+  stableTests:
+    name: Test on stable (${{ matrix.build_type.name }})
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        buildType:
-          - {name: "Debug", dockerTag: "ci-debug", stormTag: "stable-debug", buildArgs: "Debug", setupArgs: "--config-settings=cmake.build-type='Debug'", optionalLibs: "[test,plot]"}
-          - {name: "Release", dockerTag: "ci", stormTag: "stable", buildArgs: "Release", setupArgs: "", optionalLibs: "[test,plot]"}
-
+        build_type:
+          - {name: "Debug",
+             storm_base: "stable-debug",
+             build_type: "Debug",
+             setup_args: "",
+             optional_libs: "[test,plot]"
+          }
+          - {name: "Release",
+             storm_base: "stable",
+             build_type: "Release",
+             setup_args: "",
+             optional_libs: "[test,plot]"
+          }
     # Allow failures of stable versions as new features might have been added
     steps:
       - name: Git clone
         uses: actions/checkout@v4
       - name: Replace Dockerfile
         run: cp .github/workflows/Dockerfile.stable Dockerfile
       - name: Build dependencies
-        run: docker build -t movesrwth/stormpy:${{ matrix.buildType.dockerTag }} . --build-arg STORM_BASE=movesrwth/storm:${{ matrix.buildType.stormTag }} --build-arg build_type=${{ matrix.buildType.buildArgs }} --build-arg no_threads=${NR_JOBS}
-
+        run: |
+          docker build -t movesrwth/stormpy:ci . \
+            --build-arg STORM_BASE=movesrwth/storm:${{ matrix.build_type.storm_base }} \
+            --build-arg build_type=${{ matrix.build_type.build_type }} \
+            --build-arg no_threads=${NR_JOBS}
       - name: Run Docker
-        run: docker run -d -it --name ci movesrwth/stormpy:${{ matrix.buildType.dockerTag }}
+        run: docker run -d -it --name ci movesrwth/stormpy:ci
       - name: Build stormpy
         # Build stormpy explicitly to catch exit code
         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.define.CARLPARSER_DIR_HINT=/opt/carl-parser/build/ ${{ matrix.buildType.setupArgs }} .${{ matrix.buildType.optionalLibs }}"
+          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 }}"
           status=$?
           if [ $status -eq 1 ]; then
             # Warn about possible incompatibility but do not handle as failure
@@ -81,21 +113,140 @@ jobs:
         run: docker exec ci bash -c "cd /opt/stormpy; pytest"
 
 
+  linuxTests:
+    name: Linux Test (Fetch, ${{ matrix.config.name }})
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        config:
+          - {name: "Debian 12, Debug",
+             base_image: "movesrwth/storm-basesystem:debian-12",
+             build_type: "Debug",
+             setup_args: "--config-settings=cmake.define.ALLOW_STORM_SYSTEM=OFF",
+             optional_libs: "[test,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",
+             optional_libs: "[test,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.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",
+             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",
+             optional_libs: "[test,plot]",
+             test_opt: ""
+          }
+    steps:
+      - name: Git clone
+        uses: actions/checkout@v4
+      - 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 build_type=${{ matrix.config.build_type }} \
+            --build-arg setup_args="${{ matrix.config.setup_args }}" \
+            --build-arg options=${{ matrix.config.optional_libs }} \
+            --build-arg no_threads=${NR_JOBS}
+      - name: Run Docker
+        run: docker run -d -it --name ci movesrwth/stormpy:ci
+      - name: Run tests
+        run: docker exec ci bash -c "cd /opt/stormpy; pytest ${{ matrix.config.test_opt }}"
+
+
+  macTests:
+    name: Mac Tests (Fetch, ${{ matrix.config.name }})
+    strategy:
+      matrix:
+        config:
+          - {name: "XCode 14.3, Intel, Debug",
+             distro: "macos-13",
+             xcode: "14.3",
+             build_type: "Debug",
+             setup_args: "--config-settings=cmake.define.ALLOW_STORM_SYSTEM=OFF",
+             optional_libs: "[test,plot]"
+          }
+          - {name: "XCode 15.4, ARM, Debug",
+             distro: "macos-14",
+             xcode: "15.4",
+             build_type: "Debug",
+             setup_args: "--config-settings=cmake.define.ALLOW_STORM_SYSTEM=OFF",
+             optional_libs: "[test,plot]"
+          }
+          - {name: "XCode 16.3, ARM, Debug",
+             distro: "macos-15",
+             xcode: "16.3",
+             build_type: "Debug",
+             setup_args: "--config-settings=cmake.define.ALLOW_STORM_SYSTEM=OFF",
+             optional_libs: "[test,plot]"
+          }
+    runs-on: ${{ matrix.config.distro }}
+    steps:
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: ${{ matrix.config.xcode }}
+      - name: Git clone
+        uses: actions/checkout@v4
+      - name: Install dependencies
+        # cmake and gmp and python3 are already installed
+        run: |
+          brew update
+          brew install automake boost cln ginac glpk hwloc xerces-c z3
+      - name: Build stormpy
+        run: |
+          pip install -v \
+            --config-settings=cmake.build-type=${{ matrix.config.build_type }} \
+            --config-settings=cmake.define.CMAKE_BUILD_PARALLEL_LEVEL=${NR_JOBS} \
+            ${{ matrix.config.setup_args }} .${{ matrix.config.optional_libs }}
+      - name: Run tests
+        run: pytest
+
+
   deploy:
-    name: Test and Deploy on latest (${{ matrix.buildType.name }})
+    name: Test and Deploy on latest (${{ matrix.build_type.name }})
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        buildType:
-          - {name: "Debug", dockerTag: "ci-debug", stormTag: "ci-debug", buildArgs: "Debug", setupArgs: "--config-settings=cmake.build-type='Debug'", optionalLibs: "[test,plot]"}
-          - {name: "Release", dockerTag: "ci", stormTag: "ci", buildArgs: "Release", setupArgs: "", optionalLibs: "[test,plot,doc]"}
+        build_type:
+          - {name: "Debug",
+             docker_tag: "ci-debug",
+             storm_base: "ci-debug",
+             build_type: "Debug",
+             setup_args: "",
+             optional_libs: "[test,plot]"
+          }
+          - {name: "Release",
+             docker_tag: "ci",
+             storm_base: "ci",
+             build_type: "Release",
+             setup_args: "",
+             optional_libs: "[test,plot,doc]"
+          }
     steps:
       - name: Git clone
         uses: actions/checkout@v4
       - name: Build stormpy from Dockerfile
-        run: docker build -t movesrwth/stormpy:${{ matrix.buildType.dockerTag }} . --build-arg STORM_BASE=movesrwth/storm:${{ matrix.buildType.stormTag }} --build-arg build_type=${{ matrix.buildType.buildArgs }} --build-arg setup_args=${{ matrix.buildType.setupArgs }} --build-arg options=${{ matrix.buildType.optionalLibs }} --build-arg no_threads=${NR_JOBS}
+        run: |
+          docker build -t movesrwth/stormpy:${{ matrix.build_type.docker_tag }} . \
+            --build-arg STORM_BASE=movesrwth/storm:${{ matrix.build_type.storm_base }} \
+            --build-arg build_type=${{ matrix.build_type.build_type }} \
+            --build-arg setup_args="${{ matrix.build_type.setup_args }}" \
+            --build-arg options=${{ matrix.build_type.optional_libs }} \
+            --build-arg no_threads=${NR_JOBS}
       - name: Run Docker
-        run: docker run -d -it --name ci movesrwth/stormpy:${{ matrix.buildType.dockerTag }}
+        run: docker run -d -it --name ci movesrwth/stormpy:${{ matrix.build_type.docker_tag }}
       - name: Run tests
         run: docker exec ci bash -c "cd /opt/stormpy; pytest"
 
@@ -107,22 +258,22 @@ jobs:
         # Only deploy if using master on original repo (and not for pull requests or forks)
         if: github.repository_owner == 'moves-rwth' && github.ref == 'refs/heads/master'
         run: |
-          docker commit ci movesrwth/stormpy:${{ matrix.buildType.dockerTag }}
-          docker push movesrwth/stormpy:${{ matrix.buildType.dockerTag }}
+          docker commit ci movesrwth/stormpy:${{ matrix.build_type.docker_tag }}
+          docker push movesrwth/stormpy:${{ matrix.build_type.docker_tag }}
 
       - name: Install documentation dependencies
-        if: matrix.buildType.name == 'Release'
+        if: matrix.build_type.name == 'Release'
         run: |
           docker exec ci apt-get install -qq -y pandoc
       - name: Build documentation
-        if: matrix.buildType.name == 'Release'
+        if: matrix.build_type.name == 'Release'
         run: |
           docker exec ci bash -c "cd /opt/stormpy/doc; make html"
           docker exec ci rm -r /opt/stormpy/doc/build/html/_sources
           docker cp ci:/opt/stormpy/doc/build/html .
       - name: Deploy documentation
         # Only deploy for release version and using master on original repo (and not for pull requests or forks)
-        if: matrix.buildType.name == 'Release' && github.repository_owner == 'moves-rwth' && github.ref == 'refs/heads/master'
+        if: matrix.build_type.name == 'Release' && github.repository_owner == 'moves-rwth' && github.ref == 'refs/heads/master'
         uses: peaceiris/actions-gh-pages@v4
         with:
           personal_token: ${{ secrets.GITHUB_TOKEN }}
@@ -131,7 +282,7 @@ jobs:
   notify:
     name: Email notification
     runs-on: ubuntu-latest
-    needs: [indepthTests,stableTest, deploy]
+    needs: [indepthTests, stableTests, linuxTests, macTests, deploy]
     # Only run in main repo and even if previous step failed
     if: github.repository_owner == 'moves-rwth' && always()
     steps: