Skip to content

Commit 8682dc5

Browse files
committed
use compilation from CUDArt
1 parent 6156725 commit 8682dc5

File tree

3 files changed

+4
-104
lines changed

3 files changed

+4
-104
lines changed

REQUIRE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Matcha 0.0.2
88

99
CUDAnative 0.4.1 # llvm codegen fix
1010
CUDAdrv 0.5.1
11-
CUDArt
11+
CUDArt 0.4.0 # for cuda c compiler support
1212
CUBLAS 0.2.0 # for CUDAdrv support
1313
CUFFT
1414

src/backends/cudanative/compilation.jl

Lines changed: 0 additions & 93 deletions
This file was deleted.

src/backends/cudanative/cudanative.jl

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -209,15 +209,8 @@ immutable CUFunction{T}
209209
kernel::T
210210
end
211211

212-
if try success(`$(CUDArt.toolchain_nvcc) --version`); catch false; end
213-
include("compilation.jl")
214-
hasnvcc() = true
215-
else
216-
hasnvcc() = false
217-
warn("Couldn't find nvcc, please add it to your path.
218-
This will disable the ability to compile a CUDA kernel from a string"
219-
)
220-
end
212+
hasnvcc() = true
213+
221214

222215
function CUFunction{T, N}(A::CUArray{T, N}, f::Function, args...)
223216
CUFunction(f) # this is mainly for consistency with OpenCL
@@ -226,7 +219,7 @@ function CUFunction{T, N}(A::CUArray{T, N}, f::Tuple{String, Symbol}, args...)
226219
source, name = f
227220
kernel_name = string(name)
228221
ctx = context(A)
229-
kernel = _compile(ctx.device, kernel_name, source, "from string")
222+
kernel = CUDArt._compile(ctx.device, kernel_name, source, "from string")
230223
CUFunction(kernel) # this is mainly for consistency with OpenCL
231224
end
232225
function (f::CUFunction{F}){F <: Function, T, N}(A::CUArray{T, N}, args...)

0 commit comments

Comments
 (0)