diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a54b5e4..53accb07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,9 +82,9 @@ endif () set(DYAD_CONTROL_PLANE "FLUX_RPC" CACHE STRING "Protocol to use for DYAD's Control Plane") set_property(CACHE DYAD_CONTROL_PLANE PROPERTY STRINGS FLUX_RPC) set(DYAD_DATA_PLANE "FLUX_RPC" CACHE STRING "Protocol to use for DYAD's Data Plane") -set_property(CACHE DYAD_DATA_PLANE PROPERTY STRINGS FLUX_RPC UPX) +set_property(CACHE DYAD_DATA_PLANE PROPERTY STRINGS FLUX_RPC UCX) set(DYAD_PROFILER "NONE" CACHE STRING "Protocol to use for DYAD's Data Plane") -set_property(CACHE DYAD_DATA_PLANE PROPERTY STRINGS PERFFLOW_ASPECT CALIPER NONE) +set_property(CACHE DYAD_PROFILER PROPERTY STRINGS PERFFLOW_ASPECT CALIPER NONE) #------------------------------------------------------------------------------ # Build Type based configurations diff --git a/src/dyad/dtl/ucx_dtl.c b/src/dyad/dtl/ucx_dtl.c index 634f9da2..aa03d1e4 100644 --- a/src/dyad/dtl/ucx_dtl.c +++ b/src/dyad/dtl/ucx_dtl.c @@ -1,11 +1,11 @@ -#include "ucx_dtl.h" +#include #include #include #include #include -#include "base64.h" +#include extern const base64_maps_t base64_maps_rfc4648; diff --git a/src/dyad/dtl/ucx_dtl.h b/src/dyad/dtl/ucx_dtl.h index 9b2f87ba..10441835 100644 --- a/src/dyad/dtl/ucx_dtl.h +++ b/src/dyad/dtl/ucx_dtl.h @@ -4,7 +4,7 @@ #include #include -#include "dyad_dtl_impl.h" +#include struct dyad_dtl_ucx { flux_t* h;