Merge pull request #516 from denizyuret/dy/cuarrays13

Dy/cuarrays13

NEWS.md

@@ -1,5 +1,12 @@
+Knet v1.3.1 Release Notes
+=========================
+
+* Compatibility with CuArrays 1.3, 1.4.
+
+
 Knet v1.3.0 Release Notes
 =========================
+55c01f4 2019-10-25
 
 * Fixed #506: RNN serialization and gc issues.
 * Fixed #509: Default output for progress is now stderr.

Project.toml

@@ -1,7 +1,7 @@
 name = "Knet"
 uuid = "1902f260-5fb4-5aff-8c31-6271790ab950"
 authors = ["Deniz Yuret <[email protected]>"]
-version = "1.3.0"
+version = "1.3.1"
 
 [deps]
 AutoGrad = "6710c13c-97f1-543f-91c5-74e8f7d95b35"
@@ -23,18 +23,18 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
 
 [compat]
-julia = "1.0.0"
-AutoGrad = "1.1.6"
-CUDAapi = "1.2.0"
-CUDAdrv = "3.1.0"
-CUDAnative = "2.4.0"
-CuArrays = "1.2.1"
-DataStructures = "0.17.3"
-FileIO = "1.0.7"
-JLD2 = "0.1.3"
-NNlib = "0.6.0"
-SpecialFunctions = "0.8.0"
-TimerOutputs = "0.5.0"
+julia = "1.0"
+AutoGrad = "1.2"
+CUDAapi = "1.0"
+CUDAdrv = "3.0, 4.0"
+CUDAnative = "2.0"
+CuArrays = "1.2"
+DataStructures = "0.17"
+FileIO = "1.0"
+JLD2 = "0.1"
+NNlib = "0.6"
+SpecialFunctions = "0.8"
+TimerOutputs = "0.5"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

src/cuarray.jl

@@ -88,7 +88,7 @@ end
 # Testing the CuArrays allocator: set Knet.cuallocator()=true to use this
 function KnetPtrCu(len::Int)
     c = CuArray{UInt8}(undef, len)
-    p = convert(Cptr, convert(Int, c.buf.ptr))
+    p = convert(Cptr, convert(UInt, Base.unsafe_convert(CuPtr{UInt8}, Base.cconvert(CuPtr{UInt8}, c))))
     kp = KnetPtr(p, len, gpu(), c)
     finalizer(freeKnetPtrCu, kp)
 end