Skip to content

Commit 41b9d65

Browse files
authored
Merge branch 'CliMA:main' into main
2 parents b59ee35 + 852f253 commit 41b9d65

File tree

7 files changed

+29
-15
lines changed

7 files changed

+29
-15
lines changed

.buildkite/pipeline.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -920,12 +920,10 @@ steps:
920920
- label: "Unit: matrix field broadcasting (CPU)"
921921
key: unit_matrix_field_broadcasting_cpu_scalar_14
922922
command: "julia --color=yes --check-bounds=yes --project=.buildkite test/MatrixFields/matrix_fields_broadcasting/test_scalar_14.jl"
923-
soft_fail: true
924923

925924
- label: "Unit: matrix field broadcasting (CPU)"
926925
key: unit_matrix_field_broadcasting_cpu_scalar_15
927926
command: "julia --color=yes --check-bounds=yes --project=.buildkite test/MatrixFields/matrix_fields_broadcasting/test_scalar_15.jl"
928-
soft_fail: true
929927

930928
- label: "Unit: matrix field broadcasting (CPU)"
931929
key: unit_matrix_field_broadcasting_cpu_scalar_16
@@ -1068,7 +1066,6 @@ steps:
10681066
- label: "Unit: matrix field broadcasting (GPU)"
10691067
key: unit_matrix_field_broadcasting_gpu_scalar_13
10701068
command: "julia --color=yes --check-bounds=yes --project=.buildkite test/MatrixFields/matrix_fields_broadcasting/test_scalar_13.jl"
1071-
soft_fail: true # due to PTX error
10721069
env:
10731070
CLIMACOMMS_DEVICE: "CUDA"
10741071
agents:
@@ -1129,7 +1126,6 @@ steps:
11291126
command: "julia --color=yes --check-bounds=yes --project=.buildkite test/MatrixFields/matrix_fields_broadcasting/test_non_scalar_3.jl"
11301127
env:
11311128
CLIMACOMMS_DEVICE: "CUDA"
1132-
soft_fail: true
11331129
agents:
11341130
slurm_gpus: 1
11351131
slurm_mem: 10GB

NEWS.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,21 @@ ClimaCore.jl Release Notes
44
main
55
-------
66

7+
- Latitude and longitudes were flipped in the default target coordiantes
8+
in the remapper, leading to non-sense values.
9+
10+
v0.14.33
11+
-------
12+
13+
- Expanded compat for Krylov to `0.10`. [2318](https://github.com/CliMA/ClimaCore.jl/pull/2318).
14+
15+
v0.14.32
16+
-------
17+
18+
- Disabled shared memory on finite difference operators. It was found that it
19+
has a severe performance penalty for more complex cases.
20+
[2317](https://github.com/CliMA/ClimaCore.jl/pull/2317)
21+
722
- Fixed missing method for `Topologies.mesh(Topology2D)`
823
[2288](https://github.com/CliMA/ClimaCore.jl/pull/2288).
924

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "ClimaCore"
22
uuid = "d414da3d-4745-48bb-8d80-42e94e092884"
33
authors = ["CliMA Contributors <clima-software@caltech.edu>"]
4-
version = "0.14.31"
4+
version = "0.14.33"
55

66
[deps]
77
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
@@ -59,7 +59,7 @@ HDF5 = "0.16.16, 0.17"
5959
InteractiveUtils = "1"
6060
IntervalSets = "0.5, 0.6, 0.7"
6161
JET = "0.9"
62-
Krylov = "0.9"
62+
Krylov = "0.9, 0.10"
6363
KrylovKit = "0.6, 0.7, 0.8"
6464
LazyBroadcast = "1"
6565
LinearAlgebra = "1"

src/Operators/finitedifference.jl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4177,12 +4177,15 @@ end
41774177
"""
41784178
use_fd_shmem()
41794179
4180-
Allows users to, from global scope, disable finite
4180+
Allows users to, from global scope, enable finite
41814181
difference shmem for operators that support it.
4182+
TODO: ~30% slowdown was noticed with CC 0.14.31
4183+
in Aquaplanet benchmarks. This may need attention in
4184+
future releases
41824185
41834186
## Usage
41844187
```julia
41854188
Operators.use_fd_shmem() = false
41864189
```
41874190
"""
4188-
use_fd_shmem() = true
4191+
use_fd_shmem() = false

src/Remapping/distributed_remapping.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,7 @@ function interpolate!(
910910

911911
found_type = nameof(typeof(dest))
912912

913-
dest isa expected_array_type ||
913+
parent(dest) isa expected_array_type ||
914914
error("dest is a $found_type, expected $expected_array_type")
915915
end
916916
index_field_begin, index_field_end =

src/Remapping/remapping_utils.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@ function default_target_hcoords_as_vectors(
175175
topology = Spaces.topology(space)
176176
domain = Meshes.domain(topology.mesh)
177177
if domain isa Domains.SphereDomain
178-
return FT.(range(-180.0, 180.0, hresolution)),
179-
FT.(range(-90.0, 90.0, hresolution))
178+
return FT.(range(-90.0, 90.0, hresolution)),
179+
FT.(range(-180.0, 180.0, hresolution))
180180
else
181181
x1min = Geometry.component(domain.interval1.coord_min, 1)
182182
x2min = Geometry.component(domain.interval2.coord_min, 1)

test/Remapping/distributed_remapping.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -813,14 +813,14 @@ end
813813
)
814814

815815
@test Remapping.default_target_hcoords(hv_center_space) == [
816-
Geometry.LatLongPoint(x, y) for x in range(-180.0, 180.0, length = 180),
817-
y in range(-90.0, 90.0, length = 180)
816+
Geometry.LatLongPoint(x, y) for x in range(-90.0, 90.0, length = 180),
817+
y in range(-180.0, 180.0, length = 180)
818818
]
819819

820820
# Purely horizontal 2D space sphere
821821
@test Remapping.default_target_hcoords(horzspace) == [
822-
Geometry.LatLongPoint(x, y) for x in range(-180.0, 180.0, length = 180),
823-
y in range(-90.0, 90.0, length = 180)
822+
Geometry.LatLongPoint(x, y) for x in range(-90.0, 90.0, length = 180),
823+
y in range(-180.0, 180.0, length = 180)
824824
]
825825

826826
# Purely vertical spaces

0 commit comments

Comments
 (0)