@@ -69,12 +69,8 @@ pthread_mutex_t ts_mutex = PTHREAD_MUTEX_INITIALIZER;
6969 * These are used internally to avoid compiler warnings.
7070 */
7171
72- #define ADIOS_FI_MR_UNSPEC 0
7372#define ADIOS_FI_MR_BASIC (1 << 0)
74- #define ADIOS_FI_MR_SCALABLE (1 << 1)
75-
7673#define ADIOS_FI_LOCAL_MR (1ULL << 55)
77- #define ADIOS_FI_REG_MR (1ULL << 59)
7874
7975/*
8076 * Wrapper for fi_mr_reg() with additional parameters endpoint and mr_mode.
@@ -2542,6 +2538,23 @@ static int RdmaGetPriority(CP_Services Svcs, void *CP_Stream, struct _SstParams
25422538 }
25432539 else
25442540 {
2541+ /*
2542+ * Oct 23, 2025 - [email protected] 2543+ *
2544+ * For non-CXI providers, we are currently relying upon
2545+ * libfabric version 1.5 behavior, which includes using macros
2546+ * like FI_MR_BASIC and FI_LOCAL_MR that are deprecated in
2547+ * libfabric 2.x. However, at the time of this writing, those
2548+ * bitpositions are still examined in some libfabric
2549+ * providers, so we use our own macros (without the deprecated
2550+ * spec) to avoid compiler warnings. At some point when these
2551+ * macros are no longer used in any supported provider this
2552+ * can be removed and cleaned up. Of the supported providers
2553+ * "gni" has disappeared from libfabric 2.x. "cxi" support is
2554+ * newly written and shouldn't require these macros. "psm2"
2555+ * still references those bit positions, but those machines
2556+ * may be disappearing.
2557+ */
25452558 Svcs -> verbose (CP_Stream , DPSummaryVerbose ,
25462559 "RDMA Dataplane trying to check for an available non-CXI "
25472560 "provider since environment variable SLINGSHOT_VNIS is "
0 commit comments