Use https://github.com/MetOffice/mule instead of old location (#6879)

* Use https://github.com/MetOffice/mule instead of old location.

* Remove Mule monkey patch.

* Bump cache.

Author: trexfeathers

.github/workflows/benchmarks_run.yml

@@ -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:

.github/workflows/benchmarks_validate.yml

@@ -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

benchmarks/README.md

@@ -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`).

benchmarks/benchmarks/generate_data/um_files.py

@@ -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": {

benchmarks/bm_runner.py

@@ -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),

docs/src/whatsnew/latest.rst

@@ -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,