Update w2dynamics.patch

TRIQS · Mar 15, 2024 · 903ffbb · 903ffbb
1 parent bcf2e7d
commit 903ffbb
Show file tree

Hide file tree

Showing 2 changed files with 165 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -85,7 +85,7 @@ ExternalProject_Add(w2dynamics
              -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
              -DFFTW_LIBRARIES=${FFTW_LIBRARIES}
   INSTALL_COMMAND ""
-  # PATCH_COMMAND ${TRIQS_GIT_EXECUTABLE} checkout . && ${TRIQS_GIT_EXECUTABLE} apply ${PROJECT_SOURCE_DIR}/w2dynamics.patch
+  PATCH_COMMAND ${TRIQS_GIT_EXECUTABLE} checkout . && ${TRIQS_GIT_EXECUTABLE} apply ${PROJECT_SOURCE_DIR}/w2dynamics.patch
 )
 
 set(W2DYN_ROOT ${PROJECT_BINARY_DIR}/w2dyn_project/src/w2dynamics)

diff --git a/w2dynamics.patch b/w2dynamics.patch
@@ -0,0 +1,164 @@
+diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
+index ff8e650..7e283b0 100644
+--- a/.github/workflows/build.yml
++++ b/.github/workflows/build.yml
+@@ -47,5 +47,7 @@ jobs:
+
+     - name: Test
+       run: |
++        env "PYTHONPATH=$PWD/w2dyn/auxiliaries:$PYTHONPATH" python3 -c 'import CTQMC'
++        env "PYTHONPATH=$PWD/w2dyn/maxent:$PYTHONPATH" python3 -c 'import MAXENT'
+         cd build
+         ctest --output-on-failure
+diff --git a/src/ctqmc_fortran/CMakeLists.txt b/src/ctqmc_fortran/CMakeLists.txt
+index 33faafa..9eed7fd 100644
+--- a/src/ctqmc_fortran/CMakeLists.txt
++++ b/src/ctqmc_fortran/CMakeLists.txt
+@@ -48,62 +48,28 @@ if (USE_NFFT)
+ endif (USE_NFFT)
+
+   set(_name CTQMC)
+-  set (CPPSTDLIBRARY "-lstdc++")#placeholder if we decide to better parse platforms in the future...
+-
+-  # hack to not pass .dylib or .framework library file names directly
+-  # because f2py does not accept them as arguments
+-  function(rephrase_dylib TARGET_VAR LIBRARIES_STRING)
+-    set(RESULT_LIST "")
+-    foreach(entry ${LIBRARIES_STRING})
+-      string(TOUPPER "${entry}" upcaseentry)
+-      if(upcaseentry MATCHES "LIB([A-Za-z0-9_]*)\\.DYLIB$")
+-	get_filename_component(entry_dir "${entry}" DIRECTORY)
+-	string(LENGTH "${CMAKE_MATCH_1}" libname_length)
+-	string(FIND "${upcaseentry}" "${CMAKE_MATCH_1}" libname_begin REVERSE)
+-	string(SUBSTRING "${entry}" "${libname_begin}" "${libname_length}" libname)
+-	list(APPEND RESULT_LIST "-L${entry_dir}" "-l${libname}")
+-      elseif((upcaseentry MATCHES ".*ACCELERATE\\.FRAMEWORK.*") OR (upcaseentry MATCHES ".*VECLIB\\.FRAMEWORK.*"))
+-	# f2py will use numpy.distutils.system_info
+-	list(APPEND RESULT_LIST "--link-accelerate")
+-      else()
+-	list(APPEND RESULT_LIST "${entry}")
+-      endif()
+-    endforeach()
+-    set("${TARGET_VAR}" "${RESULT_LIST}" PARENT_SCOPE)
+-  endfunction()
+-
+-  if (FFTW_LIBRARIES)
+-    rephrase_dylib(FFTW_LIBRARIES "${FFTW_LIBRARIES}")
+-  endif ()
+-
+-  if (NFFT_LIBRARIES)
+-    rephrase_dylib(NFFT_LIBRARIES "${NFFT_LIBRARIES}")
+-  endif ()
+-
+-  if (BLAS_LIBRARIES)
+-    rephrase_dylib(BLAS_LIBRARIES "${BLAS_LIBRARIES}")
+-  endif ()
+-
+-  if (LAPACK_LIBRARIES)
+-    rephrase_dylib(LAPACK_LIBRARIES "${LAPACK_LIBRARIES}")
+-  endif ()
+-
+   # Define the command to generate the Fortran to Python interface module. The
+   # output will be a shared library that can be imported by python.
+   add_custom_command(
+-    OUTPUT ${_name}module.c ${_name}-f2pywrappers.f
++    OUTPUT ${_name}module.c ${_name}-f2pywrappers.f ${_name}-f2pywrappers2.f90
+     DEPENDS CTQMC.F90 .f2py_f2cmap
+     VERBATIM
++    COMMAND "${CMAKE_COMMAND}" -E touch "${_name}module.c" "${_name}-f2pywrappers.f" "${_name}-f2pywrappers2.f90"
+     COMMAND "${Python_EXECUTABLE}" -m numpy.f2py
+             "${CMAKE_CURRENT_SOURCE_DIR}/CTQMC.F90" -m ${_name} --lower
+             --f2cmap "${CMAKE_CURRENT_SOURCE_DIR}/.f2py_f2cmap")
+
+-  python_add_library(${_name} MODULE "${CMAKE_CURRENT_BINARY_DIR}/${_name}module.c"
+-                     "${CMAKE_CURRENT_SOURCE_DIR}/CTQMC.F90" WITH_SOABI)
++  python_add_library(${_name} MODULE WITH_SOABI
++                     "${CMAKE_CURRENT_BINARY_DIR}/${_name}module.c"
++                     "${CMAKE_CURRENT_BINARY_DIR}/${_name}-f2pywrappers.f"
++                     "${CMAKE_CURRENT_BINARY_DIR}/${_name}-f2pywrappers2.f90"
++                     "${CMAKE_CURRENT_SOURCE_DIR}/CTQMC.F90")
+   set_source_files_properties("${CMAKE_CURRENT_BINARY_DIR}/${_name}module.c" PROPERTIES
+-    COMPILE_OPTIONS $<$<AND:$<CXX_COMPILER_ID:Clang>,$<VERSION_GREATER_EQUAL:$<CXX_COMPILER_VERSION>,16>>:-Wno-error=incompatible-function-pointer-types>)
+-  target_link_libraries(${_name} PRIVATE fortranobject)
+-  target_link_libraries(${_name} PUBLIC CTQMCLIB $<$<BOOL:${USE_NFFT}>:nfft>)
++    COMPILE_OPTIONS $<$<AND:$<C_COMPILER_ID:Clang>,$<VERSION_GREATER_EQUAL:$<C_COMPILER_VERSION>,16>>:-Wno-error=incompatible-function-pointer-types>)
++  target_link_libraries(${_name} PRIVATE fortranobject CTQMCLIB ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES} ${FFTW_LIBRARIES} $<$<BOOL:${USE_NFFT}>:nfft>)
++  add_custom_command(TARGET ${_name} POST_BUILD
++    COMMAND ${CMAKE_COMMAND} -E copy -t "${CMAKE_SOURCE_DIR}/w2dyn/auxiliaries" $<TARGET_FILE:${_name}>
++    COMMAND_EXPAND_LISTS)
+
+ IF(WIN32)
+     SET(CMAKE_INSTALL_PREFIX "C:\\Program Files")
+diff --git a/src/maxent/CMakeLists.txt b/src/maxent/CMakeLists.txt
+index f8f9ca5..c8e59ce 100644
+--- a/src/maxent/CMakeLists.txt
++++ b/src/maxent/CMakeLists.txt
+@@ -31,56 +31,30 @@ SET_PROPERTY(TARGET MAXENTLIB PROPERTY POSITION_INDEPENDENT_CODE ON)
+
+ set_target_properties(MAXENTLIB PROPERTIES COMPILE_FLAGS "-DLAPACK77_Interface")
+
+-# hack to not pass .dylib or .framework library file names directly
+-# because f2py does not accept them as arguments
+-function(rephrase_dylib TARGET_VAR LIBRARIES_STRING)
+-  set(RESULT_LIST "")
+-  foreach(entry ${LIBRARIES_STRING})
+-    string(TOUPPER "${entry}" upcaseentry)
+-    if(upcaseentry MATCHES "LIB([A-Za-z0-9_]*)\\.DYLIB$")
+-      get_filename_component(entry_dir "${entry}" DIRECTORY)
+-      string(LENGTH "${CMAKE_MATCH_1}" libname_length)
+-      string(FIND "${upcaseentry}" "${CMAKE_MATCH_1}" libname_begin REVERSE)
+-      string(SUBSTRING "${entry}" "${libname_begin}" "${libname_length}" libname)
+-      list(APPEND RESULT_LIST "-L${entry_dir}" "-l${libname}")
+-    elseif((upcaseentry MATCHES ".*ACCELERATE\\.FRAMEWORK.*") OR (upcaseentry MATCHES ".*VECLIB\\.FRAMEWORK.*"))
+-      # f2py will use numpy.distutils.system_info
+-      list(APPEND RESULT_LIST "--link-accelerate")
+-    else()
+-      list(APPEND RESULT_LIST "${entry}")
+-    endif()
+-  endforeach()
+-  set("${TARGET_VAR}" "${RESULT_LIST}" PARENT_SCOPE)
+-endfunction()
+-
+-if (BLAS_LIBRARIES)
+-  rephrase_dylib(BLAS_LIBRARIES "${BLAS_LIBRARIES}")
+-endif ()
+-
+-if (LAPACK_LIBRARIES)
+-  rephrase_dylib(LAPACK_LIBRARIES "${LAPACK_LIBRARIES}")
+-endif ()
+-
+-set(EXTERNAL_LIBRARIES ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES})
+-
+   set( _name MAXENT )
+   # Define the command to generate the Fortran to Python interface module. The
+   # output will be a shared library that can be imported by python.
+   set(ADDITIONAL_OPTS -fPIC -DLAPACK77_Interface)
+   add_custom_command(
+-    OUTPUT ${_name}module.c ${_name}-f2pywrappers.f
++    OUTPUT ${_name}module.c ${_name}-f2pywrappers.f ${_name}-f2pywrappers2.f90
+     DEPENDS MaximumEntropy.F90 .f2py_f2cmap
+     VERBATIM
++    COMMAND "${CMAKE_COMMAND}" -E touch "${_name}module.c" "${_name}-f2pywrappers.f" "${_name}-f2pywrappers2.f90"
+     COMMAND "${Python_EXECUTABLE}" -m numpy.f2py
+             "${CMAKE_CURRENT_SOURCE_DIR}/MaximumEntropy.F90" -m ${_name} --lower
+             --f2cmap "${CMAKE_CURRENT_SOURCE_DIR}/.f2py_f2cmap")
+
+-  python_add_library(${_name} MODULE "${CMAKE_CURRENT_BINARY_DIR}/${_name}module.c"
+-                     "${CMAKE_CURRENT_SOURCE_DIR}/MaximumEntropy.F90" WITH_SOABI)
++  python_add_library(${_name} MODULE WITH_SOABI
++                     "${CMAKE_CURRENT_BINARY_DIR}/${_name}module.c"
++                     "${CMAKE_CURRENT_BINARY_DIR}/${_name}-f2pywrappers.f"
++                     "${CMAKE_CURRENT_BINARY_DIR}/${_name}-f2pywrappers2.f90"
++                     "${CMAKE_CURRENT_SOURCE_DIR}/MaximumEntropy.F90")
+   set_source_files_properties("${CMAKE_CURRENT_BINARY_DIR}/${_name}module.c" PROPERTIES
+-    COMPILE_OPTIONS $<$<AND:$<CXX_COMPILER_ID:Clang>,$<VERSION_GREATER_EQUAL:$<CXX_COMPILER_VERSION>,16>>:-Wno-error=incompatible-function-pointer-types>)
+-  target_link_libraries(${_name} PRIVATE fortranobject)
+-  target_link_libraries(${_name} PUBLIC MAXENTLIB)
++    COMPILE_OPTIONS $<$<AND:$<C_COMPILER_ID:Clang>,$<VERSION_GREATER_EQUAL:$<C_COMPILER_VERSION>,16>>:-Wno-error=incompatible-function-pointer-types>)
++  target_link_libraries(${_name} PRIVATE fortranobject MAXENTLIB ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES})
++  add_custom_command(TARGET ${_name} POST_BUILD
++    COMMAND ${CMAKE_COMMAND} -E copy -t "${CMAKE_SOURCE_DIR}/w2dyn/maxent" $<TARGET_FILE:${_name}>
++    COMMAND_EXPAND_LISTS)
+
+ #####################################
+ # Tell how to install this executable