Skip to content

Commit

Permalink
Merge pull request #44 from slimgroup/compat-fix
Browse files Browse the repository at this point in the history
Fix #43
  • Loading branch information
mloubout authored Mar 20, 2023
2 parents 36ef083 + a52691f commit 2207389
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-joli.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
fail-fast: false

matrix:
version: ['1.6', '1.7']
version: ['1.6', '1.7', '1']
os:
- ubuntu-latest
- macos-latest
Expand Down Expand Up @@ -60,4 +60,4 @@ jobs:
- name: Run examples
working-directory: examples
run: |
julia --project -e 'using JOLI; for f in readdir("."); include(f); end'
julia --project -e 'using JOLI; for f in readdir("."); include(f); end'
6 changes: 3 additions & 3 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "JOLI"
uuid = "bb331ad6-a1cf-11e9-23da-9bcb53c69f6f"
authors = ["Henryk Modzelewski <[email protected]>"]
version = "0.8.4"
version = "0.8.5"

This comment has been minimized.

Copy link
@mloubout

mloubout Mar 20, 2023

Author Member

[deps]
ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
Expand All @@ -27,10 +27,10 @@ Wavelets = "29a6e085-ba6d-5f35-a997-948ac2efa89a"
ChainRulesCore = "1"
DistributedArrays = "0.5, 0.6"
FFTW = "1"
Flux = "0.12"
Flux = "0.12, 0.13"
InplaceOps = "0.3.0"
IterativeSolvers = "0.8, 0.9"
NFFT = "0.6 - 0.12"
NFFT = "0.6 - 0.13"
Nullables = "1"
PyCall = "1.18, 1.90, 1.91, 1.62"
SpecialFunctions = "1.2, 2"
Expand Down
2 changes: 1 addition & 1 deletion src/rrule.jl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
function rrule(::typeof(*), A::joAbstractLinearOperator{ADDT,ARDT}, v) where {ADDT,ARDT}
Y = A*v
function time_pullback(dy)
DY = unthunk(Vector(dy))
DY = collect(unthunk(dy))
return NoTangent(), NoTangent(), @thunk(A' * DY)
end
return Y, time_pullback
Expand Down

1 comment on commit 2207389

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

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

Registration pull request created: JuliaRegistries/General/79942

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.8.5 -m "<description of version>" 22073891c99f87d1648de4b260cc6bff09311660
git push origin v0.8.5

Please sign in to comment.