Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minimum version macros #54

Merged
merged 1 commit into from
Sep 6, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/context.jl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ type Context
@check api.clRetainContext(ctx_id)
end
ctx = new(ctx_id)
finalizer(ctx, c -> release!(c))
finalizer(ctx, c -> begin
retain || _deletecached!(c);
release!(c)
end )
return ctx
end
end
Expand Down
26 changes: 26 additions & 0 deletions src/macros.jl
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,29 @@ macro str_info(what, arg1, arg2)
bytestring(convert(Ptr{CL_char}, result))
end
end

function _version_test(qm, elem :: Symbol, ex :: Expr, version :: VersionNumber)
@assert qm == :?
@assert ex.head == :(:)
@assert length(ex.args) == 2

esc(quote
if OpenCL.check_version($elem, $version)
$(ex.args[1])
else
$(ex.args[2])
end
end)
end

macro min_v11(qm, elem, ex)
_version_test(qm, elem, ex, v"1.1")
end

macro min_v12(qm, elem, ex)
_version_test(qm, elem, ex, v"1.2")
end

macro min_v20(qm, elem, ex)
_version_test(qm, elem, ex, v"2.0")
end
5 changes: 4 additions & 1 deletion src/queue.jl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ type CmdQueue
@check api.clRetainCommandQueue(q_id)
end
q = new(q_id)
finalizer(q, x -> release!(x))
finalizer(q, x -> begin
retain || _deletecached!(q)
release!(x)
end )
return q
end
end
Expand Down
18 changes: 14 additions & 4 deletions src/util.jl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,17 @@ function create_compute_context()
return (device, ctx, queue)
end

opencl_version(p::Platform) = api.parse_version(p[:version])
opencl_version(d::Device) = opencl_version(d[:platform])
opencl_version(c::Context) = opencl_version(first(devices(c)))
opencl_version(q::CmdQueue) = opencl_version(q[:context])
opencl_version(p :: Platform) = api.parse_version(p[:version])
opencl_version(d :: Device) = api.parse_version(d[:version])
opencl_version(c :: Context) = opencl_version(first(devices(c)))
opencl_version(q :: CmdQueue) = opencl_version(q[:device])

const _versionDict = Dict{Ptr{Void}, VersionNumber}()

_deletecached!(obj) = delete!(_versionDict, pointer(obj))

function check_version(obj, version :: VersionNumber)
version <= get!(_versionDict, pointer(obj)) do
opencl_version(obj)
end
end
1 change: 1 addition & 0 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ const tests = [
"context"
"device"
"cmdqueue"
"macros"
"event"
"program"
"kernel"
Expand Down
76 changes: 76 additions & 0 deletions test/test_macros.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
using FactCheck
using Base.Test

import OpenCL
const cl = OpenCL

facts("OpenCL.Macros") do

context("OpenCL.Macros version platform") do
for platform in cl.platforms()

version = cl.opencl_version(platform)

v11 = cl.@min_v11? platform true : false
v12 = cl.@min_v12? platform true : false
v20 = cl.@min_v20? platform true : false

if version == v"1.0"
@fact v11 => false
@fact v12 => false
@fact v20 => false

elseif version == v"1.1"
@fact v11 => true
@fact v12 => false
@fact v20 => false

elseif version == v"1.2"
@fact v11 => true
@fact v12 => true
@fact v20 => false

elseif version == v"2.0"
@fact v11 => true
@fact v12 => true
@fact v20 => true

end
end
end

context("OpenCL.Macros version device") do
for platform in cl.platforms()
for device in cl.devices(platform)
version = cl.opencl_version(device)

v11 = cl.@min_v11? device true : false
v12 = cl.@min_v12? device true : false
v20 = cl.@min_v20? device true : false

if version == v"1.0"
@fact v11 => false
@fact v12 => false
@fact v20 => false

elseif version == v"1.1"
@fact v11 => true
@fact v12 => false
@fact v20 => false

elseif version == v"1.2"
@fact v11 => true
@fact v12 => true
@fact v20 => false

elseif version == v"2.0"
@fact v11 => true
@fact v12 => true
@fact v20 => true

end
end
end
end
end