Skip to content
Snippets Groups Projects
Commit 10cf2f4e authored by Utz-Uwe Haus's avatar Utz-Uwe Haus
Browse files

Distinguish between local and system libfabric builds in drc.c

Bulding against external libfabric on GNI system did not work due to path mixup for fi_ext_gni.h
parent eb6eeba5
No related branches found
No related tags found
1 merge request!37Draft: Resolve "Cannot run multiple maestro applications on the same node under slurm with GNI (Aries) network"
Pipeline #81721 failed
...@@ -456,6 +456,7 @@ AS_IF([test "x$enable_ofi_pool_manager" = "xyes"], [ ...@@ -456,6 +456,7 @@ AS_IF([test "x$enable_ofi_pool_manager" = "xyes"], [
dnl Whether doing so creates a performance problem or not is still to be determined dnl Whether doing so creates a performance problem or not is still to be determined
AX_SUBDIRS_CONFIGURE([deps/libfabric],[[--enable-embedded],[--disable-rxd],[--disable-shm],[--disable-tcp],[--with-kdreg=no],[--enable-debug]],[],[],[]) AX_SUBDIRS_CONFIGURE([deps/libfabric],[[--enable-embedded],[--disable-rxd],[--disable-shm],[--disable-tcp],[--with-kdreg=no],[--enable-debug]],[],[],[])
AC_MSG_NOTICE([================== done preconfiguring private libfabric library build]) AC_MSG_NOTICE([================== done preconfiguring private libfabric library build])
AC_DEFINE([LOCAL_LIBFABRIC],[1],[Define if using our own libfabric build])
]) ])
......
...@@ -55,8 +55,13 @@ ...@@ -55,8 +55,13 @@
#ifdef HAVE_DRC #ifdef HAVE_DRC
#include <rdmacred.h> #include <rdmacred.h>
/* #include <rdma/fi_ext_gni.h> */
#ifndef LOCAL_LIBFABRIC
# include <rdma/fi_ext_gni.h>
#else
# include <fi_ext_gni.h> /* use uninstalled one */ # include <fi_ext_gni.h> /* use uninstalled one */
#endif
#else #else
/* define some placeholders; we want to compile code with dummy /* define some placeholders; we want to compile code with dummy
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment