Fix context construction by property.

Author: maleadt

lib/cl/context.jl

@@ -66,7 +66,7 @@ function Context(devs::Vector{Device};
         ArgumentError("No devices specified for context")
     end
     if properties !== nothing
-        ctx_properties = _parse_properties(properties)
+        ctx_properties = encode_properties(properties)
     else
         ctx_properties = C_NULL
     end
@@ -95,7 +95,7 @@ Context(d::Device; properties=nothing, callback=nothing) =
 
 function Context(dev_type; properties = nothing, callback = nothing)
     if properties !== nothing
-        ctx_properties = _parse_properties(properties)
+        ctx_properties = encode_properties(properties)
     else
         ctx_properties = C_NULL
     end
@@ -178,11 +178,9 @@ function Base.getproperty(ctx::Context, s::Symbol)
     end
 end
 
-#Note: properties list needs to be terminated with a NULL value!
-function _parse_properties(props)
-    if isempty(props)
-        return C_NULL
-    end
+function encode_properties(props)
+    isempty(props) && return C_NULL
+
     cl_props = cl_context_properties[]
     for prop_tuple in props
         if length(prop_tuple) != 2
@@ -195,18 +193,21 @@ function _parse_properties(props)
             push!(cl_props, cl_context_properties(val))
         elseif prop == CL_WGL_HDC_KHR
             push!(cl_props, cl_context_properties(val))
-        elseif Sys.isapple() ? (prop == CL_CONTEXT_PROPERTY_USE_CGL_SHAREGROUP_APPLE) : false
+        elseif Sys.isapple() && prop == CL_CONTEXT_PROPERTY_USE_CGL_SHAREGROUP_APPLE
             push!(cl_props, cl_context_properties(val))
         elseif prop == CL_GL_CONTEXT_KHR ||
             prop == CL_EGL_DISPLAY_KHR ||
             prop == CL_GLX_DISPLAY_KHR ||
             prop == CL_CGL_SHAREGROUP_KHR
             push!(cl_props, cl_context_properties(val))
         else
-            throw(OpenCLException("Invalid OpenCL Context property"))
+            throw(OpenCLException("Invalid OpenCL context property '$prop'"))
         end
     end
+
+    # terminate with NULL
     push!(cl_props, cl_context_properties(C_NULL))
+
     return cl_props
 end
 

lib/cl/libopencl.jl

@@ -26,7 +26,7 @@ macro CL_MAKE_VERSION(major, minor, patch)
     end
 end
 
-const intptr_t = Clong
+const intptr_t = Cssize_t
 
 const cl_int = Int32
 

res/opencl.toml

@@ -7,6 +7,7 @@ print_using_CEnum = false
 output_ignorelist = [
     "CL_PARTITION_BY_NAMES_LIST_END_EXT",
     "CL_IMPORT_MEMORY_WHOLE_ALLOCATION_ARM",
+    "intptr_t"
 ]
 
 

res/opencl_prologue.jl

@@ -22,3 +22,5 @@ macro CL_MAKE_VERSION(major, minor, patch)
         VersionNumber($major, $minor, $patch)
     end
 end
+
+const intptr_t = Cssize_t

test/context.jl

@@ -58,9 +58,9 @@
             if !cl.has_device_type(cl.platform(), sym_dev_type)
                 continue
             end
-            @test cl.Context(sym_dev_type, properties=properties) != nothing
-            @test cl.Context(cl_dev_type, properties=properties) != nothing
-            ctx = cl.Context(cl_dev_type, properties=properties)
+            @test cl.Context(sym_dev_type; properties) != nothing
+            @test cl.Context(cl_dev_type; properties) != nothing
+            ctx = cl.Context(cl_dev_type; properties)
             @test !isempty(ctx.properties)
             test_properties = ctx.properties
 
@@ -78,22 +78,10 @@
             @test platform_in_properties
         end
         try
-            ctx2 = cl.Context(cl.CL_DEVICE_TYPE_ACCELERATOR,
-                              properties=properties)
+            ctx2 = cl.Context(cl.CL_DEVICE_TYPE_ACCELERATOR; properties)
         catch err
             @test typeof(err) == cl.CLError
             @test err.desc == :CL_DEVICE_NOT_FOUND
         end
     end
-
-   @testset "parsing" begin
-        properties = [(cl.CL_CONTEXT_PLATFORM, cl.platform())]
-        parsed_properties = cl._parse_properties(properties)
-
-        @test isodd(length(parsed_properties))
-        @test parsed_properties[end] == 0
-        @test parsed_properties[1] == cl.cl_context_properties(cl.CL_CONTEXT_PLATFORM)
-        @test parsed_properties[2] == cl.cl_context_properties(cl.platform().id)
-    end
-
 end