Skip to content
Merged
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 .github/workflows/benchmarks_run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
IRIS_TEST_DATA_PATH: benchmarks/iris-test-data
IRIS_TEST_DATA_VERSION: "2.28"
# Lets us manually bump the cache to rebuild
ENV_CACHE_BUILD: "0"
ENV_CACHE_BUILD: "1"
TEST_DATA_CACHE_BUILD: "2"

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/benchmarks_validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

env:
# Lets us manually bump the cache to rebuild
ENV_CACHE_BUILD: "0"
ENV_CACHE_BUILD: "1"

steps:
- name: Checkout repo
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ accordingly.
used to generate benchmark test objects/files; see
[Data generation](#data-generation). The benchmark runner sets this
automatically, but will defer to any value already set in the shell. Note that
[Mule](https://github.com/metomi/mule) will be automatically installed into
[Mule](https://github.com/MetOffice/mule) will be automatically installed into
this environment, and sometimes
[iris-test-data](https://github.com/SciTools/iris-test-data) (see
`OVERRIDE_TEST_DATA_REPOSITORY`).
Expand Down
10 changes: 0 additions & 10 deletions benchmarks/benchmarks/generate_data/um_files.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,12 @@ def _create_um_files(
from tempfile import NamedTemporaryFile

from mule import ArrayDataProvider, Field3, FieldsFile
import mule.ff
from mule.pp import fields_to_pp_file
import numpy as np

from iris import load_cube
from iris import save as save_cube

def to_bytes_patch(self, field):
data = field.get_data()
dtype = mule.ff._DATA_DTYPES[self.WORD_SIZE][field.lbuser1]
data = data.astype(dtype)
return data.tobytes(), data.size

# TODO: remove this patch when fixed in mule, see https://github.com/MetOffice/simulation-systems/discussions/389
mule.ff._WriteFFOperatorUnpacked.to_bytes = to_bytes_patch

template = {
"fixed_length_header": {"dataset_type": 3, "grid_staggering": 3},
"integer_constants": {
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/bm_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ def clone_resource(name: str, clone_source: str) -> Path:
return clone_dir

echo("Installing Mule into data generation environment ...")
mule_dir = clone_resource("mule", "https://github.com/metomi/mule.git")
mule_dir = clone_resource("mule", "https://github.com/MetOffice/mule.git")
_subprocess_runner(
[
str(data_gen_python),
Expand Down
3 changes: 3 additions & 0 deletions docs/src/whatsnew/latest.rst
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@ This document explains the changes made to Iris for this release
#. `@trexfeathers`_ adapted ``test_OceanSigmaZFactory`` for NumPy 2.4 - only
0-dimensional arrays can now be converted to scalars. (:pull:`6876`)

#. `@trexfeathers`_ updated benchmarking to source Mule from its new home:
https://github.com/MetOffice/mule . (:pull:`6879`)


.. comment
Whatsnew author names (@github name) in alphabetical order. Note that,
Expand Down
Loading