Skip to content

Commit f1aefa4

Browse files
committed
BUILD: Fix UCX GPU device API detection
Signed-off-by: Michal Shalev <[email protected]>
1 parent 7e4cd8f commit f1aefa4

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

meson.build

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ endif
128128
if cuda_dep.found()
129129
nvcc_cmd = find_program('nvcc', required: false)
130130
if nvcc_cmd.found()
131-
if nvcc_cmd.version().version_compare('>=12.8') and nvcc_cmd.version().version_compare('<13.0')
131+
if nvcc.version().version_compare('>=12.8') and nvcc.version().version_compare('<13.0')
132132
doca_gpunetio_dep = dependency('doca-gpunetio', required : false)
133133
else
134134
warning('CUDA version = ' + nvcc_cmd.version() + ', GPUNETIO plugin will be disabled')
@@ -213,7 +213,7 @@ if ucx_dep.found() and cuda_dep.found() and nvcc_prog.found()
213213
have_gpu_side = cuda.compiles('''
214214
#include <ucp/api/device/ucp_device_impl.h>
215215
int main() { return 0; }
216-
''', dependencies : ucx_dep, args: nvcc_flags)
216+
''', dependencies : [ucx_dep, doca_gpunetio_dep], args: nvcc_flags)
217217

218218
have_host_side = cpp.compiles('''
219219
#include <ucp/api/device/ucp_host.h>
@@ -230,6 +230,7 @@ if ucx_dep.found() and cuda_dep.found() and nvcc_prog.found()
230230
'GPU-side compile' : have_gpu_side,
231231
'Host-side compile' : have_host_side,
232232
'nvcc available' : nvcc_prog.found(),
233+
'DOCA GPUNETIO found': doca_gpunetio_dep.found(),
233234
}, section: 'UCX GPU Device API', bool_yn: true)
234235
endif
235236

test/gtest/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ gtest_sources = [
7272
if ucx_gpu_device_api_available
7373
gtest_sources += device_api_test_sources
7474
device_api_inc = [nixl_gpu_inc_dirs, include_directories('device_api')]
75-
device_api_dep = ucx_dep
75+
device_api_dep = [ucx_dep, doca_gpunetio_dep]
7676
else
7777
device_api_inc = []
7878
device_api_dep = []

0 commit comments

Comments
 (0)