Skip to content

Commit 9ded802

Browse files
yosefeyosefe
authored
UCT/GDA: Rename transport to rc_gda and packages to ib-mlx5-gda (#10840)
1 parent b8ffe61 commit 9ded802

File tree

11 files changed

+63
-70
lines changed

11 files changed

+63
-70
lines changed

‎contrib/buildrpm.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ if [ $opt_binrpm -eq 1 ]; then
117117
with_args+=" $(with_arg mad)"
118118
with_args+=" $(with_arg mlx5)"
119119
with_args+=" $(with_arg efa)"
120-
with_args+=" $(with_arg gdaki)"
120+
with_args+=" $(with_arg gda)"
121121

122122
echo rpmbuild -bb $rpmmacros $rpmopts $rpmspec $defines $with_args | bash -eEx
123123
fi

‎debian/control.in‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ Description: Unified Communication X - gdrcopy support
6464
This package provides UCX support for using gdrcopy - A low-latency GPU
6565
memory copy library based on NVIDIA GPUDirect RDMA technology.
6666

67-
Package: ucx-mlx5-gdaki
67+
Package: ucx-ib-mlx5-gda
6868
Section: libs
6969
Depends: ${misc:Depends}, ${shlibs:Depends}
7070
Architecture: any
71-
Build-Profiles: <gdaki>
72-
Description: Unified Communication X - GDAKI support
71+
Build-Profiles: <gda>
72+
Description: Unified Communication X - GPU Direct Async support
7373
UCX is a communication library implementing high-performance messaging.
7474
.
75-
Provide GDAKI (GPU Direct Asynchronous Kernel Initiated) support for UCX.
76-
GDAKI enables high-performance GPU-to-network communication using DOCA GPUNetIO
77-
technology for direct data transfer between GPU memory and network devices.
75+
Provide GPU Direct Async support for UCX. GPU Direct Async allows GPU kernels
76+
to initiate network communications directly without explicit synchronization
77+
with the host CPU.

‎debian/ucx-ib-mlx5-gda.install‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
+usr/lib/ucx/libuct_ib_mlx5_gda.*

‎src/uct/ib/mlx5/gdaki/Makefile.am‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,28 @@
55

66
if HAVE_GPUNETIO
77

8-
module_LTLIBRARIES = libuct_ib_mlx5_gdaki.la
9-
libuct_ib_mlx5_gdaki_la_CPPFLAGS = $(BASE_CPPFLAGS) $(IBVERBS_CPPFLAGS) \
10-
$(CUDA_CPPFLAGS)
11-
libuct_ib_mlx5_gdaki_la_CFLAGS = $(BASE_CFLAGS) $(LT_CFLAGS) $(CUDA_CFLAGS) \
12-
$(GPUNETIO_CFLAGS)
13-
libuct_ib_mlx5_gdaki_la_LDFLAGS = $(IBVERBS_LDFLAGS) $(CUDA_LDFLAGS) \
14-
$(GPUNETIO_LDFLAGS) -version-info $(SOVERSION)
15-
libuct_ib_mlx5_gdaki_la_LIBADD = $(top_builddir)/src/ucs/libucs.la \
16-
$(top_builddir)/src/uct/libuct.la \
17-
$(top_builddir)/src/uct/ib/libuct_ib.la \
18-
$(top_builddir)/src/uct/ib/mlx5/libuct_ib_mlx5.la \
19-
$(top_builddir)/src/uct/cuda/libuct_cuda.la \
20-
$(CUDA_LIBS) $(GPUNETIO_LIBS)
21-
libuct_ib_mlx5_gdaki_ladir = $(includedir)/uct/ib_mlx5/gdaki
8+
module_LTLIBRARIES = libuct_ib_mlx5_gda.la
9+
libuct_ib_mlx5_gda_la_CPPFLAGS = $(BASE_CPPFLAGS) $(IBVERBS_CPPFLAGS) \
10+
$(CUDA_CPPFLAGS)
11+
libuct_ib_mlx5_gda_la_CFLAGS = $(BASE_CFLAGS) $(LT_CFLAGS) $(CUDA_CFLAGS) \
12+
$(GPUNETIO_CFLAGS)
13+
libuct_ib_mlx5_gda_la_LDFLAGS = $(IBVERBS_LDFLAGS) $(CUDA_LDFLAGS) \
14+
$(GPUNETIO_LDFLAGS) -version-info $(SOVERSION)
15+
libuct_ib_mlx5_gda_la_LIBADD = $(top_builddir)/src/ucs/libucs.la \
16+
$(top_builddir)/src/uct/libuct.la \
17+
$(top_builddir)/src/uct/ib/libuct_ib.la \
18+
$(top_builddir)/src/uct/ib/mlx5/libuct_ib_mlx5.la \
19+
$(top_builddir)/src/uct/cuda/libuct_cuda.la \
20+
$(CUDA_LIBS) $(GPUNETIO_LIBS)
21+
libuct_ib_mlx5_gda_ladir = $(includedir)/uct/ib_mlx5/gdaki
2222

23-
libuct_ib_mlx5_gdaki_la_SOURCES = \
23+
libuct_ib_mlx5_gda_la_SOURCES = \
2424
gdaki.c
2525

2626
noinst_HEADERS = \
2727
gdaki.h
2828

29-
PKG_CONFIG_NAME=mlx5-gdaki
29+
PKG_CONFIG_NAME=ib-mlx5-gda
3030

3131
include $(top_srcdir)/config/module.am
3232
include $(top_srcdir)/config/module-pkg-config.am

‎src/uct/ib/mlx5/gdaki/configure.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ CPPFLAGS="$save_CPPFLAGS"
5353
LDFLAGS="$save_LDFLAGS"
5454
5555
AS_IF([test x$have_gpunetio = xyes], [
56-
uct_ib_mlx5_modules="${uct_ib_mlx5_modules}:gdaki"
56+
uct_ib_mlx5_modules="${uct_ib_mlx5_modules}:gda"
5757
AC_SUBST(GPUNETIO_CFLAGS)
5858
AC_SUBST(GPUNETIO_LDFLAGS)
5959
AC_SUBST(GPUNETIO_LIBS)
@@ -62,4 +62,4 @@ AS_IF([test x$have_gpunetio = xyes], [
6262

6363
AM_CONDITIONAL([HAVE_GPUNETIO], [test x$have_gpunetio = xyes])
6464
AC_CONFIG_FILES([src/uct/ib/mlx5/gdaki/Makefile
65-
src/uct/ib/mlx5/gdaki/ucx-mlx5-gdaki.pc])
65+
src/uct/ib/mlx5/gdaki/ucx-ib-mlx5-gda.pc])

‎src/uct/ib/mlx5/gdaki/gdaki.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ static UCS_CLASS_INIT_FUNC(uct_rc_gdaki_iface_t, uct_md_h tl_md,
464464

465465
status = uct_rc_mlx5_dp_ordering_ooo_init(md, &self->super,
466466
md->dp_ordering_cap.rc,
467-
&config->mlx5, "gdaki");
467+
&config->mlx5, "rc_gda");
468468
if (status != UCS_OK) {
469469
return status;
470470
}
@@ -585,8 +585,8 @@ uct_gdaki_query_tl_devices(uct_md_h md, uct_tl_device_resource_t **tl_devices_p,
585585
return status;
586586
}
587587

588-
UCT_TL_DEFINE_ENTRY(&uct_ib_component, gdaki, uct_gdaki_query_tl_devices,
589-
uct_rc_gdaki_iface_t, "GDAKI_",
588+
UCT_TL_DEFINE_ENTRY(&uct_ib_component, rc_gda, uct_gdaki_query_tl_devices,
589+
uct_rc_gdaki_iface_t, "RC_GDA_",
590590
uct_rc_gdaki_iface_config_table,
591591
uct_rc_gdaki_iface_config_t);
592592

@@ -614,4 +614,4 @@ static void uct_ib_doca_init(void)
614614
}
615615
}
616616

617-
UCT_TL_INIT(&uct_ib_component, gdaki, ctor, uct_ib_doca_init(), )
617+
UCT_TL_INIT(&uct_ib_component, rc_gda, ctor, uct_ib_doca_init(), )

‎src/uct/ib/mlx5/gdaki/gdaki.cuh‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,10 @@
77
#ifndef UCT_GDAKI_CUH_H
88
#define UCT_GDAKI_CUH_H
99

10-
#include <stdio.h>
11-
#include <stdint.h>
12-
13-
#include <memory>
14-
#include <cooperative_groups.h>
10+
#include "gdaki_dev.h"
1511

16-
#include <doca_gpunetio_verbs_def.h>
1712
#include <doca_gpunetio_dev_verbs_qp.cuh>
18-
19-
#include <ucs/type/status.h>
20-
#include <uct/api/cuda/uct.h>
21-
22-
#include "gdaki_dev.h"
13+
#include <cooperative_groups.h>
2314

2415
#define UCT_RC_MLX5_GDA_WARP_SIZE 32
2516

‎src/uct/ib/mlx5/gdaki/ucx-ib-mlx5-gda.pc.in‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#
2+
# Copyright (c) 2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
3+
#
4+
# See file LICENSE for terms.
5+
#
6+
7+
libdir = @libdir@/ucx
8+
9+
Name: @PACKAGE@-ib-mlx5-gda
10+
Description: Unified Communication X Library GPU Direct Async module
11+
Version: @VERSION@
12+
Cflags: @GPUNETIO_CFLAGS@
13+
Libs:
14+
Libs.private: -L${libdir} -luct_ib_mlx5_gda -Wl,--undefined=uct_rc_gda_init @IBVERBS_LDFLAGS@ @CUDA_LDFLAGS@ @GPUNETIO_LDFLAGS@
15+
Requires.private: doca-gpunetio
16+

‎src/uct/ib/mlx5/gdaki/ucx-mlx5-gdaki.pc.in‎

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

‎test/gtest/Makefile.am‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,7 @@ if HAVE_NVCC
272272
if HAVE_GPUNETIO # temporarily all device code depends on doca
273273
NVCC_EXTRA_FLAGS = \
274274
$(CUDA_CPPFLAGS) \
275+
$(GPUNETIO_CFLAGS) \
275276
-I$(top_srcdir)/test \
276277
-I$(top_srcdir)/test/gtest
277278
include $(top_srcdir)/config/cuda.am

0 commit comments

Comments
 (0)