Skip to content

Commit 02ce0fd

Browse files
authored
Merge branch 'main' into ox/baddefcheck
2 parents 60dd506 + b81e525 commit 02ce0fd

30 files changed

+857
-330
lines changed

.github/workflows/CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
version:
18-
- "1.0" # LTS
18+
- "1.6" # LTS
1919
- "1" # Latest Release
2020
os:
2121
- ubuntu-latest

.github/workflows/IntegrationTest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
julia-version: [1]
1616
os: [ubuntu-latest]
1717
package:
18-
- {user: dpsanders, repo: ReversePropagation.jl}
18+
# - {user: dpsanders, repo: ReversePropagation.jl}
1919
- {user: FluxML, repo: Zygote.jl}
2020
# Diffractor needs to run on Julia nightly
2121
include:

Project.toml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
name = "ChainRules"
22
uuid = "082447d4-558c-5d27-93f4-14fc19e9eca2"
3-
version = "1.18.0"
3+
version = "1.24"
44

55
[deps]
66
ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
77
Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
8+
IrrationalConstants = "92d709cd-6900-40b7-9082-c6be49f344b6"
89
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
910
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
1011
RealDot = "c1ae055f-0cd5-4b69-90a6-9a35b1a98df9"
1112
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
1213

1314
[compat]
14-
ChainRulesCore = "1.11"
15+
ChainRulesCore = "1.11.5"
1516
ChainRulesTestUtils = "1.5"
1617
Compat = "3.35"
1718
FiniteDifferences = "0.12.20"
18-
JuliaInterpreter = "0.8"
19+
IrrationalConstants = "0.1.1"
20+
JuliaInterpreter = "0.8" # latest is "0.9.1"
1921
RealDot = "0.1"
2022
StaticArrays = "1.2"
21-
julia = "1"
23+
julia = "1.6"
2224

2325
[extras]
2426
ChainRulesTestUtils = "cdddcdb0-9152-4a09-a978-84456f9df70a"

src/ChainRules.jl

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module ChainRules
33
using Base.Broadcast: materialize, materialize!, broadcasted, Broadcasted, broadcastable
44
using ChainRulesCore
55
using Compat
6+
using IrrationalConstants: logtwo, logten
67
using LinearAlgebra
78
using LinearAlgebra.BLAS
89
using Random
@@ -13,13 +14,6 @@ using Statistics
1314
# to the normal rule of only overload via `ChainRulesCore.rrule`.
1415
import ChainRulesCore: rrule, frule
1516

16-
if VERSION < v"1.3.0-DEV.142"
17-
# In prior versions, the BLAS submodule also exported `dot`, which caused a conflict
18-
# with its parent module. To get around this, we can simply create a hard binding for
19-
# the one we want to use without qualification.
20-
import LinearAlgebra: dot
21-
end
22-
2317
# numbers that we know commute under multiplication
2418
const CommutativeMulNumber = Union{Real,Complex}
2519

0 commit comments

Comments
 (0)