[Consumer] Added fabric support for python. TODO: Windows

consumer/api/python/CMakeLists_Linux.cmake

+
+if (ENABLE_LIBFABRIC)
+    set (TEMP_ADDITIONAL_LINK_ARGS_PART ", '-lfabric'")
+else()
+    set (TEMP_ADDITIONAL_LINK_ARGS_PART "")
+endif()
+
 if ((CMAKE_BUILD_TYPE STREQUAL "Debug") AND (CMAKE_C_COMPILER_ID STREQUAL "GNU"))
     set (EXTRA_COMPILE_ARGS "['--std=c++11']")
-    set (EXTRA_LINK_ARGS "['--coverage','-fprofile-arcs','-ftest-coverage','-static-libgcc','-static-libstdc++']")
+    set (EXTRA_LINK_ARGS "['--coverage','-fprofile-arcs','-ftest-coverage','-static-libgcc','-static-libstdc++' ${TEMP_ADDITIONAL_LINK_ARGS_PART}]")
 ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
     set (EXTRA_COMPILE_ARGS "['--std=c++11']")
-    set (EXTRA_LINK_ARGS "['-static-libgcc','-static-libstdc++','-Wl,--exclude-libs,ALL']")
+    set (EXTRA_LINK_ARGS "['-static-libgcc','-static-libstdc++','-Wl,--exclude-libs,ALL' ${TEMP_ADDITIONAL_LINK_ARGS_PART}]")
 else()
     set (EXTRA_COMPILE_ARGS "['-std=c++11']")
-    set (EXTRA_LINK_ARGS "[]")
+    set (EXTRA_LINK_ARGS "[${TEMP_ADDITIONAL_LINK_ARGS_PART}]")
 ENDIF()
 
 configure_files(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} @ONLY)

consumer/api/python/setup.py.in

@@ -6,7 +6,7 @@ from Cython.Build import cythonize
 import numpy
 
 module = Extension("asapo_consumer", ["asapo_consumer.pyx"],
-                       extra_objects=['$<TARGET_FILE:asapo-consumer>',
+                       extra_objects=['$<TARGET_FILE:asapo-consumer>','$<TARGET_FILE:asapo-fabric>',
                                       '@CURL_LIBRARIES@'],
                        include_dirs=["@ASAPO_CXX_COMMON_INCLUDE_DIR@","@ASAPO_CONSUMER_INCLUDE_DIR@",numpy.get_include()],
                        extra_compile_args=@EXTRA_COMPILE_ARGS@,

consumer/api/python/source_dist_linux/CMakeLists.txt

@@ -17,6 +17,7 @@ ADD_CUSTOM_TARGET(copy_python_dist ALL
         COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/lib
         COMMAND ${CMAKE_COMMAND} -E copy ${CURL_LIBRARIES} ${CMAKE_CURRENT_BINARY_DIR}/lib
         COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:asapo-consumer> ${CMAKE_CURRENT_BINARY_DIR}/lib
+        COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:asapo-fabric> ${CMAKE_CURRENT_BINARY_DIR}/lib
 
         )
 

consumer/api/python/source_dist_linux/setup.py.in

@@ -2,9 +2,10 @@ from distutils.core import setup
 from distutils.core import Extension
 import numpy
 
+# TODO 'lib/libcurl.a' seems to have no effect, because there is a libcurl.so file
 ext_modules = [
     Extension("asapo_consumer", ["asapo_consumer.cpp"],
-              extra_objects=['lib/libasapo-consumer.a', 'lib/libcurl.a'],
+              extra_objects=['lib/libasapo-consumer.a', 'lib/libasapo-fabric.a', 'lib/libcurl.a'],
                        include_dirs=["include/common","include",numpy.get_include()],
                        extra_compile_args=@EXTRA_COMPILE_ARGS@,
                        extra_link_args=@EXTRA_LINK_ARGS@,