Merge pull request #77 from shintaro-iwasaki/SymlinkArgobotsLibraries

Install Argobots in LIBOMP_LIBRARY_DIR for testing

Author: shintaro-iwasaki

libomptarget/test/lit.cfg

@@ -64,12 +64,6 @@ else: # Unices
     append_dynamic_library_path('LD_LIBRARY_PATH', \
         config.omp_host_rtl_directory, ":")
 
-# Setup BOLT flag
-if config.using_abt:
-    config.available_features.add('abt')
-    config.test_flags += " -L " + config.libabt_dir + "/lib" + \
-        " -Wl,-rpath," + config.libabt_dir + "/lib -labt"
-
 # substitutions
 # - for targets that exist in the system create the actual command.
 # - for valid targets that do not exist in the system, return false, so that the

libomptarget/test/lit.site.cfg.in

@@ -10,8 +10,6 @@ config.library_dir = "@LIBOMPTARGET_LIBRARY_DIR@"
 config.omp_header_directory = "@LIBOMPTARGET_OPENMP_HEADER_FOLDER@"
 config.omp_host_rtl_directory = "@LIBOMPTARGET_OPENMP_HOST_RTL_FOLDER@"
 config.operating_system = "@CMAKE_SYSTEM_NAME@"
-config.using_abt = @LIBOMP_TEST_USE_ARGOBOTS@
-config.libabt_dir = "@LIBOMP_ARGOBOTS_INSTALL_DIR@"
 config.libomptarget_all_targets = "@LIBOMPTARGET_ALL_TARGETS@".split()
 config.libomptarget_system_targets = "@LIBBOLTTARGET_SYSTEM_TARGETS@".split()
 config.libomptarget_filecheck = "@OPENMP_FILECHECK_EXECUTABLE@"

runtime/cmake/LibboltSymlinkArgobots.cmake

@@ -0,0 +1,13 @@
+# Create symbolic links for testing.
+
+FILE(GLOB LIBOMP_ARGOBOTS_LIBS "${LIBOMP_ARGOBOTS_INSTALL_DIR}/lib/${SHARED_LIBRARY_PREFIX}*${SHARED_LIBRARY_SUFFIX}*")
+foreach(LIBOMP_ARGOBOTS_LIB IN LISTS LIBOMP_ARGOBOTS_LIBS)
+  get_filename_component(LIBOMP_ARGOBOTS_LIB_NAME "${LIBOMP_ARGOBOTS_LIB}" NAME)
+  execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink "${LIBOMP_ARGOBOTS_LIB}" "${LIBOMP_ARGOBOTS_LIB_NAME}"
+    WORKING_DIRECTORY ${LIBBOLT_LIBRARY_DIR}
+  )
+endforeach()
+execute_process(
+  COMMAND ${CMAKE_COMMAND} -E create_symlink ${LIBOMP_ARGOBOTS_INSTALL_DIR}/include/abt.h abt.h
+    WORKING_DIRECTORY ${LIBBOLT_INCLUDE_DIR}
+)

runtime/src/CMakeLists.txt

@@ -186,6 +186,20 @@ if(NOT WIN32)
   endif()
 endif()
 
+# Add symbolic links to Argobots to the runtime path for testing
+if(${LIBOMP_USE_ARGOBOTS})
+  add_custom_command(TARGET bolt-omp POST_BUILD
+    COMMAND ${CMAKE_COMMAND}
+            -D LIBOMP_ARGOBOTS_INSTALL_DIR="${LIBOMP_ARGOBOTS_INSTALL_DIR}"
+            -D LIBBOLT_LIBRARY_DIR="${LIBBOLT_LIBRARY_DIR}"
+            -D LIBBOLT_INCLUDE_DIR="${CMAKE_CURRENT_BINARY_DIR}"
+            -D SHARED_LIBRARY_SUFFIX="${CMAKE_SHARED_LIBRARY_SUFFIX}"
+            -D SHARED_LIBRARY_PREFIX="${CMAKE_SHARED_LIBRARY_PREFIX}"
+            -P "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/LibboltSymlinkArgobots.cmake"
+    WORKING_DIRECTORY ${LIBBOLT_LIBRARY_DIR}
+  )
+endif()
+
 # Linking command will include libraries in LIBOMP_CONFIGURED_LIBFLAGS
 libomp_get_libflags(LIBOMP_CONFIGURED_LIBFLAGS)
 target_link_libraries(bolt-omp ${LIBOMP_CONFIGURED_LIBFLAGS} ${CMAKE_DL_LIBS})

runtime/test/lit.cfg

@@ -69,9 +69,6 @@ if config.using_hwloc:
 if config.using_abt:
     config.available_features.add('abt')
     libs += " -labt"
-    config.test_flags += " -L " + config.libabt_dir + "/lib" + \
-        " -Wl,-rpath," + config.libabt_dir + "/lib" \
-        " -I " + config.libabt_dir + "/include"
     # Some tasking tests require larger stack size.
     config.environment['ABT_THREAD_STACKSIZE'] = "262144"
     # Sleep alleviates oversubscription overheads when -j is specified.

runtime/test/lit.site.cfg.in

@@ -13,7 +13,6 @@ config.operating_system = "@CMAKE_SYSTEM_NAME@"
 config.hwloc_library_dir = "@LIBOMP_HWLOC_LIBRARY_DIR@"
 config.using_hwloc = @LIBOMP_USE_HWLOC@
 config.using_abt = @LIBOMP_TEST_USE_ARGOBOTS@
-config.libabt_dir = "@LIBOMP_ARGOBOTS_INSTALL_DIR@"
 config.has_ompt = @LIBBOLT_OMPT_SUPPORT@ and @LIBOMP_OMPT_OPTIONAL@
 config.has_libm = @LIBOMP_HAVE_LIBM@
 config.has_libatomic = @LIBOMP_HAVE_LIBATOMIC@