From 09f9f465e85b26e1cfbab60a6c402df77b1ae752 Mon Sep 17 00:00:00 2001 From: Julian P Samaroo Date: Fri, 20 Dec 2019 19:12:57 -0600 Subject: [PATCH 1/3] Always allow package to load --- src/OpenCL.jl | 7 +++++++ src/api.jl | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/OpenCL.jl b/src/OpenCL.jl index 2442b18e..ca36709b 100644 --- a/src/OpenCL.jl +++ b/src/OpenCL.jl @@ -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, this package will not work!" + end +end + end # module diff --git a/src/api.jl b/src/api.jl index 0da2e0fb..bb3b8624 100644 --- a/src/api.jl +++ b/src/api.jl @@ -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") From edc222c801f73dcb55fa405971843801fd34d8af Mon Sep 17 00:00:00 2001 From: Julian P Samaroo Date: Sat, 28 Dec 2019 08:22:18 -0600 Subject: [PATCH 2/3] Also fix CUDA Gitlab CI --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a86290f1..74fe9c2c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ nvidia:test:dev: CI_IMAGE_TAG: 'opencl' CI_VERSION_TAG: 'dev' tags: - - cuda + - nvidia allow_failure: true amd:test:dev: @@ -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 @@ -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 From 8ec159b0eecef22e15f74ff93e329937f1a20bff Mon Sep 17 00:00:00 2001 From: Julian P Samaroo Date: Mon, 25 May 2020 07:44:59 -0500 Subject: [PATCH 3/3] Change error message --- src/OpenCL.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenCL.jl b/src/OpenCL.jl index ca36709b..3925b029 100644 --- a/src/OpenCL.jl +++ b/src/OpenCL.jl @@ -68,7 +68,7 @@ end # cl function __init__() if cl.api.libopencl == "" - @warn "Could not locate an OpenCL library, this package will not work!" + @warn "Could not locate an OpenCL library\nOpenCL API calls will be unavailable" end end