Skip to content

Fix compilation when using without-gda #11615

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

Open
ofirfarjun7 wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Fix compilation when using without-gda #11615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
01b92b5
UCT/GDAKI: check gpunetio header and have_gda config.
ofirfarjun7 Jul 2, 2026
29cb104
UCT/GDAKI: check gpunetio header and have_gda config.
ofirfarjun7 Jul 2, 2026
3041346
UCT/GDAKI: check gpunetio header and have_gda config.
ofirfarjun7 Jul 2, 2026
508b1c0
UCT/GDAKI: check gpunetio header and have_gda config.
ofirfarjun7 Jul 2, 2026
8f5a21f
UCT/GDAKI: check gpunetio header and have_gda config.
ofirfarjun7 Jul 2, 2026
bad1dd6
UCT/GDAKI: include config.h in gtest.
ofirfarjun7 Jul 3, 2026
667a68d
UCT/GDAKI: check mlx5dv header.
ofirfarjun7 Jul 5, 2026
bf8adfa
UCT/GDAKI: check mlx5dv header.
ofirfarjun7 Jul 5, 2026
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
10 changes: 6 additions & 4 deletions src/uct/api/device/uct_device_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,18 @@
#include <uct/api/uct_def.h>
#include <ucs/sys/device_code.h>

#if __has_include(<uct/cuda/cuda_ipc/cuda_ipc.cuh>) && \
__has_include(<cuda/atomic>)
#if (defined(HAVE_CUDA) || \
(!defined(HAVE_CONFIG_H) && __has_include(<uct/cuda/cuda_ipc/cuda_ipc.cuh>) && __has_include(<cuda/atomic>)))
#include <uct/cuda/cuda_ipc/cuda_ipc.cuh>
#define UCT_CUDA_IPC_SUPPORTED 1
#else
#define UCT_CUDA_IPC_SUPPORTED 0
#endif

#if __has_include(<uct/ib/mlx5/gdaki/gdaki.cuh>) && \
__has_include(<infiniband/mlx5dv.h>)
#if (defined(HAVE_GDA) || \
(!defined(HAVE_CONFIG_H) && \
__has_include(<uct/ib/mlx5/gdaki/gdaki.cuh>) && \
__has_include(<infiniband/mlx5dv.h>)))
#include <uct/ib/mlx5/gdaki/gdaki.cuh>
#define UCT_RC_MLX5_GDA_SUPPORTED 1
#else
Expand Down
6 changes: 4 additions & 2 deletions src/uct/ib/mlx5/gdaki/configure.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@ AC_ARG_WITH([gda],
[AS_HELP_STRING([--without-gda], [Disable GDA-KI])],
[], [with_gda=yes])

AS_IF([test "x$with_gda" = "xyes"] && [test "x$cuda_happy" = "xyes"],
AS_IF([test "x$with_gda" = "xyes"] && [test "x$cuda_happy" = "xyes"] &&
[test "x$have_mlx5" = "xyes"],
[gda_happy=yes], [gda_happy=no])

AS_IF([test "x$gda_happy" = "xyes"],
[uct_ib_mlx5_modules="${uct_ib_mlx5_modules}:gda"])
[uct_ib_mlx5_modules="${uct_ib_mlx5_modules}:gda"
AC_DEFINE([HAVE_GDA], [1], [Enable GDA-KI support])])

AM_CONDITIONAL([HAVE_GDA], [test "x$gda_happy" != "xno"])
AC_CONFIG_FILES([src/uct/ib/mlx5/gdaki/Makefile
Expand Down
4 changes: 4 additions & 0 deletions test/gtest/ucp/cuda/test_kernels.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
* See file LICENSE for terms.
*/

#ifdef HAVE_CONFIG_H
# include "config.h"
#endif

#include "test_kernels.h"

#include <ucp/api/device/ucp_device_impl.h>
Expand Down
4 changes: 4 additions & 0 deletions test/gtest/uct/cuda/test_kernels.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
* See file LICENSE for terms.
*/

#ifdef HAVE_CONFIG_H
# include "config.h"
#endif

#include "test_kernels.h"

#include <uct/api/device/uct_device_impl.h>
Expand Down
4 changes: 4 additions & 0 deletions test/gtest/uct/cuda/test_kernels_uct.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
* See file LICENSE for terms.
*/

#ifdef HAVE_CONFIG_H
# include "config.h"
#endif

#include "test_kernels_uct.h"

#include <uct/api/device/uct_device_impl.h>
Expand Down
Loading