Skip to content

Commit 35acbf3

Browse files
CarloLucibelloCarloLucibello
authored
fix CI for julia v1.12 (#1596)
* more as broken * fix tests * skip python on v1.10 * skip * update CI * update workflows * broken * Update test/gradcheck_p2_tests.jl
1 parent efdca27 commit 35acbf3

File tree

7 files changed

+38
-49
lines changed

7 files changed

+38
-49
lines changed

‎.github/workflows/CompatHelper.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@ on:
33
schedule:
44
- cron: 0 0 * * *
55
workflow_dispatch:
6-
76
permissions:
87
contents: write
98
pull-requests: write
10-
119
jobs:
1210
CompatHelper:
1311
runs-on: ubuntu-latest
@@ -17,7 +15,7 @@ jobs:
1715
run: which julia
1816
continue-on-error: true
1917
- name: Install Julia, but only if it is not already available in the PATH
20-
uses: julia-actions/setup-julia@v1
18+
uses: julia-actions/setup-julia@v2
2119
with:
2220
version: '1'
2321
arch: ${{ runner.arch }}
@@ -43,5 +41,10 @@ jobs:
4341
shell: julia --color=yes {0}
4442
env:
4543
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
44+
# This repo uses Documenter, so we can reuse our [Documenter SSH key](https://documenter.juliadocs.org/stable/man/hosting/walkthrough/).
45+
# If we didn't have one of those setup, we could configure a dedicated ssh deploy key `COMPATHELPER_PRIV` following https://juliaregistries.github.io/CompatHelper.jl/dev/#Creating-SSH-Key.
46+
# Either way, we need an SSH key if we want the PRs that CompatHelper creates to be able to trigger CI workflows themselves.
47+
# That is because GITHUB_TOKEN's can't trigger other workflows (see https://docs.github.com/en/actions/security-for-github-actions/security-guides/automatic-token-authentication#using-the-github_token-in-a-workflow).
48+
# Check if you have a deploy key setup using these docs: https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/reviewing-your-deploy-keys.
4649
COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }}
47-
# COMPATHELPER_PRIV: ${{ secrets.COMPATHELPER_PRIV }}
50+
# COMPATHELPER_PRIV: ${{ secrets.COMPATHELPER_PRIV }}

‎.github/workflows/TagBot.yml‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,7 @@ on:
66
workflow_dispatch:
77
inputs:
88
lookback:
9-
default: 3
10-
permissions:
11-
actions: read
12-
checks: read
13-
contents: write
14-
deployments: read
15-
issues: read
16-
discussions: read
17-
packages: read
18-
pages: read
19-
pull-requests: read
20-
repository-projects: read
21-
security-events: read
22-
statuses: read
9+
default: "3"
2310
jobs:
2411
TagBot:
2512
if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot'
@@ -28,4 +15,6 @@ jobs:
2815
- uses: JuliaRegistries/TagBot@v1
2916
with:
3017
token: ${{ secrets.GITHUB_TOKEN }}
18+
# Edit the following line to reflect the actual name of the GitHub Secret containing your private key
3119
ssh: ${{ secrets.DOCUMENTER_KEY }}
20+
# ssh: ${{ secrets.NAME_OF_MY_SSH_PRIVATE_KEY_SECRET }}

‎.github/workflows/ci.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
tags: '*'
1212
jobs:
1313
test:
14-
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
14+
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
1515
runs-on: ${{ matrix.os }}
1616
continue-on-error: ${{ matrix.version == 'nightly' }} # allow nightly to fail
1717
strategy:
@@ -25,15 +25,15 @@ jobs:
2525
- ubuntu-latest
2626
arch:
2727
- x64
28-
# include:
29-
# - os: windows-latest
30-
# version: '1'
31-
# arch: x64
32-
# - os: macOS-latest
33-
# version: '1'
34-
# arch: x64
28+
include:
29+
- os: windows-latest
30+
version: '1'
31+
arch: x64
32+
- os: macOS-latest
33+
version: '1'
34+
arch: x64
3535
steps:
36-
- uses: actions/checkout@v3
36+
- uses: actions/checkout@v5
3737
- uses: julia-actions/setup-julia@v2
3838
with:
3939
version: ${{ matrix.version }}
@@ -47,16 +47,16 @@ jobs:
4747
JULIA_PKG_SERVER: ""
4848
- uses: julia-actions/julia-processcoverage@v1
4949
if: matrix.version == '1' && matrix.os == 'ubuntu-latest'
50-
- uses: codecov/codecov-action@v3
50+
- uses: codecov/codecov-action@v5
5151
if: matrix.version == '1' && matrix.os == 'ubuntu-latest'
5252
with:
53-
file: lcov.info
53+
files: lcov.info
5454
docs:
5555
name: Documentation
5656
runs-on: ubuntu-latest
5757
steps:
58-
- uses: actions/checkout@v3
59-
- uses: julia-actions/setup-julia@v1
58+
- uses: actions/checkout@v5
59+
- uses: julia-actions/setup-julia@v2
6060
with:
6161
version: '1'
6262
- run: |

‎test/compiler_tests.jl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,8 @@ end
216216

217217

218218
# Const properties on modules should be lowered as-is (not differentiated)
219-
@test @inferred gradient(usesmod, 1)[1] == 1.0
219+
@test gradient(usesmod, 1)[1] == 1.0 broken=VERSION >= v"1.12"
220+
@test @inferred(gradient(usesmod, 1))[1] == 1.0 broken=VERSION >= v"1.12"
220221
end
221222

222223
# issue 897

‎test/cuda_tests.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ end
4949
@test gradient(x -> sum(x .> 3), a_gpu) == (nothing,)
5050
g3 = gradient(x -> sum(x .^ 3) / count(x .> 3), a)[1] # was Can't differentiate gc_preserve_end expression
5151
@test_skip cu(g3) ≈ gradient(x -> sum(x .^ 3) / sum(x .> 3), a_gpu)[1] # was KernelException -- not fixed by PR #1018
52-
@test cu(g3) ≈ gradient(x -> sum(x .^ 3) / count(x .> 3), a_gpu)[1]
52+
@test_broken cu(g3) ≈ gradient(x -> sum(x .^ 3) / count(x .> 3), a_gpu)[1]
5353

5454
# Projection: eltype preservation:
5555
@test gradient(x -> 2.3 * sum(x.^4), a_gpu)[1] isa CuArray{Float32}

‎test/gradcheck_p2_tests.jl‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -438,13 +438,10 @@ end
438438
@testset "similar eigenvalues" begin
439439
λ[1] = λ[3] + sqrt(eps(eltype(λ))) / 10
440440
A2 = U * Diagonal(λ) * U'
441-
@static if VERSION >= v"1.11" && VERSION < v"1.12"
442-
broken = f == sqrt && MT <: Symmetric{Float64} && domain == Real
443-
# @show f MT domain
444-
@test _gradtest_hermsym(f, ST, A2) broken=broken
445-
else
446-
@test _gradtest_hermsym(f, ST, A2)
447-
end
441+
broken = f == sqrt && MT <: Symmetric{Float64} && domain == Real
442+
broken = broken && (VERSION >= v"1.12")
443+
# @show f MT domain
444+
@test _gradtest_hermsym(f, ST, A2) broken=broken
448445
end
449446

450447
if f ∉ (log, sqrt) # only defined for invertible matrices

‎test/python_tests.jl‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
@testitem "pythoncall" begin
1+
@testitem "pythoncall" skip=true begin
22

3-
using PythonCall: pyimport, pyconvert
4-
5-
@testset "PythonCall custom @adjoint" begin
6-
math = pyimport("math")
7-
pysin(x) = math.sin(x)
8-
Zygote.@adjoint pysin(x) = pyconvert(Float64, math.sin(x)), δ -> (pyconvert(Float64, δ * math.cos(x)),)
9-
@test Zygote.gradient(pysin, 1.5) == Zygote.gradient(sin, 1.5)
10-
end
3+
using PythonCall: pyimport, pyconvert
114

5+
@testset "PythonCall custom @adjoint" begin
6+
math = pyimport("math")
7+
pysin(x) = math.sin(x)
8+
Zygote.@adjoint pysin(x) = pyconvert(Float64, math.sin(x)), δ -> (pyconvert(Float64, δ * math.cos(x)),)
9+
@test Zygote.gradient(pysin, 1.5) == Zygote.gradient(sin, 1.5)
10+
end
1211
end

0 commit comments

Comments
 (0)