Merge branch 'main' of github.com:pybamm-team/pybammsolvers into feat/removeIREE

Author: kratman

.github/workflows/build_wheels.yml

@@ -24,17 +24,7 @@ jobs:
           submodules: 'true'
       - uses: actions/setup-python@v5
         with:
-          python-version: 3.11
-
-      - name: Get number of cores on Windows
-        id: get_num_cores
-        shell: python
-        run: |
-          from os import environ, cpu_count
-          num_cpus = cpu_count()
-          output_file = environ['GITHUB_OUTPUT']
-          with open(output_file, "a", encoding="utf-8") as output_stream:
-              output_stream.write(f"count={num_cpus}\n")
+          python-version: 3.12
 
       - name: Build wheels on Windows
         run: pipx run cibuildwheel --output-dir wheelhouse
@@ -46,7 +36,6 @@ jobs:
             VCPKG_FEATURE_FLAGS=manifests,registries
             CMAKE_GENERATOR="Visual Studio 17 2022"
             CMAKE_GENERATOR_PLATFORM=x64
-            CMAKE_BUILD_PARALLEL_LEVEL=${{ steps.get_num_cores.outputs.count }}
           CIBW_ARCHS: AMD64
           CIBW_BEFORE_BUILD: python -m pip install setuptools delvewheel # skip CasADi and CMake
           CIBW_REPAIR_WHEEL_COMMAND: delvewheel repair --add-path C:/Windows/System32 -w {dest_dir} {wheel}
@@ -70,16 +59,16 @@ jobs:
 
       - uses: actions/setup-python@v5
         with:
-          python-version: 3.11
+          python-version: 3.12
 
       - name: Build wheels on Linux
         run: pipx run cibuildwheel --output-dir wheelhouse
         env:
           CIBW_ARCHS_LINUX: x86_64
           CIBW_BEFORE_ALL_LINUX: >
             yum -y install openblas-devel lapack-devel &&
-            bash install_sundials.sh
-          CIBW_BEFORE_BUILD_LINUX: python -m pip install cmake casadi setuptools wheel
+            python install_KLU_Sundials.py
+          CIBW_BEFORE_BUILD_LINUX: python -m pip install cmake casadi==3.6.7 setuptools wheel
           CIBW_REPAIR_WHEEL_COMMAND_LINUX: auditwheel repair -w {dest_dir} {wheel}
           CIBW_TEST_EXTRAS: "dev"
           CIBW_TEST_COMMAND: |
@@ -106,7 +95,7 @@ jobs:
           submodules: 'true'
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: 3.12
 
       - name: Install cibuildwheel
         run: python -m pip install cibuildwheel
@@ -203,7 +192,7 @@ jobs:
           # 10.13 for Intel (macos-13), 11.0 for Apple Silicon (macos-14 and macos-latest)
           MACOSX_DEPLOYMENT_TARGET: ${{ matrix.os == 'macos-14' && '11.0' || '10.13' }}
           CIBW_ARCHS_MACOS: auto
-          CIBW_BEFORE_BUILD: python -m pip install cmake casadi setuptools delocate
+          CIBW_BEFORE_BUILD: python -m pip install cmake casadi==3.6.7 setuptools delocate
           CIBW_REPAIR_WHEEL_COMMAND: |
             if [[ $(uname -m) == "x86_64" ]]; then
               delocate-listdeps {wheel} && delocate-wheel -v -w {dest_dir} {wheel}

.github/workflows/integration_tests.yml

@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest]
-        python-version: [ "3.9", "3.10", "3.11", "3.12" ]
+        python-version: ["3.10", "3.11", "3.12"]
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/unit_tests.yml

@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest, macos-13, macos-latest]
-        python-version: [ "3.9", "3.10", "3.11", "3.12" ]
+        python-version: ["3.10", "3.11", "3.12"]
 
     steps:
       - uses: actions/checkout@v4

.gitignore

@@ -9,7 +9,7 @@ __pycache__
 .DS_Store
 
 setup.log
-install_KLU_Sundials
+build_sundials
 .idaklu
 build
 

.gitmodules

@@ -1,3 +1,9 @@
 [submodule "pybind11"]
 	path = pybind11
 	url = https://github.com/pybind/pybind11.git
+[submodule "sundials"]
+	path = sundials
+	url = git@github.com:LLNL/sundials.git
+[submodule "SuiteSparse"]
+	path = SuiteSparse
+	url = git@github.com:DrTimothyAldenDavis/SuiteSparse.git

.pre-commit-config.yaml

@@ -4,7 +4,7 @@ ci:
 
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.1.3"
+    rev: "v0.11.9"
     hooks:
       - id: ruff
         args: [--fix, --show-fixes]

CMakeLists.txt

@@ -92,6 +92,10 @@ pybind11_add_module(idaklu
         src/pybammsolvers/idaklu_source/Expressions/Base/ExpressionTypes.hpp
         # IDAKLU expressions - concrete implementations
         ${IDAKLU_EXPR_CASADI_SOURCE_FILES}
+<<<<<<< HEAD
+=======
+        ${IDAKLU_EXPR_IREE_SOURCE_FILES}
+>>>>>>> 0427a7998aac666b0aafd34f0b556b7df0a7e932
 )
 
 if (NOT DEFINED USE_PYTHON_CASADI)

FindSUNDIALS.cmake

@@ -21,7 +21,7 @@
 #    :code:`PATHS` entry.
 #
 #    This module will define the following variables:
-#    :code:`SUNDIALS_INCLUDE_DIRS` - Location of the SUNDIALS includes
+#    :code:`SUNDIALS_INCLUDE_DIR` - Location of the SUNDIALS includes
 #    :code:`SUNDIALS_LIBRARIES` - Required libraries for all requested components
 
 # List of the valid SUNDIALS components

README.md

@@ -32,6 +32,7 @@ Mac dependencies can be installed using brew
 ```bash
 brew install libomp
 brew reinstall gcc
+git submodule update --init --recurisive
 python install_KLU_Sundials.py
 pip install .
 ```
@@ -41,8 +42,9 @@ pip install .
 Linux installs may vary based on the distribution, however, the basic build can
 be performed with the following commands:
 ```bash
-sudo apt-get libopenblas-dev gcc gfortran make g++ build-essential
+sudo apt-get install libopenblas-dev gcc gfortran make g++ build-essential
 pip install cmake casadi setuptools wheel
+git submodules update --init --recurisive
 python install_KLU_Sundials.py
 pip install .
 ```