Skip to content

Commit c3ddd47

Browse files
committed
Merge remote-tracking branch 'origin/main' into dkz/feature-grad-acoustic
2 parents db72486 + f80e322 commit c3ddd47

7 files changed

Lines changed: 11 additions & 19 deletions

File tree

.github/workflows/Benchmarks.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ env:
2222
# Don't make Reactant occupy all the GPU memory
2323
XLA_REACTANT_GPU_PREALLOCATE: 'false'
2424
JULIA_PKG_SERVER_REGISTRY_PREFERENCE: 'eager'
25-
JULIA_PKG_SERVER: ''
2625

2726
jobs:
2827
run-benchmarks:

.github/workflows/CI.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ env:
2929
# Don't make Reactant occupy all the GPU memory
3030
XLA_REACTANT_GPU_PREALLOCATE: 'false'
3131
JULIA_PKG_SERVER_REGISTRY_PREFERENCE: 'eager'
32-
JULIA_PKG_SERVER: ''
3332

3433
jobs:
3534
test:
@@ -57,12 +56,12 @@ jobs:
5756
- version: "min"
5857
os: windows-latest
5958
include:
59+
# `--check-bounds=auto` is necessary for testing Reactant workloads
60+
# until https://github.com/EnzymeAD/Reactant.jl/issues/2347 is fixed.
6061
- version: "1.12.5"
6162
os: aws-linux-nvidia-gpu-l4
6263
arch: "default"
63-
check-bounds: "yes"
64-
# Necessary for testing Reactant workloads until
65-
# https://github.com/EnzymeAD/Reactant.jl/issues/2347 is fixed.
64+
check-bounds: "auto"
6665
- version: "1.11.9"
6766
os: aws-linux-nvidia-gpu-l4-4xl
6867
arch: "default"
@@ -85,7 +84,7 @@ jobs:
8584
# caches pkgimages and such, so we don't need to cache here most things. Only
8685
# useful thing is the scratchspaces, in particular ParallelTestRunner's to make
8786
# scheduling of test jobs more efficients.
88-
cache-artifacts: false
87+
cache-artifacts: ${{ ! startsWith(matrix.os, 'aws-linux-nvidia-gpu-') }}
8988
cache-packages: ${{ ! startsWith(matrix.os, 'aws-linux-nvidia-gpu-') }}
9089
cache-registries: ${{ ! startsWith(matrix.os, 'aws-linux-nvidia-gpu-') }}
9190
cache-compiled: ${{ ! startsWith(matrix.os, 'aws-linux-nvidia-gpu-') }}

.github/workflows/Documentation.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ env:
2626
# Don't make Reactant occupy all the GPU memory
2727
XLA_REACTANT_GPU_PREALLOCATE: 'false'
2828
JULIA_PKG_SERVER_REGISTRY_PREFERENCE: 'eager'
29-
JULIA_PKG_SERVER: ''
3029

3130
jobs:
3231
build-docs:
@@ -99,8 +98,6 @@ jobs:
9998
with:
10099
version: "1.12.5"
101100
- uses: julia-actions/cache@v3
102-
with:
103-
cache-registries: false
104101
- uses: actions/download-artifact@v8
105102
with:
106103
name: documentation-build

.github/workflows/Validation.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ concurrency:
2424

2525
env:
2626
JULIA_PKG_SERVER_REGISTRY_PREFERENCE: 'eager'
27-
JULIA_PKG_SERVER: ''
2827

2928
# needed to allow julia-actions/cache to delete old caches that it has created
3029
permissions:
@@ -49,8 +48,6 @@ jobs:
4948
with:
5049
version: ${{ matrix.version }}
5150
- uses: julia-actions/cache@v3
52-
with:
53-
cache-registries: false
5451
- name: Instantiate examples environment
5552
shell: julia --color=yes --project=examples {0}
5653
run: |

test/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ NCDatasets = "0.14"
3939
Oceananigans = "0.105.1, 0.106"
4040
ParallelTestRunner = "2.0.1"
4141
RRTMGP = "0.21"
42-
Reactant = "0.2.210"
42+
Reactant = "0.2.238"
4343
SpecialFunctions = "2"
4444
Statistics = "<0.0.1, 1"
4545
Test = "<0.0.1, 1"

test/quality_assurance.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ using ClimaComms: ClimaComms
99
using Dates: Dates
1010
using RRTMGP: RRTMGP
1111
using SpecialFunctions: SpecialFunctions
12-
if VERSION < v"1.12"
13-
using Reactant: Reactant
12+
using Reactant: Reactant
1413

14+
allow_unanalyzable = if VERSION < v"1.12"
1515
# For some reason `BreezeReactantExt` is non-analyzable,
1616
# but only in Julia v1.11-.
1717
BreezeReactantExt = isdefined(Base, :get_extension) ? Base.get_extension(Breeze, :BreezeReactantExt) : Breeze.BreezeReactantExt
18-
allow_unanalyzable = (BreezeReactantExt,)
18+
(BreezeReactantExt,)
1919
else
20-
allow_unanalyzable = ()
20+
()
2121
end
2222

2323
@testset "Aqua" begin

test/runtests.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ testsuite = find_tests(@__DIR__)
88
# Parse arguments
99
args = parse_args(ARGS)
1010

11-
const REACTANT_COMPAT = !((VERSION >= v"1.12") || (Base.JLOptions().check_bounds == 1))
11+
const REACTANT_COMPAT = VERSION < v"1.13-" && Base.JLOptions().check_bounds != 1
1212

1313
if filter_tests!(testsuite, args)
1414
# Reactant compilation tests require --check-bounds=auto (Reactant/Enzyme
15-
# limitation) and Julia < 1.12 until upstream support is improved.
15+
# limitation).
1616
if !REACTANT_COMPAT
1717
delete!(testsuite, "reactant_centered_compilation")
1818
delete!(testsuite, "reactant_weno_compilation")

0 commit comments

Comments
 (0)