Skip to content

Commit 9ff318f

Browse files
jswaroAmith Abrahamchuckfossend314159Eric Thomas
committed
prov/cxi: Initial upstreaming of the CXI provider
Co-authored-by: Amith Abraham <amith.abraham@hpe.com> Co-authored-by: Chuck Fossen <chuckf@hpe.com> Co-authored-by: dennis-c-josifovich <dennis.c.josifovich@hpe.com> Co-authored-by: Eric Thomas <eric.thomas@hpe.com> Co-authored-by: Frank Zago <frank.zago@hpe.com> Co-authored-by: Frank Zago <fzago@cray.com> Co-authored-by: Ian Ziemba <ian.ziemba@hpe.com> Co-authored-by: James Swaro <james.swaro@hpe.com> Co-authored-by: Joe Nemeth <joseph.nemeth@hpe.com> Co-authored-by: Mike Uttormark <mike.uttormark@hpe.com> Co-authored-by: Steve Welch <welch@hpe.com> Co-authored-by: Veena Kotha <veena.kotha@hpe.com> Signed-off-by: James Swaro <james.swaro@hpe.com>
1 parent cd11503 commit 9ff318f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+79960
-3
lines changed

Makefile.am

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copyright (c) 2016 Cisco Systems, Inc. All rights reserved.
33
# Copyright (c) 2017-2018 Intel Corporation, Inc. All right reserved.
44
# Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All rights reserved.
5-
# (C) Copyright 2020 Hewlett Packard Enterprise Development LP
5+
# (C) Copyright 2020-2023 Hewlett Packard Enterprise Development LP
66
#
77
# Makefile.am for libfabric
88

@@ -445,7 +445,7 @@ test:
445445
./util/fi_info
446446

447447
rpm: dist
448-
LDFLAGS=-Wl,--build-id rpmbuild -ta libfabric-$(PACKAGE_VERSION).tar.bz2
448+
LDFLAGS=-Wl,--build-id rpmbuild -ta $(RPMBUILD_OPTS) libfabric-$(PACKAGE_VERSION).tar.bz2
449449

450450
prov_install_man_pages=
451451
prov_dist_man_pages=
@@ -458,6 +458,7 @@ include prov/verbs/Makefile.include
458458
include prov/efa/Makefile.include
459459
include prov/psm2/Makefile.include
460460
include prov/psm3/Makefile.include
461+
include prov/cxi/Makefile.include
461462
include prov/rxm/Makefile.include
462463
include prov/mrail/Makefile.include
463464
include prov/rxd/Makefile.include

configure.ac

+1
Original file line numberDiff line numberDiff line change
@@ -1004,6 +1004,7 @@ FI_PROVIDER_SETUP([psm3])
10041004
FI_PROVIDER_SETUP([sockets])
10051005
FI_PROVIDER_SETUP([verbs])
10061006
FI_PROVIDER_SETUP([efa])
1007+
FI_PROVIDER_SETUP([cxi])
10071008
FI_PROVIDER_SETUP([udp])
10081009
FI_PROVIDER_SETUP([tcp])
10091010
FI_PROVIDER_SETUP([rxm])

include/ofi_prov.h

+11
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,17 @@
4848
* not built: no-op call for ctor
4949
*/
5050

51+
#if (HAVE_CXI) && (HAVE_CXI_DL)
52+
# define CXI_INI FI_EXT_INI
53+
# define CXI_INIT NULL
54+
#elif (HAVE_CXI)
55+
# define CXI_INI INI_SIG(fi_cxi_ini)
56+
# define CXI_INIT fi_cxi_ini()
57+
CXI_INI ;
58+
#else
59+
# define CXI_INIT NULL
60+
#endif
61+
5162
/* If HAVE_EFA is defined on Windows, then the VisualStudio project configures
5263
* MSBuild to include the efa related files and exclude the verbs related files.
5364
* With the verbs related files excluded from the build, we need only ensure

man/fi_cxi.7.md

+1,782
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)