Skip to content

Commit b79b9f4

Browse files
authored
Unify common BNXT and MLX5 initialization code (#233)
Co-authored-by: Aurelien Bouteiller <aurelien.bouteiller@amd.com> [ROCm/rocshmem commit: cb39f7a]
1 parent e30b76e commit b79b9f4

File tree

10 files changed

+734
-728
lines changed

10 files changed

+734
-728
lines changed

projects/rocshmem/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ option(BUILD_LOCAL_GPU_TARGET_ONLY "Build only for GPUs detected on this machine
7070
option(BUILD_CODE_COVERAGE "Build with code coverage flags (gcc only)" OFF)
7171

7272
option(GDA_IONIC "Build for AMD Pensando IONIC RDMA provider" OFF)
73-
option(GDA_BNXT "Build for Broadcom" OFF)
73+
option(GDA_BNXT "Build for Broadcom RDMA provider" OFF)
74+
option(GDA_MLX5 "Build for Mellanox MLX5 RDMA provider" OFF)
7475

7576
###############################################################################
7677
# PROJECT

projects/rocshmem/cmake/rocshmem_config.h.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,4 @@
4444
#cmakedefine USE_HDP_FLUSH_HOST_SIDE
4545
#cmakedefine GDA_IONIC
4646
#cmakedefine GDA_BNXT
47+
#cmakedefine GDA_MLX5

projects/rocshmem/scripts/build_configs/gda_mlx5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ set -e
2727

2828
script_path=$(dirname "$(realpath $0)")
2929

30-
exec $script_path/gda $*
30+
source $script_path/gda -DGDA_MLX5=ON $*

projects/rocshmem/src/gda/CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,10 @@ target_link_libraries(
4747
numa
4848
)
4949

50-
if (GDA_IONIC)
51-
elseif (GDA_BNXT)
50+
if (GDA_BNXT)
5251
add_subdirectory(bnxt)
53-
else()
52+
endif()
53+
54+
if (GDA_MLX5)
5455
target_sources(${PROJECT_NAME} PRIVATE segment_builder.cpp)
5556
endif()

0 commit comments

Comments
 (0)