Skip to content

Commit 58f4c8e

Browse files
committed
correctly use the artifact CUDA_Compiler when local_compiler is false
1 parent 1b73e5f commit 58f4c8e

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

CUDACore/src/compiler/compilation.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ function GPUCompiler.link_libraries!(@nospecialize(job::CUDACompilerJob), mod::L
3232
return
3333
end
3434

35-
lib = parse(LLVM.Module, read(libdevice))
35+
lib = parse(LLVM.Module, read(CUDA_Compiler.libdevice))
3636

3737
# override libdevice's triple and datalayout to avoid warnings
3838
triple!(lib, triple(mod))
@@ -339,7 +339,7 @@ function compile(@nospecialize(job::CompilerJob))
339339
"--output-file", ptxas_output,
340340
ptx_input
341341
])
342-
proc, log = run_and_collect(`$(ptxas()) $ptxas_opts`)
342+
proc, log = run_and_collect(`$(CUDA_Compiler.ptxas()) $ptxas_opts`)
343343
log = strip(log)
344344
if !success(proc)
345345
reason = proc.termsignal > 0 ? "ptxas received signal $(proc.termsignal)" :
@@ -370,12 +370,12 @@ function compile(@nospecialize(job::CompilerJob))
370370
append!(nvlink_opts, [
371371
"--verbose", "--extra-warnings",
372372
"--arch", arch,
373-
"--library-path", dirname(libcudadevrt),
373+
"--library-path", dirname(CUDA_Compiler.libcudadevrt),
374374
"--library", "cudadevrt",
375375
"--output-file", nvlink_output,
376376
ptxas_output
377377
])
378-
proc, log = run_and_collect(`$(nvlink()) $nvlink_opts`)
378+
proc, log = run_and_collect(`$(CUDA_Compiler.nvlink()) $nvlink_opts`)
379379
log = strip(log)
380380
if !success(proc)
381381
reason = proc.termsignal > 0 ? "nvlink received signal $(proc.termsignal)" :

CUDATools/src/reflection.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ function disassemble_cubin(io::IO, cubin::Vector{Cchar}; raw::Bool)
126126
write(cubin_io, cubin)
127127
flush(cubin_io)
128128

129-
cmd = `$(CUDA_Compiler_jll.nvdisasm()) --print-code --print-line-info $cubin_path`
129+
cmd = `$(CUDA_Compiler.nvdisasm()) --print-code --print-line-info $cubin_path`
130130
for line in readlines(cmd)
131131
if !raw
132132
# nvdisasm output is pretty verbose;

0 commit comments

Comments
 (0)