Scikit for CmakeUpdates

.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/wheelpypi.yml

@@ -0,0 +1,90 @@
+name: Build and upload to PyPI
+
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+#    branches:
+#      - main
+  release:
+    types:
+      - published
+
+jobs:
+  build_wheels:
+    name: Build wheels for ${{ matrix.os }}
+    runs-on: ${{ matrix.runs-on }}
+    strategy:
+      matrix:
+        os: [ linux-intel, macOS-intel, macOS-arm ]
+        include:
+          - archs: auto
+            platform: auto
+            xcode: ""
+          - os: linux-intel
+            runs-on: ubuntu-latest
+            archs: x86_64
+#          - os: linux-arm
+#            runs-on: ubuntu-24.04-arm
+          - os: macos-intel
+            # macos-13 was the last x86_64 runner
+            runs-on: macos-13
+            xcode: 14.3
+          - os: macos-arm
+            # macos-14+ (including latest) are ARM64 runners
+            runs-on: macos-14
+#            archs: auto,universal2
+            xcode: 15.3
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: maxim-lobanov/setup-xcode@v1
+        if: ${{ matrix.xcode != '' }}
+        with:
+          xcode-version: ${{ matrix.xcode }}
+      - name: Build wheels
+        uses: pypa/cibuildwheel@v3.0.0b5
+        env:
+          CIBW_PLATFORM: ${{ matrix.platform }}
+          CIBW_ARCHS: ${{ matrix.archs }}
+          MACOSX_DEPLOYMENT_TARGET: 14.0
+      - uses: actions/upload-artifact@v4
+        with:
+          name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
+          path: ./wheelhouse/*.whl
+
+  build_sdist:
+    name: Build source distribution
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Build sdist
+        run: pipx run build --sdist
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: cibw-sdist
+          path: dist/*.tar.gz
+
+  upload_pypi:
+    needs: [build_wheels, build_sdist]
+    runs-on: ubuntu-latest
+    environment: pypi
+    permissions:
+      id-token: write
+    # if: github.event_name == 'release' && github.event.action == 'published'
+    # or, alternatively, upload to PyPI on every tag starting with 'v' (remove on: release above to use this)
+    # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          # unpacks all CIBW artifacts into dist/
+          pattern: cibw-*
+          path: dist
+          merge-multiple: true
+
+      - uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          repository-url: https://test.pypi.org/legacy/

CMakeLists.txt

@@ -1,31 +1,23 @@
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.24)
 
 # Scikit-build-core sets these values
 project(
     ${SKBUILD_PROJECT_NAME}
     VERSION ${SKBUILD_PROJECT_VERSION}
-    LANGUAGES CXX
+    LANGUAGES CXX C
 )
 
-set(CMAKE_CXX_STANDARD 20)
-
-# include(FetchContent)
+# Set configurations
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/macros.cmake)
 
-# FetchContent_Declare(
-#     storm
-#     GIT_REPOSITORY https://github.com/moves-rwth/storm.git
-#     GIT_BRANCH     master
-#     OVERRIDE_FIND_PACKAGE
-# )
-# message(Callign make available)
-# FetchContent_MakeAvailable(storm)
-# message(Done with make)
+set(CMAKE_CXX_STANDARD 20)
 
 # Configuration options
 set(PYBIND_VERSION "" CACHE STRING "Pybind11 version to use")
 MARK_AS_ADVANCED(PYBIND_VERSION)
 set(STORM_DIR_HINT "" CACHE STRING "A hint where the Storm library can be found.")
-set(CARL_DIR_HINT "" CACHE STRING "A hint where the Carl library can be found.")
+option(ALLOW_STORM_SYSTEM "Allow finding a storm version on the system" OFF)
+option(ALLOW_STORM_FETCH "Allow fetching storm" ON)
 option(USE_STORM_DFT "Enable support for DFTs" ON)
 option(USE_STORM_GSPN "Enable support for GSPNs" ON)
 option(USE_STORM_PARS "Enable support for parametric models" ON)
@@ -41,7 +33,6 @@ mark_as_advanced(COMPILE_WITH_CCACHE)
 # Find the module development requirements (requires FindPython from 3.17 or scikit-build-core's built-in backport)
 find_package(Python REQUIRED COMPONENTS Interpreter Development.Module)
 include(resources/include_pybind11.cmake)
-#find_package(pybind11 ${PYBIND_VERSION} EXACT CONFIG REQUIRED)
 message(STATUS "Stormpy - Using pybind11 version ${pybind11_VERSION}")
 
 # Helper function to print path where library was found and check whether hint was used
@@ -64,26 +55,53 @@ function(check_hint NAME DIR_FOUND HINT_DIR FOUND_VERSION)
     endif()
 endfunction(check_hint)
 
-# Find Storm
-set(STORM_MIN_VERSION "1.10.0")
-find_package(storm REQUIRED HINTS ${STORM_DIR_HINT})
-check_hint("Storm" ${storm_DIR} "${STORM_DIR_HINT}" ${storm_VERSION})
-# Check Storm version
-if (${storm_VERSION} VERSION_LESS ${STORM_MIN_VERSION})
-    MESSAGE(FATAL_ERROR "Stormpy - Storm version ${storm_VERSION} from ${storm_DIR} is not supported anymore!\nStormpy requires at least Storm version >= ${STORM_MIN_VERSION}.\nFor more information, see https://moves-rwth.github.io/stormpy/installation.html#compatibility-of-stormpy-and-storm")
-endif()
 
-# Find carl-storm and (optionally) carl-parser
-find_package(carl REQUIRED HINTS ${CARL_DIR_HINT})
-check_hint("carl" ${carl_DIR} "${CARL_DIR_HINT}" ${carl_VERSION})
+if(ALLOW_STORM_SYSTEM)
+    set(STORM_MIN_VERSION "1.9.1")
+    find_package(storm REQUIRED HINTS ${STORM_DIR_HINT})
+    check_hint("Storm" ${storm_DIR} "${STORM_DIR_HINT}" ${storm_VERSION})
+    # Check Storm version
+    if (${storm_VERSION} VERSION_LESS ${STORM_MIN_VERSION})
+        MESSAGE(FATAL_ERROR "Stormpy - Storm version ${storm_VERSION} from ${storm_DIR} is not supported anymore!\nStormpy requires at least Storm version >= ${STORM_MIN_VERSION}.\nFor more information, see https://moves-rwth.github.io/stormpy/installation.html#compatibility-of-stormpy-and-storm")
+    endif()
+
+    # Set dependency variables
+    set_dependency_var(SPOT)
+    set_dependency_var(XERCES)
+    # Check for optional Storm libraries
+    storm_with_lib(DFT)
+    storm_with_lib(GSPN)
+    storm_with_lib(PARS)
+    storm_with_lib(POMDP)
+endif ()
+if (NOT storm_FOUND AND ALLOW_STORM_FETCH)
+    include(FetchContent)
+    SET(FETCHCONTENT_QUIET OFF)
+    SET(STORM_BUILD_EXECUTABLES OFF)
+    FetchContent_Declare(
+            storm
+            GIT_REPOSITORY https://github.com/sjunges/storm.git
+            GIT_TAG        7be4a3f79a12a967d33cf2c0e112672d4a72a276 #
+            #SOURCE_DIR /Users/junges/storm/
+    )
+    FETCHCONTENT_MAKEAVAILABLE(storm)
+    include(${storm_BINARY_DIR}/stormOptions.cmake)
+    set(HAVE_STORM_DFT TRUE)
+    set(HAVE_STORM_GSPN TRUE)
+    set(HAVE_STORM_PARS TRUE)
+    set(HAVE_STORM_POMDP TRUE)
+    # Set dependency variables
+    set_dependency_var(SPOT)
+    set_dependency_var(XERCES)
+endif()
 
 find_package(carlparser QUIET HINTS ${CARLPARSER_DIR_HINT})
 if (carlparser_FOUND)
     check_hint("carl-parser" ${carlparser_DIR} "${CARLPARSER_DIR_HINT}" "")
 endif()
 
-# Set variables
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/lib/stormpy")
+
 # This sets interprocedural optimization off as this leads to some problems on some systems
 set(CMAKE_INTERPROCEDURAL_OPTIMIZATION OFF)
 # This sets the default visibility from hidden to default,
@@ -96,13 +114,20 @@ SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
 # when building, don't use the install RPATH already (but only when installing)
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
 # the RPATH to be used when installing
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-# don't add the automatically determined parts of the RPATH
+if(APPLE)
+    set(RELPOS_STRING "@loader_path")
+else()
+    set(RELPOS_STRING "$ORIGIN")
+endif()
+SET(CMAKE_INSTALL_RPATH "${RELPOS_STRING}/../../../lib/storm;${RELPOS_STRING}/../../../lib/storm/resources;${RELPOS_STRING}/../../lib/storm;${RELPOS_STRING}/../../lib/storm/resources;${RELPOS_STRING}/../lib/storm;${RELPOS_STRING}/../lib/storm/resources;${RELPOS_STRING}/lib/storm;${RELPOS_STRING}/lib/storm/resources;${RELPOS_STRING};${RELPOS_STRING}/resources")
+#  add the automatically determined parts of the RPATH
 # which point to directories outside the build tree to the install RPATH
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+SET(CMAKE_BUILD_RPATH_USE_ORIGIN TRUE)
 
 
 # Workaround for issue with Boost >= 1.81
+# TODO is this still necessary?
 find_package(Boost 1.65.1 QUIET REQUIRED COMPONENTS filesystem system)
 if (Boost_FOUND)
     if (${Boost_VERSION} VERSION_GREATER_EQUAL "1.81.0")
@@ -127,11 +152,7 @@ else()
 endif()
 
 
-# Set configurations
-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/macros.cmake)
-
 set(STORM_VERSION ${storm_VERSION})
-set(CARL_VERSION ${carl_VERSION})
 # Set number types from Carl
 set_variable_string(STORM_USE_CLN_EA_BOOL ${STORM_USE_CLN_EA})
 set_variable_string(STORM_USE_CLN_RF_BOOL ${STORM_USE_CLN_RF})
@@ -160,17 +181,13 @@ else()
 endif()
 set_variable_string(CARL_WITH_PARSER ${PYCARL_HAS_PARSE})
 # Check support for CLN
-set(PYCARL_HAS_CLN ((USE_CLN_NUMBERS) AND (CARL_USE_CLN_NUMBERS)))
+if(STORM_USE_CLN_EA OR STORM_USE_CLN_RF)
+    set(PYCARL_HAS_CLN ON)
+else()
+    set(PYCARL_HAS_CLN OFF)
+endif()
 set_variable_string(CARL_WITH_CLN ${PYCARL_HAS_CLN})
 
-# Set dependency variables
-set_dependency_var(SPOT)
-set_dependency_var(XERCES)
-# Check for optional Storm libraries
-storm_with_lib(DFT)
-storm_with_lib(GSPN)
-storm_with_lib(PARS)
-storm_with_lib(POMDP)
 # Set optional library variables
 set_optional_lib_var(DFT)
 set_optional_lib_var(GSPN)

cmake/pycarl_core_config.py.in

@@ -1,5 +1,4 @@
 # Auto-generated by CMake.
 
-CARL_VERSION = "@CARL_VERSION@"
 CARL_WITH_PARSER = @CARL_WITH_PARSER@
 CARL_WITH_CLN = @CARL_WITH_CLN@

lib/stormpy/pycarl/__init__.py

@@ -8,12 +8,6 @@
 from . import infinity
 from stormpy.pycarl import _config
 
-__version__ = "unknown"
-try:
-    from ._version import __version__
-except ImportError:
-    # We're running in a tree that doesn't have a _version.py, so we don't know what our version is.
-    pass
 
 inf = infinity.Infinity()
 
@@ -46,8 +40,6 @@ def print_info():
     """
     Print information about pycarl.
     """
-    print("Pycarl version {}".format(__version__))
-    print("Using carl in version {}".format(carl_version()))
     print("Support for CLN: {}".format(has_cln()))
     print("Support for parsing: {}".format(has_parser()))
 

pyproject.toml

@@ -9,10 +9,10 @@ readme = "README.md"
 license.file = "LICENSE"
 dynamic = ["version"]
 authors = [
-    { name = "S. Junges", email = "sjunges@cs.ru.nl" },
+    { name = "S. Junges", email = "sebastian.junges@ru.nl" },
     { name = "M. Volk", email = "m.volk@tue.nl" }
 ]
-requires-python = ">=3.7"
+requires-python = ">=3.11" # Can be reduced again, but want to iterate quicker through tests for building wheels.
 dependencies = [
     "Deprecated",
 ]
@@ -75,9 +75,7 @@ sdist.include = [
 ]
 
 [tool.scikit-build.cmake.define]
-PYBIND_VERSION="2.10.0"
-STORM_DIR_HINT=""
-CARL_DIR_HINT=""
+PYBIND_VERSION="2.13.6"
 USE_STORM_DFT="ON"
 USE_STORM_GSPN="ON"
 USE_STORM_PARS="ON"
@@ -87,18 +85,32 @@ USE_PARSER="ON"
 CARLPARSER_DIR_HINT=""
 COMPILE_WITH_CCACHE="ON"
 STORMPY_DISABLE_SIGNATURE_DOC="OFF"
+ALLOW_STORM_SYSTEM="OFF"
 
 [tool.scikit-build.metadata.version]
 provider = "scikit_build_core.metadata.regex"
 input = "lib/stormpy/_version.py"
 
+[tool.cibuildwheel]
+manylinux-x86_64-image = "manylinux_2_34"
+skip = "*musllinux*"
+
+[tool.cibuildwheel.linux]
+before-all = ".github/workflows/before-all-linux.sh"
+repair-wheel-command = "auditwheel show --disable-isa-ext-check {wheel} && auditwheel repair --disable-isa-ext-check -w {dest_dir} {wheel}"
+
+[tool.cibuildwheel.macos]
+before-all = "brew install ccache automake boost cln ginac glpk hwloc z3 xerces-c"
+repair-wheel-command = "delocate-listdeps -vv --depending --all {wheel} && DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}"
+
+[tool.cibuildwheel.config-settings]
+"cmake.args" = ["-DSTORM_PORTABLE=ON"]
+
 [tool.black]
 line-length = 160
 target-version = [
-    "py37",
-    "py38",
-    "py39",
-    "py310",
+    #"py39",
+    #"py310",
     "py311",
     "py312",
     "py313",

resources/include_pybind11.cmake

@@ -9,7 +9,7 @@ FetchContent_Declare(
     pybind11
     GIT_REPOSITORY https://github.com/pybind/pybind11
     GIT_TAG        "v${PYBIND_VERSION}"
-    PATCH_COMMAND git apply ${CMAKE_CURRENT_SOURCE_DIR}/resources/pybind11_${PYBIND_VERSION}.patch || git apply ${CMAKE_CURRENT_SOURCE_DIR}/resources/pybind11_${PYBIND_VERSION}.patch --reverse --check
+#    PATCH_COMMAND git apply ${CMAKE_CURRENT_SOURCE_DIR}/resources/pybind11_${PYBIND_VERSION}.patch || git apply ${CMAKE_CURRENT_SOURCE_DIR}/resources/pybind11_${PYBIND_VERSION}.patch --reverse --check
 )
 
 FetchContent_MakeAvailable(pybind11)