Merge branch 'develop' into telemetry

Author: kratman

CHANGELOG.md

@@ -21,6 +21,9 @@
 
 ## Bug Fixes
 
+- Disabled IREE on MacOS due to compatibility issues and added the CasADI
+  path to the environment to resolve issues on MacOS and Linux. Windows
+  users may still experience issues with interpolation. ([#4528](https://github.com/pybamm-team/PyBaMM/pull/4528))
 - Added `_from_json()` functionality to `Sign` which was erroneously omitted previously. ([#4517](https://github.com/pybamm-team/PyBaMM/pull/4517))
 - Fixed bug where IDAKLU solver failed when `output variables` were specified and an extrapolation event is present. ([#4440](https://github.com/pybamm-team/PyBaMM/pull/4440))
 

CONTRIBUTING.md

@@ -468,8 +468,8 @@ Editable notebooks are made available using [Google Colab](https://colab.researc
 
 GitHub does some magic with particular filenames. In particular:
 
-- The first page people see when they go to [our GitHub page](https://github.com/pybamm-team/PyBaMM) displays the contents of [README.md](https://github.com/pybamm-team/PyBaMM/blob/develop/README.md), which is written in the [Markdown](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet) format. Some guidelines can be found [here](https://help.github.com/articles/about-readmes/).
-- The license for using PyBaMM is stored in [LICENSE](https://github.com/pybamm-team/PyBaMM/blob/develop/LICENSE.txt), and [automatically](https://help.github.com/articles/adding-a-license-to-a-repository/) linked to by GitHub.
+- The first page people see when they go to [our GitHub page](https://github.com/pybamm-team/PyBaMM) displays the contents of [README.md](https://github.com/pybamm-team/PyBaMM/blob/develop/README.md), which is written in the [Markdown](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet) format. Some guidelines can be found [here](https://docs.github.com/articles/about-readmes/).
+- The license for using PyBaMM is stored in [LICENSE](https://github.com/pybamm-team/PyBaMM/blob/develop/LICENSE.txt), and [automatically](https://docs.github.com/articles/adding-a-license-to-a-repository/) linked to by GitHub.
 - This file, [CONTRIBUTING.md](https://github.com/pybamm-team/PyBaMM/blob/develop/CONTRIBUTING.md) is recognised as the contribution guidelines and a link is [automatically](https://github.com/blog/1184-contributing-guidelines) displayed when new issues or pull requests are created.
 
 ## Acknowledgements

noxfile.py

@@ -2,7 +2,6 @@
 import os
 import sys
 import warnings
-import platform
 from pathlib import Path
 
 
@@ -27,28 +26,15 @@ def set_iree_state():
     """
     state = "ON" if os.getenv("PYBAMM_IDAKLU_EXPR_IREE", "OFF") == "ON" else "OFF"
     if state == "ON":
-        if sys.platform == "win32":
+        if sys.platform == "win32" or sys.platform == "darwin":
             warnings.warn(
                 (
-                    "IREE is not enabled on Windows yet. "
+                    "IREE is not enabled on Windows and MacOS. "
                     "Setting PYBAMM_IDAKLU_EXPR_IREE=OFF."
                 ),
                 stacklevel=2,
             )
             return "OFF"
-        if sys.platform == "darwin":
-            # iree-compiler is currently only available as a wheel on macOS 13 (or
-            # higher) and Python version 3.11
-            mac_ver = int(platform.mac_ver()[0].split(".")[0])
-            if (not sys.version_info[:2] == (3, 11)) or mac_ver < 14:
-                warnings.warn(
-                    (
-                        "IREE is only supported on MacOS 13 (or higher) and Python"
-                        "version 3.11. Setting PYBAMM_IDAKLU_EXPR_IREE=OFF."
-                    ),
-                    stacklevel=2,
-                )
-                return "OFF"
     return state
 
 

src/pybamm/__init__.py

@@ -1,5 +1,3 @@
-import sys
-
 from pybamm.version import __version__
 
 # Demote expressions to 32-bit floats/ints - option used for IDAKLU-MLIR compilation
@@ -201,8 +199,11 @@
 # Pybamm Data manager using pooch
 from .pybamm_data import DataLoader
 
-# Remove any imported modules, so we don't expose them as part of pybamm
-del sys
+# Fix Casadi import
+import os
+import pathlib
+import sysconfig
+os.environ["CASADIPATH"] = str(pathlib.Path(sysconfig.get_path('purelib')) / 'casadi')
 
 __all__ = [
     "batch_study",