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.

Sign up for GitHub

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

Always allow package to load #177

Merged
merged 3 commits into from
May 25, 2020
Merged

Always allow package to load #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09f9f46
Always allow package to load
jpsamaroo Dec 21, 2019
edc222c
Also fix CUDA Gitlab CI
jpsamaroo Dec 28, 2019
8ec159b
Change error message
jpsamaroo May 25, 2020
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
6 changes: 3 additions & 3 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ nvidia:test:dev:
CI_IMAGE_TAG: 'opencl'
CI_VERSION_TAG: 'dev'
tags:
- cuda
- nvidia
allow_failure: true

amd:test:dev:
Expand All @@ -29,7 +29,7 @@ nvidia:test:v1.0:
CI_IMAGE_TAG: 'opencl'
CI_VERSION_TAG: 'v1.0'
tags:
- cuda
- nvidia

amd:test:v1.0:
extends: .test
Expand All @@ -45,7 +45,7 @@ nvidia:test:v1.1:
CI_IMAGE_TAG: 'opencl'
CI_VERSION_TAG: 'v1.1'
tags:
- cuda
- nvidia

amd:test:v1.1:
extends: .test
Expand Down
7 changes: 7 additions & 0 deletions src/OpenCL.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,11 @@ include("array.jl")

@deprecate release! finalize
end # cl

function __init__()
if cl.api.libopencl == ""
@warn "Could not locate an OpenCL library\nOpenCL API calls will be unavailable"
end
end

end # module
1 change: 0 additions & 1 deletion src/api.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ const paths = Sys.isapple() ? String["/System/Library/Frameworks/OpenCL.framewor
import Libdl

const libopencl = Libdl.find_library(["libOpenCL", "OpenCL"], paths)
@assert libopencl != ""

function _ocl_func(func, ret_type, arg_types)
local args_in = Symbol[Symbol("arg$i")
Expand Down