Really wait for JuliaLang/julia#22002 before enabling AS-ld/st.

JuliaGPU · Aug 2, 2017 · 770a6e9 · 770a6e9
1 parent 1d371d8
commit 770a6e9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/src/pointer.jl b/src/pointer.jl
@@ -98,10 +98,8 @@ Base.convert(::Type{Int}, ::Type{AS.Shared})   = 3
 Base.convert(::Type{Int}, ::Type{AS.Constant}) = 4
 Base.convert(::Type{Int}, ::Type{AS.Local})    = 5
 
-if Base.VERSION >= v"0.6.1-"
-    if Base.VERSION < v"0.6.1"
-        warn("Using CUDAnative with Julia 0.6.1-pre; make sure it includes #22022")
-    end
+if Base.VERSION >= v"0.6.1"
+    # requires backport of JuliaLang/Julia#22002
 
     @generated function Base.unsafe_load(p::DevicePtr{T,A}, i::Integer=1,
                                          ::Type{Val{align}}=Val{1}) where {T,A,align}

diff --git a/test/codegen.jl b/test/codegen.jl
@@ -82,10 +82,6 @@ end
 end
 
 if Base.VERSION >= v"0.6.1"
-    # NOTE: we're more strict than the version check in src/pointer.jl here,
-    #       because #22022 might not be included, in which case CUDAnative might work
-    #       but the test below will definitely fail.
-
     @testset "LLVM D32593" begin
         @eval struct llvm_D32593_struct
             foo::Float32