Commit d0d37d05 authored by Marc Vef's avatar Marc Vef
Browse files

Merge branch 'mercury_deps' into 'master' 

Let mercury handle its own dependencies

See merge request zdvresearch_bsc/adafs!82
parents db319807 fde32cae

.gitlab-ci.yml

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ compile GekkoFS: 
      -Wdeprecate

      -DCMAKE_BUILD_TYPE=Debug

      -DCMAKE_PREFIX_PATH=${DEPS_INSTALL_PATH}

      -DUSE_BMI:BOOL=ON

      ..

    - make -j$(nproc)

  artifacts:

ifs/CMake/FindBMI.cmake

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
find_path(BMI_INCLUDE_DIR

    NAMES bmi.h

)



find_library(BMI_LIBRARY

    NAMES bmi

)



set(BMI_INCLUDE_DIRS ${BMI_INCLUDE_DIR})

set(BMI_LIBRARIES ${BMI_LIBRARY})





include(FindPackageHandleStandardArgs)

find_package_handle_standard_args(BMI DEFAULT_MSG BMI_LIBRARY BMI_INCLUDE_DIR)



mark_as_advanced(

        BMI_LIBRARY

        BMI_INCLUDE_DIR

)
 
 No newline at end of file

ifs/CMake/FindCCI.cmake

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
find_path(CCI_INCLUDE_DIR

    NAMES cci.h

)



find_library(CCI_LIBRARY

    NAMES cci

)



set(CCI_INCLUDE_DIRS ${CCI_INCLUDE_DIR})

set(CCI_LIBRARIES ${CCI_LIBRARY})





include(FindPackageHandleStandardArgs)

find_package_handle_standard_args(CCI DEFAULT_MSG CCI_LIBRARY CCI_INCLUDE_DIR)



mark_as_advanced(

        CCI_LIBRARY

        CCI_INCLUDE_DIR

)
 
 No newline at end of file

ifs/CMake/FindLibFabric.cmake

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
find_path(LIBFABRIC_INCLUDE_DIR

    NAMES rdma/fabric.h

)



find_library(LIBFABRIC_LIBRARY

    NAMES fabric

)



set(LIBFABRIC_LIBRARIES ${LIBFABRIC_LIBRARY} )

set(LIBFABRIC_INCLUDE_DIRS ${LIBFABRIC_INCLUDE_DIR} )



include(FindPackageHandleStandardArgs)



find_package_handle_standard_args(libfabric DEFAULT_MSG LIBFABRIC_LIBRARY LIBFABRIC_INCLUDE_DIR)



mark_as_advanced(

    LIBFABRIC_INCLUDE_DIR

    LIBFABRIC_LIBRARY

)
 
 No newline at end of file

ifs/CMakeLists.txt

+9 −50
Original line number Diff line number Diff line
@@ -52,56 +52,15 @@ find_package(Boost 1.53 REQUIRED 


find_package(Threads REQUIRED)



option(USE_OFI_VERBS "Use libfabric plugin with verbs." OFF)

if (USE_OFI_VERBS)

    find_package(LibFabric REQUIRED)

    set(NA_LIB

            ${NA_LIB}

            ${LIBFABRIC_LIBRARIES}

set(RPC_PROTOCOL "bmi+tcp" CACHE STRING "Communication plugin used for RPCs")

set_property(CACHE RPC_PROTOCOL PROPERTY STRINGS

   "bmi+tcp"

   "ofi+verbs"

   "ofi+psm2"

   "cci+verbs"

)

    add_definitions(-DRPC_PROTOCOL="ofi+verbs")

endif()



option(USE_OFI_PSM2 "Use libfabric plugin with verbs." OFF)

if (USE_OFI_PSM2)

    find_package(LibFabric REQUIRED)

    set(NA_LIB

            ${NA_LIB}

            ${LIBFABRIC_LIBRARIES}

            )

    add_definitions(-DRPC_PROTOCOL="ofi+psm2")

endif ()



option(USE_CCI "Use cci plugin." OFF)

if(USE_CCI)

    find_package(CCI REQUIRED)

    set(NA_LIB

            ${NA_LIB}

            ${CCI_LIBRARIES}

            )

    add_definitions(-DRPC_PROTOCOL="cci+verbs")

endif()



option(USE_BMI "Use bmi plugin." OFF)

if(USE_BMI)

    find_package(BMI REQUIRED)

    set(NA_LIB

            ${NA_LIB}

            ${BMI_LIBRARIES}

            )

    add_definitions(-DRPC_PROTOCOL="bmi+tcp")

endif()



if (NOT USE_OFI_VERBS AND NOT USE_OFI_PSM2 AND NOT USE_CCI AND NOT USE_BMI)

    message("* No Mercury NA plugin selected. BMI automatically selected ... Use -DUSE_{BMI,CCI,OFI_VERBS,OFI_PSM2}:BOOL=ON for other plugins")

    find_package(BMI REQUIRED)

    set(NA_LIB

            ${NA_LIB}

            ${BMI_LIBRARIES}

            )

    add_definitions(-DRPC_PROTOCOL="bmi+tcp")

endif()



message(STATUS "RPC protocol: '${RPC_PROTOCOL}'")

add_definitions(-DRPC_PROTOCOL="${RPC_PROTOCOL}")



# Imported target

add_library(RocksDB INTERFACE IMPORTED GLOBAL)