Skip to content

Commit 98bdbe8

Browse files
authored
Merge branch 'master' into ci
2 parents 8bbf404 + 206840e commit 98bdbe8

6 files changed

Lines changed: 57 additions & 13 deletions

File tree

.github/workflows/CI.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,24 @@
11
name: CI
2+
23
on:
34
pull_request:
5+
paths:
6+
- '.github/workflows/CI.yml'
7+
- 'ext/**'
8+
- 'src/**'
9+
- 'test/**'
10+
- 'Project.toml'
411
push:
512
branches:
613
- master
714
tags: '*'
15+
paths:
16+
- '.github/workflows/CI.yml'
17+
- 'ext/**'
18+
- 'src/**'
19+
- 'test/**'
20+
- 'Project.toml'
21+
822
jobs:
923
test:
1024
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ github.event_name }}
@@ -26,7 +40,7 @@ jobs:
2640
- os: macos-latest # Apple Silicon
2741
version: '1'
2842
steps:
29-
- uses: actions/checkout@v4
43+
- uses: actions/checkout@v6
3044
- uses: julia-actions/setup-julia@v2
3145
with:
3246
version: ${{ matrix.version }}

.github/workflows/Documenter.yml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,20 @@
11
name: Documenter
2+
23
on:
34
push:
45
branches: [master]
56
tags: [v*]
7+
paths:
8+
- '.github/workflows/Documenter.yml'
9+
- 'docs/**'
10+
- 'src/**'
11+
- 'Project.toml'
612
pull_request:
13+
paths:
14+
- '.github/workflows/Documenter.yml'
15+
- 'docs/**'
16+
- 'src/**'
17+
- 'Project.toml'
718

819
concurrency:
920
# Skip intermediate builds: always.
@@ -22,7 +33,7 @@ jobs:
2233
# needed to allow the workflow to create a status with a link to the docs preview
2334
statuses: write
2435
steps:
25-
- uses: actions/checkout@v4
36+
- uses: actions/checkout@v6
2637
- uses: julia-actions/setup-julia@v2
2738
with:
2839
version: '1'
@@ -31,9 +42,8 @@ jobs:
3142
shell: julia --project=docs --color=yes {0}
3243
run: |
3344
using Pkg
34-
Pkg.develop(PackageSpec(path=pwd()))
3545
Pkg.instantiate()
3646
- uses: julia-actions/julia-buildpkg@v1
37-
- run: julia --project=docs docs/make.jl
47+
- run: julia --project=docs --color=yes docs/make.jl
3848
env:
3949
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/IntegrationTest.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,20 @@ name: IntegrationTest
22

33
on:
44
pull_request:
5+
paths:
6+
- '.github/workflows/IntegrationTest.yml'
7+
- 'ext/**'
8+
- 'src/**'
9+
- 'Project.toml'
510
push:
611
branches:
712
- master
813
tags: '*'
14+
paths:
15+
- '.github/workflows/IntegrationTest.yml'
16+
- 'ext/**'
17+
- 'src/**'
18+
- 'Project.toml'
919

1020
jobs:
1121
test:
@@ -20,19 +30,20 @@ jobs:
2030
- {user: JuliaMath, repo: FFTW.jl}
2131
- {user: JuliaApproximation, repo: FastTransforms.jl}
2232
steps:
23-
- uses: actions/checkout@v4
33+
- uses: actions/checkout@v6
2434
- uses: julia-actions/setup-julia@v2
2535
with:
2636
version: ${{ matrix.julia-version }}
2737
arch: x64
38+
- uses: julia-actions/cache@v2
2839
- uses: julia-actions/julia-buildpkg@v1
2940
- name: Clone Downstream
30-
uses: actions/checkout@v4
41+
uses: actions/checkout@v6
3142
with:
3243
repository: ${{ matrix.package.user }}/${{ matrix.package.repo }}
3344
path: downstream
3445
- name: Load this and run the downstream tests
35-
shell: julia --project=downstream {0}
46+
shell: julia --color=yes --project=downstream {0}
3647
run: |
3748
using Pkg
3849
try

.github/workflows/Invalidations.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ name: Invalidations
22

33
on:
44
pull_request:
5+
paths:
6+
- '.github/workflows/Invalidations.yml'
7+
- 'ext/**'
8+
- 'src/**'
9+
- 'Project.toml'
510

611
concurrency:
712
# Skip intermediate builds: always.
@@ -19,12 +24,13 @@ jobs:
1924
- uses: julia-actions/setup-julia@v2
2025
with:
2126
version: '1'
22-
- uses: actions/checkout@v4
27+
- uses: julia-actions/cache@v2
28+
- uses: actions/checkout@v6
2329
- uses: julia-actions/julia-buildpkg@v1
2430
- uses: julia-actions/julia-invalidations@v1
2531
id: invs_pr
2632

27-
- uses: actions/checkout@v4
33+
- uses: actions/checkout@v6
2834
with:
2935
ref: ${{ github.event.repository.default_branch }}
3036
- uses: julia-actions/julia-buildpkg@v1

docs/Project.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,8 @@
22
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
33
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
44

5+
[sources]
6+
AbstractFFTs = { path = ".." }
7+
58
[compat]
6-
Documenter = "~0.25"
9+
Documenter = "^1"

src/definitions.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -649,6 +649,9 @@ struct AdjointPlan{T,P<:Plan} <: Plan{T}
649649
AdjointPlan{T,P}(p) where {T,P} = new(p)
650650
end
651651

652+
# We eagerly form the plan inverse in the adjoint(p) call, which will be cached for subsequent calls.
653+
# This is reasonable, as inv(p) would do the same, and necessary in order to compute the correct input
654+
# type for the adjoint plan and encode it in its type.
652655
"""
653656
(p::Plan)'
654657
adjoint(p::Plan)
@@ -659,9 +662,6 @@ Return a plan that performs the adjoint operation of the original plan.
659662
Adjoint plans do not currently support `LinearAlgebra.mul!`. Further, as a new addition to `AbstractFFTs`,
660663
coverage of `Base.adjoint` in downstream implementations may be limited.
661664
"""
662-
# We eagerly form the plan inverse in the adjoint(p) call, which will be cached for subsequent calls.
663-
# This is reasonable, as inv(p) would do the same, and necessary in order to compute the correct input
664-
# type for the adjoint plan and encode it in its type.
665665
Base.adjoint(p::Plan{T}) where {T} = AdjointPlan{eltype(inv(p)), typeof(p)}(p)
666666
Base.adjoint(p::AdjointPlan) = p.p
667667
# always have AdjointPlan inside ScaledPlan.

0 commit comments

Comments
 (0)