Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Use the following command in the pyvale directory to install pyvale for developm
pip install pyvale -e .
```

We recommend installing Pyvale into a virtual environment of your choice as pyvale requires python 3.11. If you need help setting up your virtual environment and installing pyvale head over to our [installation guide](https://computer-aided-validation-laboratory.github.io/pyvale/install/install.html).
We recommend installing Pyvale into a virtual environment of your choice as pyvale requires python 3.13. If you need help setting up your virtual environment and installing pyvale head over to our [installation guide](https://computer-aided-validation-laboratory.github.io/pyvale/install/install.html).

### Make a Branch

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ The code to run the simulated experiments and produce the output shown here come
pip install pyvale
```

We recommend installing `pyvale` into a virtual environment of your choice as `pyvale` requires python 3.11. If you need help setting up your virtual environment and installing `pyvale` head over to the [installation guide](https://computer-aided-validation-laboratory.github.io/pyvale/install/install.html) in our docs.
We recommend installing `pyvale` into a virtual environment of your choice as `pyvale` requires python 3.13. If you need help setting up your virtual environment and installing `pyvale` head over to the [installation guide](https://computer-aided-validation-laboratory.github.io/pyvale/install/install.html) in our docs.

## Contributors
The Computer Aided Validation Team at UKAEA:
Expand All @@ -40,7 +40,7 @@ The Computer Aided Validation Team at UKAEA:
- Michael Atkinson ([mikesmic](https://github.com/mikesmic)), UK Atomic Energy Authority
- Adel Tayeb ([3adelTayeb](https://github.com/3adelTayeb)), UK Atomic Energy Authority
- Alex Marsh ([alexmarsh2](https://github.com/alexmarsh2)), UK Atomic Energy Authority
- Rory Spencer ([fusmatrs](https://github.com/orgs/Computer-Aided-Validation-Laboratory/people/fusmatrs)), UK Atomic Energy Authority
- Rory Spencer ([fusmatrs](https://github.com/fusmatrs)), UK Atomic Energy Authority
- John Charlton ([coolmule0](https://github.com/coolmule0)), UK Atomic Energy Authority


Expand Down
2 changes: 1 addition & 1 deletion docs/source/guide_user/guide_user.rst
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ For the computationally expensive modules in pyvale such as the simulation of im
How do I get started with pyvale?
---------------------------------

You can install pyvale from PyPI using ``pip install pyvale``. We recommend a virtual environment with python 3.11. If you are a new python user and need help setting up the correct python version and your virtual environment then go to our detailed :ref:`install guide <install_all>`.
You can install pyvale from PyPI using ``pip install pyvale``. We recommend a virtual environment with python 3.13. If you are a new python user and need help setting up the correct python version and your virtual environment then go to our detailed :ref:`install guide <install_all>`.

Once you have pyvale installed you should get familiar with the core concepts of pyvale starting with the :ref:`basic examples <examples_sensorsim_basics>`. These examples come with some pre-packaged simulation data so you will not need to provide your own simulation to get started. With the core functionality of pyvale you will have everything you need to be able to build any custom sensor array that samples scalar (e.g. temperature), vector (e.g. displacement, velocity) or tensor fields (e.g. strain).

Expand Down
14 changes: 7 additions & 7 deletions docs/source/install/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
Installation
===================

If you have **Python 3.11** installed you can setup ``pyvale`` using your preferred package manager:
If you have **Python 3.13** installed you can setup ``pyvale`` using your preferred package manager:

.. tab-set::

.. tab-item:: pip

.. code-block:: bash

# Create a virtual environment with Python 3.11
python3.11 -m venv venv-pyvale
# Create a virtual environment with Python 3.13
python3.13 -m venv venv-pyvale

# Activate the environment
source venv-pyvale/bin/activate # On Windows: .\venv-pyvale\Scripts\Activate.ps1
Expand All @@ -24,8 +24,8 @@ If you have **Python 3.11** installed you can setup ``pyvale`` using your prefe

.. code-block:: bash

# Initialize a new project with Python 3.11
uv init --python 3.11 try-pyvale
# Initialize a new project with Python 3.13
uv init --python 3.13 try-pyvale
cd try-pyvale

# Add pyvale as a dependency
Expand All @@ -36,8 +36,8 @@ If you have **Python 3.11** installed you can setup ``pyvale`` using your prefe

.. code-block:: bash

# Create a conda environment with Python 3.11
conda create -n pyvale-env python=3.11
# Create a conda environment with Python 3.13
conda create -n pyvale-env python=3.13

# Activate the environment
conda activate pyvale-env
Expand Down
18 changes: 9 additions & 9 deletions docs/source/install/install_linux.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,28 @@
Ubuntu Linux
############

Configuring Python3.11
Configuring Python3.13
------------------------

To be compatible with ``bpy`` (the Blender python interface), ``pyvale`` uses python 3.11. To install python 3.11 without corrupting your operating systems python installation first add the deadsnakes repository to apt:
To be compatible with ``bpy`` (the Blender python interface), ``pyvale`` uses python 3.13. To install python 3.13 without corrupting your operating systems python installation first add the deadsnakes repository to apt:

.. code-block:: bash

sudo add-apt-repository ppa:deadsnakes/ppa && sudo apt update

Install python 3.11:
Install python 3.13:

.. code-block:: bash

sudo apt install python3.11 python3.11-dev python3.11-venv
sudo apt install python3.13 python3.13-dev python3.13-venv

Check your python 3.11 install is working using the following command which should open an interactive python interpreter:
Check your python 3.13 install is working using the following command which should open an interactive python interpreter:

.. code-block:: bash

python3.11
python3.13

If everything has worked you should see an interactive python console with Python 3.11.xx in the header. You can now exit the interpreter using ``quit()``.
If everything has worked you should see an interactive python console with Python 3.13.xx in the header. You can now exit the interpreter using ``quit()``.

Interactive ROI Dependencies
----------------------------
Expand All @@ -43,7 +43,7 @@ We recommend installing ``pyvale`` in a virtual environment using ``venv`` or ``

.. code-block:: bash

python3.11 -m venv pyvale-env
python3.13 -m venv pyvale-env

Now activate the virtual environment:

Expand All @@ -61,7 +61,7 @@ Installation from PyPI

pip install pyvale

You should now be able to start a python 3.11 interpreter in your terminal using (again make sure your pyvale-env is active):
You should now be able to start a python 3.13 interpreter in your terminal using (again make sure your pyvale-env is active):

.. code-block:: bash

Expand Down
30 changes: 15 additions & 15 deletions docs/source/install/install_mac.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,38 @@
MacOS
######

Configuring Python 3.11
Configuring Python 3.13
***********************

To be compatible with ``bpy`` (the Blender python interface), ``pyvale`` requires python 3.11.
To be compatible with ``bpy`` (the Blender python interface), ``pyvale`` requires python 3.13.
Homebrew is a free and open-source commonly used package manager for macOS that often simplifies the process of installing, updating, and managing software.

Install via Homebrew
=====================
Simple installation instructions for Homebrew itself be found at `<https://brew.sh/>`_.

After you have homebrew setup, you can install python3.11 with:
After you have homebrew setup, you can install python3.13 with:

.. code-block::

brew install python@3.11
brew install python@3.13

To verify the installation you can try the command:

.. code-block::

which python3.11
which python3.13

Install via Python.org
======================

To install python3.11 from `<https://python.org>`_ hover over the “Downloads” link in the navigation. Select macOS.
You'll then need to select 3.11.9 (or whatever the latest version of 3.11 is).
To install python3.13 from `<https://python.org>`_ hover over the “Downloads” link in the navigation. Select macOS.
You'll then need to select 3.13 (or whatever the latest version of 3.13 is).
This should download the installer which you can then run through.

If you have multiple python version the above instructions should put python in
location ``/Library/Frameworks/Python.framework/Versions/3.11/bin/``. In that
folder there should be a ``python3``, which is really a link to ``python3.11``.
location ``/Library/Frameworks/Python.framework/Versions/3.13/bin/``. In that
folder there should be a ``python3``, which is really a link to ``python3.13``.


Virtual Environment
Expand All @@ -45,7 +45,7 @@ To create a specific virtual environment for ``pyvale`` first open a terminal Th

.. code-block:: batch

python3.11 -m venv pyvale-env
python3.13 -m venv pyvale-env

This will create a virtual environment called 'pyvale-env' in a folder of the same name. To activate the virtual environment from your current location type this into your terminal:

Expand All @@ -72,7 +72,7 @@ Installation from PyPI

pip install pyvale

You should now be able to start a python 3.11 interpreter in your terminal using (again make sure your pyvale-env is active):
You should now be able to start a python 3.13 interpreter in your terminal using (again make sure your pyvale-env is active):

.. code-block:: bash

Expand Down Expand Up @@ -109,8 +109,8 @@ used during the build process:

.. code-block:: bash

export CC=/opt/homebrew/opt/gcc/bin/gcc-15
export CXX=/opt/homebrew/opt/gcc/bin/g++-15
export CC=$(brew --prefix gcc)/bin/gcc-15
export CXX=$(brew --prefix gcc)/bin/g++-15

You might need to change the number at the end depending on which version of
``gcc`` you have installed.
Expand All @@ -128,8 +128,8 @@ used during the build process:

.. code-block:: bash

export CC=/opt/homebrew/opt/llvm/bin/clang
export CXX=/opt/homebrew/opt/llvm/bin/clang++
export CC=$(brew --prefix llvm)/bin/clang
export CXX=$(brew --prefix llvm)/bin/clang++

Clone and Install the Github Repository
=======================================
Expand Down
8 changes: 4 additions & 4 deletions docs/source/install/install_windows.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Windows 11
Installing python
-----------------

To be compatible with ``bpy`` (the Blender python interface), ``pyvale`` uses python 3.11. To install python 3.11 for windows grab the correct installer for your system (most likely windows 64 bit) from the python website here: https://www.python.org/downloads/release/python-3119/.
To be compatible with ``bpy`` (the Blender python interface), ``pyvale`` uses python 3.13. To install python 3.13 for windows grab the correct installer for your system (most likely windows 64 bit) from the python website here: https://www.python.org/downloads/release/python-3130/.

Launch the installer, select 'custom installation' and make sure the 'py launcher' option is checked. Then click next and finish the installation. If you are prompted to disable the maximum path length then click this to confirm you want to disable the path length.

Expand All @@ -17,9 +17,9 @@ To confirm your installation has worked you should open a windows command line u

.. code-block:: batch

py -3.11
py -3.13

If you see prompt with Python 3.11.9 in the header and the starting cursor has '>>>' then everything has worked. If you install other python versions on windows you can start them using the py launcher using this syntax ``py -#.#``. Where the '\#' is the version you want to start. For pyvale we will stick with python 3.11.
If you see prompt with Python 3.13 in the header and the starting cursor has '>>>' then everything has worked. If you install other python versions on windows you can start them using the py launcher using this syntax ``py -#.#``. Where the '\#' is the version you want to start. For pyvale we will stick with python 3.13.

Troubleshooting the py launcher
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand All @@ -41,7 +41,7 @@ We recommend installing ``pyvale`` in a virtual environment using ``venv`` or ``

.. code-block:: batch

py -3.11 -m venv pyvale-env
py -3.13 -m venv pyvale-env

This will create a virtual environment called 'pyvale-env' in a folder of the same name. To activate the virtual environment from your current location type this into the command prompt:

Expand Down
16 changes: 15 additions & 1 deletion src/pyvale/verif/pointsens.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,25 @@ def check_gold_measurements(sens_dict: dict[str,sens.SensorsPoint],
atol: float = 1e-5) -> list[str]:
fails = []

MACOS_GOLD_CASES = {
"scal2d_analytic_nomesh",
"scal3d_nomesh",
"vec2d_analytic_nomesh",
"tens2d_analytic_nomesh",
}

for ss in sens_dict:
measurements = sens_dict[ss].sim_measurements()
gold_path = pointsensconst.GOLD_PATH / f"{ss}.npy"

load_path = pointsensconst.GOLD_PATH / f"{ss.lower()}.npy"
print(ss.lower())

if any(case in ss.lower() for case in MACOS_GOLD_CASES):
load_path = (pointsensconst.GOLD_PATH / "macos" / f"{ss.lower()}.npy")
else:
load_path = (pointsensconst.GOLD_PATH / f"{ss.lower()}.npy")


if load_path.is_file():
gold = np.load(load_path)

Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading