Merge a4c104f into 8f754f3

JuliaDiff · Jun 19, 2019 · e3cc59c · e3cc59c
2 parents 8f754f3 + a4c104f
commit e3cc59c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/ChainRules.jl b/src/ChainRules.jl
@@ -2,9 +2,17 @@ module ChainRules
 
 using Cassette
 using LinearAlgebra
+using LinearAlgebra.BLAS
 using Base.Broadcast: materialize, materialize!, broadcasted, Broadcasted, broadcastable
 
-import NaNMath, SpecialFunctions, LinearAlgebra, LinearAlgebra.BLAS
+if VERSION < v"1.3.0-DEV.142"
+    # In prior versions, the BLAS submodule also exported `dot`, which caused a conflict
+    # with its parent module. To get around this, we can simply create a hard binding for
+    # the one we want to use without qualification.
+    import LinearAlgebra: dot
+end
+
+import NaNMath, SpecialFunctions
 
 export AbstractRule, Rule, frule, rrule
 

diff --git a/src/rules/linalg/blas.jl b/src/rules/linalg/blas.jl
@@ -4,7 +4,6 @@ package (https://github.com/invenia/DiffLinearAlgebra.jl).
 =#
 
 using LinearAlgebra: BlasFloat
-using LinearAlgebra.BLAS: gemm
 
 _zeros(x) = fill!(similar(x), zero(eltype(x)))