Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not realize cell measures and ancillary variables in concatenate #6010

Merged
merged 3 commits into from
Jun 25, 2024
Merged

Do not realize cell measures and ancillary variables in concatenate #6010

merged 3 commits into from
Jun 25, 2024

Conversation

bouweandela
Copy link
Member

🚀 Pull Request

Description

Do not realize cell measures and ancillary variables in concatenate

Consult Iris pull request check list

Add any of the below labels to trigger actions on this PR:

  • benchmark_this Request that this pull request be benchmarked to check if it introduces performance shifts

@bouweandela bouweandela marked this pull request as ready for review June 18, 2024 15:54
@codecov Codecov
Copy link

codecov bot commented Jun 18, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 89.76%. Comparing base (fe6cea3) to head (3d6fbf8).
Report is 57 commits behind head on main.

Additional details and impacted files 
@@           Coverage Diff           @@
##             main    #6010   +/-   ##
=======================================
  Coverage   89.76%   89.76%           
=======================================
  Files          90       90           
  Lines       22969    22969           
  Branches     5029     5029           
=======================================
  Hits        20618    20618           
  Misses       1620     1620           
  Partials      731      731

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@bouweandela bouweandela added the benchmark_this Request that this pull request be benchmarked to check if it introduces performance shifts label Jun 25, 2024
@github-actions GitHub Actions
Copy link
Contributor

⏱️ Performance Benchmark Report: 085685e

Performance shifts 
| Change   | Before [788b6f99]    | After [085685e7]    |   Ratio | Benchmark (Parameter)                                |
|----------|----------------------|---------------------|---------|------------------------------------------------------|
| -        | 192±2ms              | 135±2ms             |    0.7  | merge_concat.Concatenate.time_concatenate            |
| -        | 226.9                | 24.0                |    0.11 | merge_concat.Concatenate.track_mem_merge             |
| -        | 1.9                  | 1.5                 |    0.79 | save.NetcdfSave.track_addedmem_netcdf_save(50, True) |
| Change   |   Before [788b6f99]  |   After [085685e7]  |   Ratio | Benchmark (Parameter)                                 |
|----------|----------------------|---------------------|---------|-------------------------------------------------------|
| +        |                165.2 |               231.1 |     1.4 | save.NetcdfSave.track_addedmem_netcdf_save(600, True) |
Full benchmark results 

Benchmarks that have improved:

| Change   | Before [788b6f99]    | After [085685e7]    |   Ratio | Benchmark (Parameter)                                |
|----------|----------------------|---------------------|---------|------------------------------------------------------|
| -        | 192±2ms              | 135±2ms             |    0.7  | merge_concat.Concatenate.time_concatenate            |
| -        | 226.9                | 24.0                |    0.11 | merge_concat.Concatenate.track_mem_merge             |
| -        | 1.9                  | 1.5                 |    0.79 | save.NetcdfSave.track_addedmem_netcdf_save(50, True) |

Benchmarks that have stayed the same:

| Change   | Before [788b6f99]    | After [085685e7]    | Ratio   | Benchmark (Parameter)                                                                                  |
|----------|----------------------|---------------------|---------|--------------------------------------------------------------------------------------------------------|
|          | 54.8±0.8ms           | 55.1±0.6ms          | 1.01    | aggregate_collapse.Aggregation.time_aggregated_by_COUNT(False)                                         |
|          | 55.7±1ms             | 55.6±0.8ms          | 1.00    | aggregate_collapse.Aggregation.time_aggregated_by_COUNT(True)                                          |
|          | 195±3ms              | 193±2ms             | 0.99    | aggregate_collapse.Aggregation.time_aggregated_by_FAST_PERCENTILE(False)                               |
|          | 196±3ms              | 198±2ms             | 1.01    | aggregate_collapse.Aggregation.time_aggregated_by_FAST_PERCENTILE(True)                                |
|          | 37.6±0.6ms           | 37.3±1ms            | 0.99    | aggregate_collapse.Aggregation.time_aggregated_by_GMEAN(False)                                         |
|          | 38.0±0.8ms           | 38.2±1ms            | 1.01    | aggregate_collapse.Aggregation.time_aggregated_by_GMEAN(True)                                          |
|          | 38.0±0.5ms           | 37.2±0.8ms          | 0.98    | aggregate_collapse.Aggregation.time_aggregated_by_HMEAN(False)                                         |
|          | 38.4±0.4ms           | 38.2±0.7ms          | 0.99    | aggregate_collapse.Aggregation.time_aggregated_by_HMEAN(True)                                          |
|          | 47.6±0.9ms           | 47.6±1ms            | 1.00    | aggregate_collapse.Aggregation.time_aggregated_by_MAX(False)                                           |
|          | 47.9±0.4ms           | 49.0±0.8ms          | 1.02    | aggregate_collapse.Aggregation.time_aggregated_by_MAX(True)                                            |
|          | 122±1ms              | 123±1ms             | 1.00    | aggregate_collapse.Aggregation.time_aggregated_by_MAX_RUN(False)                                       |
|          | 123±1ms              | 125±2ms             | 1.02    | aggregate_collapse.Aggregation.time_aggregated_by_MAX_RUN(True)                                        |
|          | 52.1±0.7ms           | 52.8±0.8ms          | 1.01    | aggregate_collapse.Aggregation.time_aggregated_by_MEAN(False)                                          |
|          | 52.6±0.8ms           | 53.4±0.9ms          | 1.02    | aggregate_collapse.Aggregation.time_aggregated_by_MEAN(True)                                           |
|          | 37.5±0.7ms           | 38.0±0.4ms          | 1.01    | aggregate_collapse.Aggregation.time_aggregated_by_MEDIAN(False)                                        |
|          | 38.7±1ms             | 38.7±0.6ms          | 1.00    | aggregate_collapse.Aggregation.time_aggregated_by_MEDIAN(True)                                         |
|          | 48.0±0.6ms           | 47.5±0.8ms          | 0.99    | aggregate_collapse.Aggregation.time_aggregated_by_MIN(False)                                           |
|          | 48.0±1ms             | 48.6±0.8ms          | 1.01    | aggregate_collapse.Aggregation.time_aggregated_by_MIN(True)                                            |
|          | 1.32±0.02s           | 1.32±0.03s          | 1.00    | aggregate_collapse.Aggregation.time_aggregated_by_PEAK(False)                                          |
|          | 1.34±0.01s           | 1.34±0.02s          | 1.00    | aggregate_collapse.Aggregation.time_aggregated_by_PEAK(True)                                           |
|          | 703±10ms             | 696±10ms            | 0.99    | aggregate_collapse.Aggregation.time_aggregated_by_PERCENTILE(False)                                    |
|          | 695±10ms             | 692±10ms            | 1.00    | aggregate_collapse.Aggregation.time_aggregated_by_PERCENTILE(True)                                     |
|          | 35.6±1ms             | 36.5±0.7ms          | 1.02    | aggregate_collapse.Aggregation.time_aggregated_by_PROPORTION(False)                                    |
|          | 36.5±0.8ms           | 37.4±0.7ms          | 1.02    | aggregate_collapse.Aggregation.time_aggregated_by_PROPORTION(True)                                     |
|          | 63.1±0.8ms           | 63.8±1ms            | 1.01    | aggregate_collapse.Aggregation.time_aggregated_by_RMS(False)                                           |
|          | 63.5±1ms             | 63.9±0.9ms          | 1.01    | aggregate_collapse.Aggregation.time_aggregated_by_RMS(True)                                            |
|          | 67.3±0.6ms           | 67.4±0.8ms          | 1.00    | aggregate_collapse.Aggregation.time_aggregated_by_STD_DEV(False)                                       |
|          | 68.6±1ms             | 68.5±1ms            | 1.00    | aggregate_collapse.Aggregation.time_aggregated_by_STD_DEV(True)                                        |
|          | 62.6±0.8ms           | 62.9±0.5ms          | 1.00    | aggregate_collapse.Aggregation.time_aggregated_by_VARIANCE(False)                                      |
|          | 63.4±0.9ms           | 64.5±0.6ms          | 1.02    | aggregate_collapse.Aggregation.time_aggregated_by_VARIANCE(True)                                       |
|          | 20.9±0.5ms           | 21.3±0.5ms          | 1.02    | aggregate_collapse.Aggregation.time_collapsed_by_COUNT(False)                                          |
|          | 24.4±1ms             | 24.3±0.7ms          | 1.00    | aggregate_collapse.Aggregation.time_collapsed_by_COUNT(True)                                           |
|          | 135±5ms              | 134±3ms             | 0.99    | aggregate_collapse.Aggregation.time_collapsed_by_FAST_PERCENTILE(False)                                |
|          | 147±3ms              | 149±3ms             | 1.01    | aggregate_collapse.Aggregation.time_collapsed_by_FAST_PERCENTILE(True)                                 |
|          | 18.8±0.6ms           | 19.0±0.6ms          | 1.01    | aggregate_collapse.Aggregation.time_collapsed_by_GMEAN(False)                                          |
|          | 22.8±0.5ms           | 22.6±0.9ms          | 0.99    | aggregate_collapse.Aggregation.time_collapsed_by_GMEAN(True)                                           |
|          | 18.9±0.6ms           | 18.9±0.5ms          | 1.00    | aggregate_collapse.Aggregation.time_collapsed_by_HMEAN(False)                                          |
|          | 22.5±0.6ms           | 22.6±0.5ms          | 1.01    | aggregate_collapse.Aggregation.time_collapsed_by_HMEAN(True)                                           |
|          | 19.3±0.6ms           | 19.5±0.7ms          | 1.01    | aggregate_collapse.Aggregation.time_collapsed_by_MAX(False)                                            |
|          | 22.8±0.9ms           | 23.4±0.5ms          | 1.02    | aggregate_collapse.Aggregation.time_collapsed_by_MAX(True)                                             |
|          | 35.2±0.9ms           | 36.0±1ms            | 1.02    | aggregate_collapse.Aggregation.time_collapsed_by_MAX_RUN(False)                                        |
|          | 38.5±1ms             | 39.0±0.8ms          | 1.01    | aggregate_collapse.Aggregation.time_collapsed_by_MAX_RUN(True)                                         |
|          | 19.6±0.9ms           | 20.0±0.6ms          | 1.02    | aggregate_collapse.Aggregation.time_collapsed_by_MEAN(False)                                           |
|          | 23.6±0.6ms           | 23.8±0.4ms          | 1.01    | aggregate_collapse.Aggregation.time_collapsed_by_MEAN(True)                                            |
|          | 20.0±0.5ms           | 19.4±0.6ms          | 0.97    | aggregate_collapse.Aggregation.time_collapsed_by_MEDIAN(False)                                         |
|          | 23.6±0.6ms           | 23.5±0.6ms          | 1.00    | aggregate_collapse.Aggregation.time_collapsed_by_MEDIAN(True)                                          |
|          | 19.7±0.9ms           | 19.4±0.4ms          | 0.98    | aggregate_collapse.Aggregation.time_collapsed_by_MIN(False)                                            |
|          | 22.9±0.8ms           | 23.2±0.5ms          | 1.01    | aggregate_collapse.Aggregation.time_collapsed_by_MIN(True)                                             |
|          | 552±4ms              | 560±10ms            | 1.02    | aggregate_collapse.Aggregation.time_collapsed_by_PEAK(False)                                           |
|          | 558±4ms              | 559±10ms            | 1.00    | aggregate_collapse.Aggregation.time_collapsed_by_PEAK(True)                                            |
|          | 154±2ms              | 157±5ms             | 1.02    | aggregate_collapse.Aggregation.time_collapsed_by_PERCENTILE(False)                                     |
|          | 171±3ms              | 172±4ms             | 1.00    | aggregate_collapse.Aggregation.time_collapsed_by_PERCENTILE(True)                                      |
|          | 18.2±0.5ms           | 18.5±0.5ms          | 1.01    | aggregate_collapse.Aggregation.time_collapsed_by_PROPORTION(False)                                     |
|          | 22.0±0.9ms           | 22.6±0.6ms          | 1.02    | aggregate_collapse.Aggregation.time_collapsed_by_PROPORTION(True)                                      |
|          | 21.8±0.4ms           | 22.1±0.8ms          | 1.01    | aggregate_collapse.Aggregation.time_collapsed_by_RMS(False)                                            |
|          | 25.5±0.6ms           | 25.5±0.8ms          | 1.00    | aggregate_collapse.Aggregation.time_collapsed_by_RMS(True)                                             |
|          | 22.2±0.5ms           | 22.2±0.8ms          | 1.00    | aggregate_collapse.Aggregation.time_collapsed_by_STD_DEV(False)                                        |
|          | 25.7±0.7ms           | 26.0±0.7ms          | 1.01    | aggregate_collapse.Aggregation.time_collapsed_by_STD_DEV(True)                                         |
|          | 21.2±0.7ms           | 21.5±1ms            | 1.02    | aggregate_collapse.Aggregation.time_collapsed_by_VARIANCE(False)                                       |
|          | 25.0±0.6ms           | 25.3±0.7ms          | 1.01    | aggregate_collapse.Aggregation.time_collapsed_by_VARIANCE(True)                                        |
|          | 83.8±0.9ms           | 84.1±2ms            | 1.00    | aggregate_collapse.WeightedAggregation.time_w_aggregated_by_MEAN(False)                                |
|          | 84.5±1ms             | 85.5±0.9ms          | 1.01    | aggregate_collapse.WeightedAggregation.time_w_aggregated_by_MEAN(True)                                 |
|          | 96.6±1ms             | 97.2±1ms            | 1.01    | aggregate_collapse.WeightedAggregation.time_w_aggregated_by_RMS(False)                                 |
|          | 96.9±1ms             | 97.2±1ms            | 1.00    | aggregate_collapse.WeightedAggregation.time_w_aggregated_by_RMS(True)                                  |
|          | 58.9±0.7ms           | 59.4±1ms            | 1.01    | aggregate_collapse.WeightedAggregation.time_w_aggregated_by_SUM(False)                                 |
|          | 59.9±0.4ms           | 60.1±0.6ms          | 1.00    | aggregate_collapse.WeightedAggregation.time_w_aggregated_by_SUM(True)                                  |
|          | 29.6±0.8ms           | 30.6±0.6ms          | 1.03    | aggregate_collapse.WeightedAggregation.time_w_collapsed_by_MEAN(False)                                 |
|          | 33.4±0.6ms           | 34.0±0.9ms          | 1.02    | aggregate_collapse.WeightedAggregation.time_w_collapsed_by_MEAN(True)                                  |
|          | 31.8±1ms             | 32.1±0.4ms          | 1.01    | aggregate_collapse.WeightedAggregation.time_w_collapsed_by_RMS(False)                                  |
|          | 35.9±0.9ms           | 35.6±0.7ms          | 0.99    | aggregate_collapse.WeightedAggregation.time_w_collapsed_by_RMS(True)                                   |
|          | 26.4±0.4ms           | 26.5±1ms            | 1.00    | aggregate_collapse.WeightedAggregation.time_w_collapsed_by_SUM(False)                                  |
|          | 30.2±0.4ms           | 30.5±0.6ms          | 1.01    | aggregate_collapse.WeightedAggregation.time_w_collapsed_by_SUM(True)                                   |
|          | 331±4ms              | 331±2ms             | 1.00    | aggregate_collapse.WeightedAggregation.time_w_collapsed_by_WPERCENTILE(False)                          |
|          | 351±4ms              | 351±5ms             | 1.00    | aggregate_collapse.WeightedAggregation.time_w_collapsed_by_WPERCENTILE(True)                           |
|          | 1.11±0.02ms          | 1.10±0.01ms         | 0.99    | cube.CubeCreation.time_create(False, 'construct')                                                      |
|          | 401±4μs              | 398±5μs             | 0.99    | cube.CubeCreation.time_create(False, 'instantiate')                                                    |
|          | 964±5μs              | 954±10μs            | 0.99    | cube.CubeCreation.time_create(True, 'construct')                                                       |
|          | 579±5μs              | 585±7μs             | 1.01    | cube.CubeCreation.time_create(True, 'instantiate')                                                     |
|          | 228±3ms              | 229±6ms             | 1.00    | cube.CubeEquality.time_equality(False, False, 'all_equal')                                             |
|          | 115±0.9ms            | 115±2ms             | 1.00    | cube.CubeEquality.time_equality(False, False, 'coord_inequality')                                      |
|          | 243±4ms              | 239±4ms             | 0.98    | cube.CubeEquality.time_equality(False, False, 'data_inequality')                                       |
|          | 16.7±0.2μs           | 16.6±0.2μs          | 1.00    | cube.CubeEquality.time_equality(False, False, 'metadata_inequality')                                   |
|          | 317±4ms              | 318±6ms             | 1.01    | cube.CubeEquality.time_equality(False, True, 'all_equal')                                              |
|          | 204±2ms              | 209±6ms             | 1.03    | cube.CubeEquality.time_equality(False, True, 'coord_inequality')                                       |
|          | 330±2ms              | 328±5ms             | 0.99    | cube.CubeEquality.time_equality(False, True, 'data_inequality')                                        |
|          | 16.5±0.2μs           | 16.6±0.2μs          | 1.00    | cube.CubeEquality.time_equality(False, True, 'metadata_inequality')                                    |
|          | 229±4ms              | 227±5ms             | 0.99    | cube.CubeEquality.time_equality(True, False, 'all_equal')                                              |
|          | 114±2ms              | 115±2ms             | 1.01    | cube.CubeEquality.time_equality(True, False, 'coord_inequality')                                       |
|          | 239±2ms              | 242±3ms             | 1.01    | cube.CubeEquality.time_equality(True, False, 'data_inequality')                                        |
|          | 54.1±1μs             | 53.6±0.5μs          | 0.99    | cube.CubeEquality.time_equality(True, False, 'metadata_inequality')                                    |
|          | 319±3ms              | 321±8ms             | 1.01    | cube.CubeEquality.time_equality(True, True, 'all_equal')                                               |
|          | 206±2ms              | 202±4ms             | 0.98    | cube.CubeEquality.time_equality(True, True, 'coord_inequality')                                        |
|          | 333±4ms              | 322±5ms             | 0.97    | cube.CubeEquality.time_equality(True, True, 'data_inequality')                                         |
|          | 55.4±0.6μs           | 55.5±0.5μs          | 1.00    | cube.CubeEquality.time_equality(True, True, 'metadata_inequality')                                     |
|          | 407±2ns              | 409±3ns             | 1.01    | experimental.ugrid.regions_combine.CombineRegionsComputeRealData.time_compute_data(50)                 |
|          | 281±3ms              | 281±3ms             | 1.00    | experimental.ugrid.regions_combine.CombineRegionsComputeRealData.time_compute_data(500)                |
|          | 0.6                  | 0.6                 | 1.00    | experimental.ugrid.regions_combine.CombineRegionsComputeRealData.track_addedmem_compute_data(50)       |
|          | 57.3                 | 57.3                | 1.00    | experimental.ugrid.regions_combine.CombineRegionsComputeRealData.track_addedmem_compute_data(500)      |
|          | 14.7±0.3ms           | 14.7±0.1ms          | 1.00    | experimental.ugrid.regions_combine.CombineRegionsCreateCube.time_create_combined_cube(50)              |
|          | 17.2±0.5ms           | 16.6±0.3ms          | 0.96    | experimental.ugrid.regions_combine.CombineRegionsCreateCube.time_create_combined_cube(500)             |
|          | 0.5                  | 0.5                 | 1.00    | experimental.ugrid.regions_combine.CombineRegionsCreateCube.track_addedmem_create_combined_cube(50)    |
|          | 11.8                 | 11.8                | 1.00    | experimental.ugrid.regions_combine.CombineRegionsCreateCube.track_addedmem_create_combined_cube(500)   |
|          | 108±1ms              | 106±1ms             | 0.98    | experimental.ugrid.regions_combine.CombineRegionsFileStreamedCalc.time_stream_file2file(50)            |
|          | 739±5ms              | 730±4ms             | 0.99    | experimental.ugrid.regions_combine.CombineRegionsFileStreamedCalc.time_stream_file2file(500)           |
|          | 1.4                  | 1.4                 | 1.00    | experimental.ugrid.regions_combine.CombineRegionsFileStreamedCalc.track_addedmem_stream_file2file(50)  |
|          | 92.0                 | 92.0                | 1.00    | experimental.ugrid.regions_combine.CombineRegionsFileStreamedCalc.track_addedmem_stream_file2file(500) |
|          | 68.0±2ms             | 67.8±2ms            | 1.00    | experimental.ugrid.regions_combine.CombineRegionsSaveData.time_save(50)                                |
|          | 690±5ms              | 687±4ms             | 1.00    | experimental.ugrid.regions_combine.CombineRegionsSaveData.time_save(500)                               |
|          | 1.3                  | 1.3                 | 1.00    | experimental.ugrid.regions_combine.CombineRegionsSaveData.track_addedmem_save(50)                      |
|          | 92.0                 | 92.0                | 1.00    | experimental.ugrid.regions_combine.CombineRegionsSaveData.track_addedmem_save(500)                     |
|          | 2.1752849999999997   | 2.1752849999999997  | 1.00    | experimental.ugrid.regions_combine.CombineRegionsSaveData.track_filesize_saved(50)                     |
|          | 216.01528499999998   | 216.01528499999998  | 1.00    | experimental.ugrid.regions_combine.CombineRegionsSaveData.track_filesize_saved(500)                    |
|          | 666±3μs              | 666±7μs             | 1.00    | import_iris.Iris.time__concatenate                                                                     |
|          | 188±4μs              | 181±2μs             | 0.97    | import_iris.Iris.time__constraints                                                                     |
|          | 111±1μs              | 111±0.7μs           | 1.00    | import_iris.Iris.time__data_manager                                                                    |
|          | 95.0±0.8μs           | 95.8±1μs            | 1.01    | import_iris.Iris.time__deprecation                                                                     |
|          | 136±1μs              | 136±2μs             | 1.00    | import_iris.Iris.time__lazy_data                                                                       |
|          | 906±20μs             | 896±8μs             | 0.99    | import_iris.Iris.time__merge                                                                           |
|          | 76.6±1μs             | 78.1±0.8μs          | 1.02    | import_iris.Iris.time__representation                                                                  |
|          | 491±10μs             | 484±4μs             | 0.99    | import_iris.Iris.time_analysis                                                                         |
|          | 143±2μs              | 145±4μs             | 1.01    | import_iris.Iris.time_analysis__area_weighted                                                          |
|          | 109±2μs              | 109±0.5μs           | 1.00    | import_iris.Iris.time_analysis__grid_angles                                                            |
|          | 243±3μs              | 242±3μs             | 1.00    | import_iris.Iris.time_analysis__interpolation                                                          |
|          | 188±2μs              | 190±2μs             | 1.01    | import_iris.Iris.time_analysis__regrid                                                                 |
|          | 113±1μs              | 114±1μs             | 1.01    | import_iris.Iris.time_analysis__scipy_interpolate                                                      |
|          | 140±1μs              | 140±2μs             | 1.00    | import_iris.Iris.time_analysis_calculus                                                                |
|          | 329±3μs              | 330±7μs             | 1.00    | import_iris.Iris.time_analysis_cartography                                                             |
|          | 94.3±0.6μs           | 96.6±0.6μs          | 1.02    | import_iris.Iris.time_analysis_geomerty                                                                |
|          | 216±3μs              | 221±3μs             | 1.02    | import_iris.Iris.time_analysis_maths                                                                   |
|          | 98.4±0.8μs           | 99.1±2μs            | 1.01    | import_iris.Iris.time_analysis_stats                                                                   |
|          | 177±3μs              | 177±2μs             | 1.00    | import_iris.Iris.time_analysis_trajectory                                                              |
|          | 312±4μs              | 307±7μs             | 0.98    | import_iris.Iris.time_aux_factory                                                                      |
|          | 85.1±1μs             | 84.4±0.3μs          | 0.99    | import_iris.Iris.time_common                                                                           |
|          | 163±1μs              | 164±2μs             | 1.01    | import_iris.Iris.time_common_lenient                                                                   |
|          | 985±10μs             | 994±20μs            | 1.01    | import_iris.Iris.time_common_metadata                                                                  |
|          | 136±3μs              | 135±1μs             | 0.99    | import_iris.Iris.time_common_mixin                                                                     |
|          | 1.19±0.01ms          | 1.18±0ms            | 0.99    | import_iris.Iris.time_common_resolve                                                                   |
|          | 201±1μs              | 203±2μs             | 1.01    | import_iris.Iris.time_config                                                                           |
|          | 116±2μs              | 118±0.8μs           | 1.01    | import_iris.Iris.time_coord_categorisation                                                             |
|          | 357±3μs              | 368±4μs             | 1.03    | import_iris.Iris.time_coord_systems                                                                    |
|          | 759±10μs             | 747±4μs             | 0.98    | import_iris.Iris.time_coords                                                                           |
|          | 682±7μs              | 686±10μs            | 1.01    | import_iris.Iris.time_cube                                                                             |
|          | 226±2μs              | 228±2μs             | 1.01    | import_iris.Iris.time_exceptions                                                                       |
|          | 77.6±0.3μs           | 78.8±1μs            | 1.01    | import_iris.Iris.time_experimental                                                                     |
|          | 187±1μs              | 188±2μs             | 1.01    | import_iris.Iris.time_fileformats                                                                      |
|          | 250±0.8μs            | 252±4μs             | 1.01    | import_iris.Iris.time_fileformats__ff                                                                  |
|          | 2.68±0.02ms          | 2.69±0.08ms         | 1.00    | import_iris.Iris.time_fileformats__ff_cross_references                                                 |
|          | 79.2±0.6μs           | 80.5±0.7μs          | 1.02    | import_iris.Iris.time_fileformats__pp_lbproc_pairs                                                     |
|          | 116±0.7μs            | 116±1μs             | 1.00    | import_iris.Iris.time_fileformats_abf                                                                  |
|          | 355±3μs              | 362±9μs             | 1.02    | import_iris.Iris.time_fileformats_cf                                                                   |
|          | 5.48±0.1ms           | 5.82±0.2ms          | 1.06    | import_iris.Iris.time_fileformats_dot                                                                  |
|          | 74.9±0.8μs           | 76.0±0.9μs          | 1.01    | import_iris.Iris.time_fileformats_name                                                                 |
|          | 257±1μs              | 259±1μs             | 1.01    | import_iris.Iris.time_fileformats_name_loaders                                                         |
|          | 118±1μs              | 120±1μs             | 1.01    | import_iris.Iris.time_fileformats_netcdf                                                               |
|          | 124±2μs              | 124±0.8μs           | 0.99    | import_iris.Iris.time_fileformats_nimrod                                                               |
|          | 219±6μs              | 212±2μs             | 0.97    | import_iris.Iris.time_fileformats_nimrod_load_rules                                                    |
|          | 781±5μs              | 785±3μs             | 1.00    | import_iris.Iris.time_fileformats_pp                                                                   |
|          | 179±4μs              | 180±3μs             | 1.01    | import_iris.Iris.time_fileformats_pp_load_rules                                                        |
|          | 133±1μs              | 136±2μs             | 1.02    | import_iris.Iris.time_fileformats_pp_save_rules                                                        |
|          | 513±2μs              | 518±7μs             | 1.01    | import_iris.Iris.time_fileformats_rules                                                                |
|          | 222±2μs              | 220±3μs             | 0.99    | import_iris.Iris.time_fileformats_structured_array_identification                                      |
|          | 84.2±0.7μs           | 85.1±0.3μs          | 1.01    | import_iris.Iris.time_fileformats_um                                                                   |
|          | 162±1μs              | 162±2μs             | 0.99    | import_iris.Iris.time_fileformats_um__fast_load                                                        |
|          | 140±1μs              | 138±0.7μs           | 0.99    | import_iris.Iris.time_fileformats_um__fast_load_structured_fields                                      |
|          | 77.0±0.9μs           | 77.0±0.6μs          | 1.00    | import_iris.Iris.time_fileformats_um__ff_replacement                                                   |
|          | 83.3±0.9μs           | 82.4±0.9μs          | 0.99    | import_iris.Iris.time_fileformats_um__optimal_array_structuring                                        |
|          | 978±10μs             | 972±7μs             | 0.99    | import_iris.Iris.time_fileformats_um_cf_map                                                            |
|          | 138±2μs              | 138±0.7μs           | 1.00    | import_iris.Iris.time_io                                                                               |
|          | 172±2μs              | 171±3μs             | 0.99    | import_iris.Iris.time_io_format_picker                                                                 |
|          | 203±1μs              | 204±3μs             | 1.01    | import_iris.Iris.time_iris                                                                             |
|          | 127±0.7μs            | 128±2μs             | 1.01    | import_iris.Iris.time_iterate                                                                          |
|          | 8.39±0.09ms          | 8.44±0.06ms         | 1.01    | import_iris.Iris.time_palette                                                                          |
|          | 2.22±0.04ms          | 2.23±0.05ms         | 1.01    | import_iris.Iris.time_plot                                                                             |
|          | 103±1μs              | 104±0.8μs           | 1.01    | import_iris.Iris.time_quickplot                                                                        |
|          | 2.12±0.01ms          | 2.12±0.02ms         | 1.00    | import_iris.Iris.time_std_names                                                                        |
|          | 1.80±0.02ms          | 1.79±0.01ms         | 0.99    | import_iris.Iris.time_symbols                                                                          |
|          | 12.8±1ms             | 12.6±1ms            | 0.98    | import_iris.Iris.time_tests                                                                            |
|          | 231±2μs              | 229±2μs             | 1.00    | import_iris.Iris.time_third_party_cartopy                                                              |
|          | 4.81±0.04ms          | 4.85±0.05ms         | 1.01    | import_iris.Iris.time_third_party_cf_units                                                             |
|          | 106±0.5μs            | 108±0.7μs           | 1.02    | import_iris.Iris.time_third_party_cftime                                                               |
|          | 2.81±0.03ms          | 2.78±0.02ms         | 0.99    | import_iris.Iris.time_third_party_matplotlib                                                           |
|          | 1.07±0ms             | 1.06±0.01ms         | 1.00    | import_iris.Iris.time_third_party_numpy                                                                |
|          | 158±0.9μs            | 159±1μs             | 1.01    | import_iris.Iris.time_third_party_scipy                                                                |
|          | 99.7±0.7μs           | 101±1μs             | 1.02    | import_iris.Iris.time_time                                                                             |
|          | 323±5μs              | 320±3μs             | 0.99    | import_iris.Iris.time_util                                                                             |
|          | 73.4±1μs             | 73.6±1μs            | 1.00    | iterate.IZip.time_izip                                                                                 |
|          | 8.20±0.2ms           | 8.13±0.1ms          | 0.99    | load.LoadAndRealise.time_load((1280, 960, 5), False, 'FF')                                             |
|          | 24.5±0.3ms           | 24.0±0.3ms          | 0.98    | load.LoadAndRealise.time_load((1280, 960, 5), False, 'NetCDF')                                         |
|          | 8.95±0.07ms          | 8.81±0.08ms         | 0.99    | load.LoadAndRealise.time_load((1280, 960, 5), False, 'PP')                                             |
|          | 8.11±0.04ms          | 8.12±0.06ms         | 1.00    | load.LoadAndRealise.time_load((1280, 960, 5), True, 'FF')                                              |
|          | 21.7±0.3ms           | 21.1±0.2ms          | 0.97    | load.LoadAndRealise.time_load((1280, 960, 5), True, 'NetCDF')                                          |
|          | 8.95±0.1ms           | 8.86±0.04ms         | 0.99    | load.LoadAndRealise.time_load((1280, 960, 5), True, 'PP')                                              |
|          | 1.37±0.01s           | 1.37±0.01s          | 1.00    | load.LoadAndRealise.time_load((2, 2, 1000), False, 'FF')                                               |
|          | 21.0±0.5ms           | 20.7±0.2ms          | 0.98    | load.LoadAndRealise.time_load((2, 2, 1000), False, 'NetCDF')                                           |
|          | 1.52±0.01s           | 1.52±0.01s          | 1.00    | load.LoadAndRealise.time_load((2, 2, 1000), False, 'PP')                                               |
|          | 1.37±0.02s           | 1.36±0.01s          | 0.99    | load.LoadAndRealise.time_load((2, 2, 1000), True, 'FF')                                                |
|          | 20.8±0.4ms           | 20.8±0.1ms          | 1.00    | load.LoadAndRealise.time_load((2, 2, 1000), True, 'NetCDF')                                            |
|          | 1.52±0.02s           | 1.51±0.01s          | 0.99    | load.LoadAndRealise.time_load((2, 2, 1000), True, 'PP')                                                |
|          | 4.02±0.06ms          | 3.92±0.03ms         | 0.98    | load.LoadAndRealise.time_load((50, 50, 2), False, 'FF')                                                |
|          | 20.5±0.3ms           | 20.1±0.1ms          | 0.98    | load.LoadAndRealise.time_load((50, 50, 2), False, 'NetCDF')                                            |
|          | 4.27±0.08ms          | 4.18±0.05ms         | 0.98    | load.LoadAndRealise.time_load((50, 50, 2), False, 'PP')                                                |
|          | 3.91±0.02ms          | 3.90±0.03ms         | 1.00    | load.LoadAndRealise.time_load((50, 50, 2), True, 'FF')                                                 |
|          | 20.3±0.3ms           | 20.1±0.2ms          | 0.99    | load.LoadAndRealise.time_load((50, 50, 2), True, 'NetCDF')                                             |
|          | 4.25±0.06ms          | 4.18±0.03ms         | 0.98    | load.LoadAndRealise.time_load((50, 50, 2), True, 'PP')                                                 |
|          | 32.7±4ms             | 32.4±2ms            | 0.99    | load.LoadAndRealise.time_realise((1280, 960, 5), False, 'FF')                                          |
|          | 20.8±0.7ms           | 20.6±0.5ms          | 0.99    | load.LoadAndRealise.time_realise((1280, 960, 5), False, 'NetCDF')                                      |
|          | 14.3±2ms             | 14.2±2ms            | 0.99    | load.LoadAndRealise.time_realise((1280, 960, 5), False, 'PP')                                          |
|          | 26.7±2ms             | 26.0±1ms            | 0.97    | load.LoadAndRealise.time_realise((1280, 960, 5), True, 'FF')                                           |
|          | 71.7±2ms             | 70.9±2ms            | 0.99    | load.LoadAndRealise.time_realise((1280, 960, 5), True, 'NetCDF')                                       |
|          | 26.0±1ms             | 25.9±2ms            | 1.00    | load.LoadAndRealise.time_realise((1280, 960, 5), True, 'PP')                                           |
|          | 449±1ms              | 449±3ms             | 1.00    | load.LoadAndRealise.time_realise((2, 2, 1000), False, 'FF')                                            |
|          | 3.10±0.2ms           | 3.17±0.1ms          | 1.02    | load.LoadAndRealise.time_realise((2, 2, 1000), False, 'NetCDF')                                        |
|          | 458±5ms              | 458±4ms             | 1.00    | load.LoadAndRealise.time_realise((2, 2, 1000), False, 'PP')                                            |
|          | 460±5ms              | 458±3ms             | 1.00    | load.LoadAndRealise.time_realise((2, 2, 1000), True, 'FF')                                             |
|          | 3.24±0.1ms           | 3.12±0.1ms          | 0.96    | load.LoadAndRealise.time_realise((2, 2, 1000), True, 'NetCDF')                                         |
|          | 464±8ms              | 460±3ms             | 0.99    | load.LoadAndRealise.time_realise((2, 2, 1000), True, 'PP')                                             |
|          | 1.53±0.07ms          | 1.56±0.1ms          | 1.02    | load.LoadAndRealise.time_realise((50, 50, 2), False, 'FF')                                             |
|          | 3.07±0.09ms          | 3.05±0.09ms         | 0.99    | load.LoadAndRealise.time_realise((50, 50, 2), False, 'NetCDF')                                         |
|          | 1.65±0.07ms          | 1.56±0.09ms         | 0.95    | load.LoadAndRealise.time_realise((50, 50, 2), False, 'PP')                                             |
|          | 1.58±0.2ms           | 1.56±0.06ms         | 0.99    | load.LoadAndRealise.time_realise((50, 50, 2), True, 'FF')                                              |
|          | 3.18±0.1ms           | 3.11±0.1ms          | 0.98    | load.LoadAndRealise.time_realise((50, 50, 2), True, 'NetCDF')                                          |
|          | 1.60±0.08ms          | 1.62±0.1ms          | 1.01    | load.LoadAndRealise.time_realise((50, 50, 2), True, 'PP')                                              |
|          | 356±2ms              | 356±3ms             | 1.00    | load.ManyVars.time_many_var_load                                                                       |
|          | 8.43±0.1ms           | 8.18±0.04ms         | 0.97    | load.STASHConstraint.time_stash_constraint((1280, 960, 5), 'FF')                                       |
|          | 9.06±0.05ms          | 9.05±0.05ms         | 1.00    | load.STASHConstraint.time_stash_constraint((1280, 960, 5), 'PP')                                       |
|          | 1.39±0.01s           | 1.36±0.01s          | 0.98    | load.STASHConstraint.time_stash_constraint((2, 2, 1000), 'FF')                                         |
|          | 1.55±0.01s           | 1.55±0.01s          | 1.00    | load.STASHConstraint.time_stash_constraint((2, 2, 1000), 'PP')                                         |
|          | 3.99±0.01ms          | 3.98±0.02ms         | 1.00    | load.STASHConstraint.time_stash_constraint((2, 2, 2), 'FF')                                            |
|          | 4.30±0.02ms          | 4.27±0.03ms         | 0.99    | load.STASHConstraint.time_stash_constraint((2, 2, 2), 'PP')                                            |
|          | 8.11±0.08ms          | 8.11±0.05ms         | 1.00    | load.StructuredFF.time_structured_load((1280, 960, 5), False)                                          |
|          | 4.79±0.02ms          | 4.78±0.03ms         | 1.00    | load.StructuredFF.time_structured_load((1280, 960, 5), True)                                           |
|          | 1.36±0.01s           | 1.35±0.02s          | 1.00    | load.StructuredFF.time_structured_load((2, 2, 1000), False)                                            |
|          | 374±5ms              | 376±6ms             | 1.01    | load.StructuredFF.time_structured_load((2, 2, 1000), True)                                             |
|          | 3.93±0.04ms          | 3.89±0.02ms         | 0.99    | load.StructuredFF.time_structured_load((2, 2, 2), False)                                               |
|          | 3.59±0.05ms          | 3.54±0.01ms         | 0.99    | load.StructuredFF.time_structured_load((2, 2, 2), True)                                                |
|          | 146±0.9ms            | 146±2ms             | 1.00    | load.TimeConstraint.time_time_constraint(20, 'FF')                                                     |
|          | 23.2±0.3ms           | 23.1±0.3ms          | 1.00    | load.TimeConstraint.time_time_constraint(20, 'NetCDF')                                                 |
|          | 162±0.9ms            | 161±1ms             | 1.00    | load.TimeConstraint.time_time_constraint(20, 'PP')                                                     |
|          | 29.2±0.4ms           | 29.0±0.7ms          | 0.99    | load.TimeConstraint.time_time_constraint(3, 'FF')                                                      |
|          | 23.0±0.5ms           | 23.1±0.3ms          | 1.00    | load.TimeConstraint.time_time_constraint(3, 'NetCDF')                                                  |
|          | 31.5±0.4ms           | 31.3±0.6ms          | 0.99    | load.TimeConstraint.time_time_constraint(3, 'PP')                                                      |
|          | 17.5±0.3ms           | 18.0±0.7ms          | 1.03    | load.ugrid.BasicLoading.time_load_file(1)                                                              |
|          | 41.4±0.6ms           | 42.0±0.7ms          | 1.02    | load.ugrid.BasicLoading.time_load_file(200000)                                                         |
|          | 13.9±0.2ms           | 14.1±0.4ms          | 1.01    | load.ugrid.BasicLoading.time_load_mesh(1)                                                              |
|          | 23.5±0.6ms           | 22.5±0.4ms          | 0.96    | load.ugrid.BasicLoading.time_load_mesh(200000)                                                         |
|          | 17.7±0.6ms           | 17.5±0.4ms          | 0.99    | load.ugrid.BasicLoadingTime.time_load_file(1)                                                          |
|          | 21.3±0.7ms           | 20.9±0.4ms          | 0.98    | load.ugrid.BasicLoadingTime.time_load_file(200000)                                                     |
|          | 14.4±0.1ms           | 14.3±0.5ms          | 1.00    | load.ugrid.BasicLoadingTime.time_load_mesh(1)                                                          |
|          | 17.7±0.4ms           | 17.0±0.5ms          | 0.96    | load.ugrid.BasicLoadingTime.time_load_mesh(200000)                                                     |
|          | 18.8±0.4ms           | 18.6±0.5ms          | 0.99    | load.ugrid.Callback.time_load_file_callback(1)                                                         |
|          | 51.4±0.5ms           | 51.9±0.7ms          | 1.01    | load.ugrid.Callback.time_load_file_callback(200000)                                                    |
|          | 18.8±0.4ms           | 18.7±0.7ms          | 1.00    | load.ugrid.CallbackTime.time_load_file_callback(1)                                                     |
|          | 22.8±0.5ms           | 23.0±0.6ms          | 1.01    | load.ugrid.CallbackTime.time_load_file_callback(200000)                                                |
|          | 3.14±0.2ms           | 3.04±0.2ms          | 0.97    | load.ugrid.DataRealisation.time_realise_data(10000)                                                    |
|          | 4.30±0.8ms           | 5.19±0.9ms          | ~1.20   | load.ugrid.DataRealisation.time_realise_data(200000)                                                   |
|          | 40.8±2ms             | 39.7±1ms            | 0.97    | load.ugrid.DataRealisationTime.time_realise_data(10000)                                                |
|          | 831±10ms             | 822±10ms            | 0.99    | load.ugrid.DataRealisationTime.time_realise_data(200000)                                               |
|          | 49.6±2ms             | 49.7±1ms            | 1.00    | merge_concat.Merge.time_merge                                                                          |
|          | 10.9                 | 10.9                | 1.00    | merge_concat.Merge.track_mem_merge                                                                     |
|          | 6.69±0.1ms           | 6.60±0.03ms         | 0.99    | plot.AuxSort.time_aux_sort                                                                             |
|          | 80.2±4ms             | 80.5±2ms            | 1.00    | regridding.CurvilinearRegridding.time_regrid_pic                                                       |
|          | 144.8                | 144.8               | 1.00    | regridding.CurvilinearRegridding.track_mem_regrid_pic                                                  |
|          | 99.7±1ms             | 100±1ms             | 1.01    | regridding.HorizontalChunkedRegridding.time_regrid_area_w                                              |
|          | 51.5±2ms             | 50.8±2ms            | 0.99    | regridding.HorizontalChunkedRegridding.time_regrid_area_w_new_grid                                     |
|          | 111.5                | 111.5               | 1.00    | regridding.HorizontalChunkedRegridding.track_mem_regrid_area_w                                         |
|          | 150.6                | 150.6               | 1.00    | regridding.HorizontalChunkedRegridding.track_mem_regrid_area_w_new_grid                                |
|          | 4.09±0.05ms          | 4.08±0.05ms         | 1.00    | save.NetcdfSave.time_netcdf_save_cube(50, False)                                                       |
|          | 73.9±0.9ms           | 71.9±0.5ms          | 0.97    | save.NetcdfSave.time_netcdf_save_cube(50, True)                                                        |
|          | 53.0±0.9ms           | 51.9±0.8ms          | 0.98    | save.NetcdfSave.time_netcdf_save_cube(600, False)                                                      |
|          | 581±4ms              | 571±4ms             | 0.98    | save.NetcdfSave.time_netcdf_save_cube(600, True)                                                       |
|          | 90.0±0.7ns           | 89.2±2ns            | 0.99    | save.NetcdfSave.time_netcdf_save_mesh(50, False)                                                       |
|          | 57.4±0.5ms           | 56.2±0.8ms          | 0.98    | save.NetcdfSave.time_netcdf_save_mesh(50, True)                                                        |
|          | 90.2±1ns             | 90.0±1ns            | 1.00    | save.NetcdfSave.time_netcdf_save_mesh(600, False)                                                      |
|          | 509±4ms              | 505±4ms             | 0.99    | save.NetcdfSave.time_netcdf_save_mesh(600, True)                                                       |
|          | 0.3                  | 0.3                 | 1.00    | save.NetcdfSave.track_addedmem_netcdf_save(50, False)                                                  |
|          | 0.3                  | 0.3                 | 1.00    | save.NetcdfSave.track_addedmem_netcdf_save(600, False)                                                 |
|          | 42.7±1ms             | 43.1±0.8ms          | 1.01    | stats.PearsonR.time_lazy                                                                               |
|          | 19.4±0.3ms           | 19.0±0.2ms          | 0.98    | stats.PearsonR.time_real                                                                               |
|          | 19.5                 | 19.5                | 1.00    | stats.PearsonR.track_lazy                                                                              |
|          | 17.8                 | 17.8                | 1.00    | stats.PearsonR.track_real                                                                              |
|          | 24.6±1ms             | 23.7±0.9ms          | 0.96    | trajectory.TrajectoryInterpolation.time_trajectory_linear                                              |
|          | 58.7±0.7ms           | 58.6±0.7ms          | 1.00    | trajectory.TrajectoryInterpolation.time_trajectory_nearest                                             |
|          | 32.1                 | 32.1                | 1.00    | trajectory.TrajectoryInterpolation.track_trajectory_linear                                             |
|          | 21.6                 | 21.6                | 1.00    | trajectory.TrajectoryInterpolation.track_trajectory_nearest                                            |

Benchmarks that have got worse:

| Change   |   Before [788b6f99]  |   After [085685e7]  |   Ratio | Benchmark (Parameter)                                 |
|----------|----------------------|---------------------|---------|-------------------------------------------------------|
| +        |                165.2 |               231.1 |     1.4 | save.NetcdfSave.track_addedmem_netcdf_save(600, True) |

Generated by GHA run 9662454440

trexfeathers
trexfeathers approved these changes Jun 25, 2024
View reviewed changes
Copy link
Contributor

@trexfeathers trexfeathers left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very nice, thanks @bouweandela 👍

Regarding the benchmarking: we are aware of inconsistencies in our memory benchmarks so not worrying about that (#5967)

lib/iris/tests/integration/concatenate/test_concatenate.py Show resolved Hide resolved
@trexfeathers trexfeathers enabled auto-merge (squash) June 25, 2024 20:32
@trexfeathers trexfeathers merged commit 1c063f3 into SciTools:main Jun 25, 2024
21 checks passed
@github-actions github-actions bot mentioned this pull request Jun 26, 2024
Closed
@bouweandela bouweandela deleted the lazy-concatenate-cm-av branch June 26, 2024 07:30
tkknight added a commit to tkknight/iris that referenced this pull request Jul 18, 2024
@tkknight
Merge remote-tracking branch 'upstream/main' into autoapi
d6df9a2 
* upstream/main:
  Quieter datum warning (SciTools#6050)
  Allow MeshCoord to have a coord-system (SciTools#6016)
  Bump scitools/workflows from 2024.07.1 to 2024.07.2 (SciTools#6053)
  Faster concatenation of cubes with `AuxCoordFactory`s (SciTools#6038)
  Shorten cube iterator tests (SciTools#6041)
  Bump scitools/workflows from 2024.07.0 to 2024.07.1 (SciTools#6045)
  Bump scitools/workflows from 2024.06.5 to 2024.07.0 (SciTools#6034)
  Update test_Saver__ugrid.py (SciTools#6017)
  NEP29 and NumPy v2 pins (SciTools#6039)
  Adapt setup.py for pypa/setuptools@2db55275f. (SciTools#6036)
  Replace DelegatedConda with Delegated (SciTools#5963)
  Enable type hint checking (SciTools#5956)
  Bump scitools/workflows from 2024.06.4 to 2024.06.5 (SciTools#6026)
  Do not realize cell measures and ancillary variables in concatenate (SciTools#6010)
  [pre-commit.ci] pre-commit autoupdate (SciTools#6022)
  Bump scitools/workflows from 2024.06.3 to 2024.06.4 (SciTools#6018)
@bouweandela bouweandela mentioned this pull request Sep 12, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@trexfeathers trexfeathers trexfeathers approved these changes

Assignees
No one assigned
Labels
benchmark_this Request that this pull request be benchmarked to check if it introduces performance shifts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@bouweandela @trexfeathers