Commit 75c8b9fb authored by Patrick McCormick's avatar Patrick McCormick
Browse files

Yet another attempt to address build issues that are clearly a race condition 

on build order that can vary between parallel job size as well as platform (e.g.,
faster systems are builds are more likely to fail).   This hopefully stems from
a dependency issue but could also be impacted by bugs in either ninja or cmake.
Would suggest updating to use the latest ninja (1.10.2) and cmake -- both were
used on the final pass of testing before this commit.
parent 2b646c27

kitsune/cmake/modules/KitsuneUtils.cmake

+6 −5
Original line number Diff line number Diff line
@@ -42,11 +42,13 @@ endmacro() 
function(add_tapir_dependency target abi)

  message(STATUS "adding dependency for ${target} w/ -ftapir=${abi}")

  if (${abi} STREQUAL "opencilk")

    set(dep_list ${dep_list} cheetah PARENT_SCOPE)

    list(APPEND dep_list cheetah_personality_c_static;cheetah_personality_cpp_static;cheetah_personality_c_static;cheetah_static;cheetah_abi_bc)

    set(target_libs ${target_libs} opencilk opencilk-personality-cpp PARENT_SCOPE)

    add_dependencies(${target} ${dep_list})    

  elseif(${abi} STREQUAL "realm")

    set(dep_list ${dep_list} RealmABI PARENT_SCOPE)

    list(APPEND dep_list RealmABI)

    set(target_libs ${target_libs} realm-abi realm PARENT_SCOPE)

    add_dependencies(${target} ${dep_list})        

  elseif(${abi} STREQUAL "none")

    message(STATUS "no dependencies for '-ftapir=none'...")

  elseif(${abi} STREQUAL "serial")
@@ -55,7 +57,6 @@ function(add_tapir_dependency target abi) 
    message(FATAL_ERROR

       "tapir dependency ${abi} not handled in add_tapir_dependency")

  endif()

  if (dep_list) 

    add_dependencies(${target} ${dep_list})

  endif()



endfunction()

kitsune/examples/forall/CMakeLists.txt

+0 −2
Original line number Diff line number Diff line
@@ -64,11 +64,9 @@ foreach(rt IN ITEMS ${_tapir_rt_targets}) 
      ${KITSUNE_INCLUDE_DIR})

    target_compile_options(${exec_name} 

      PRIVATE

      -v

      -ftapir=${rt})

    target_link_options(${exec_name} 

      PRIVATE 

      -v

      -ftapir=${rt})

    set(dep_list "")

    set(target_libs "")

kitsune/examples/kokkos/CMakeLists.txt

+0 −2
Original line number Diff line number Diff line
@@ -100,13 +100,11 @@ foreach(rt IN ITEMS ${_tapir_rt_targets}) 
      ${KITSUNE_KOKKOS_SRC_DIR}/containers/src)

    target_compile_options(${exec_name}

      PRIVATE

      -v

      -fkokkos

      -fkokkos-no-init

      -ftapir=${rt})

    target_link_options(${exec_name}

      PRIVATE

      -v

      -fkokkos

      -ftapir=${rt})

    set(dep_list kokkos kokkoscore)