Commit 01783a85 authored by EVPath Upstream's avatar EVPath Upstream Committed by Atkins, Charles Vernon
Browse files

EVPath 2018-03-26 (c989e943) 

Code extracted from:

    https://github.com/GTkorvo/EVPath.git

at commit c989e94376b6d07d673e5d476ac12bad41fc0359 (master).

Upstream Shortlog
-----------------

Chuck Atkins (2):
      784552c0 Fix typo in cmake command
      615f95a6 Fix the check for RLIMIT_MEMLOCK with ibverbs
parent c3396425

CMakeLists.txt

+20 −13
Original line number Diff line number Diff line
@@ -258,8 +258,10 @@ endif() 
set(RUN_IB_TESTS FALSE)

CHECK_LIBRARY_EXISTS(ibverbs ibv_create_qp "" HAVE_IBVERBS)

if(HAVE_IBVERBS)

  if(BUILD_TESTING)

    if(NOT CMAKE_CROSSCOMPILING)

      message(STATUS "Check for enough rlimit to run IB tests")

  file(READ "${CMAKE_SOURCE_DIR}/cmake/GOOD_MEMLOCK_LIMIT.c" _SOURCE)

      file(READ "${CMAKE_CURRENT_SOURCE_DIR}/cmake/GOOD_MEMLOCK_LIMIT.c" _SOURCE)

      CHECK_C_SOURCE_RUNS("${_SOURCE}" GOOD_MEMLOCK_LIMIT)

      if(GOOD_MEMLOCK_LIMIT)

        message(STATUS
@@ -272,6 +274,11 @@ if(HAVE_IBVERBS) 
          "Building InfiniBand transport, but current RLIMIT_MEMLOCK value " 

          "will prevent successful runs.  Not running IB transport tests.")

      endif()

    else()

      set(RUN_IB_TESTS TRUE)

      set(RUN_NNTI_TESTS FALSE)

    endif()

  endif()



  if(EVPATH_TRANSPORT_MODULES)

    add_library(cmib MODULE cmib.c)

mtests/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ if(MPI_FOUND) 
  target_compile_options(mpi_trans_test PRIVATE ${MPI_C_COMPILE_FLAGS})

  target_link_libraries(mpi_trans_test evpath atl::atl ${MPI_C_LIBRARIES})

  target_include_directories(mpi_trans_test PRIVATE ${MPI_C_INCLUDE_PATH})

  target_compile_defintions(mpi_trans_test PRIVATE BUILD_WITH_MPI=1)



  target_compile_defintion(mpi_trans_test PRIVATE BUILD_WITH_MPI=1)

endif()



configure_file(

  ${CMAKE_CURRENT_SOURCE_DIR}/transport_test.pl

  ${CMAKE_CURRENT_BINARY_DIR}/transport_test.pl