Update metagraph to 0.4.5 #59714
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Member
There was a problem hiding this comment. can you please make sure, this gets upstreamed?
Contributor
Author
There was a problem hiding this comment. Yes, it's already in the master branch and will be in the next release. So, this patch can be removed in the next release. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| diff --git a/metagraph/CMakeLists.txt b/metagraph/CMakeLists.txt | ||
| index e651d2176..2371386b7 100644 | ||
| --- a/metagraph/CMakeLists.txt | ||
| +++ b/metagraph/CMakeLists.txt | ||
| @@ -331,16 +331,17 @@ find_package(Boost REQUIRED COMPONENTS iostreams) | ||
|
|
||
| findFolly() | ||
| if(FOLLY_FOUND) | ||
| - add_definitions(-D_USE_FOLLY -DUSE_JEMALLOC) | ||
| + add_definitions(-D_USE_FOLLY) | ||
| + if(Jemalloc_FOUND) | ||
| + add_definitions(-DUSE_JEMALLOC) | ||
| + else() | ||
| + message(WARNING "Jemalloc not found, some optimizations will be disabled.") | ||
| + endif() | ||
| include_directories(SYSTEM | ||
| external-libraries/folly | ||
| ${CMAKE_BINARY_DIR}/external-libraries/folly/include | ||
| ) | ||
| set(METALIBS ${METALIBS} fbvector) | ||
| -else() | ||
| - message(WARNING "Prerequisites for Folly (Facebook Open Source Library) not found." | ||
| - " Install jemalloc to compile with folly and enable various" | ||
| - " optimizations as well as reduce memory taken up by the Row-Compressed annotator.") | ||
| endif() | ||
|
|
||
| # makes ASIO not depend on boost | ||
| diff --git a/metagraph/CMakeListsHelpers.txt b/metagraph/CMakeListsHelpers.txt | ||
| index d7777c644..fd01b885d 100644 | ||
| --- a/metagraph/CMakeListsHelpers.txt | ||
| +++ b/metagraph/CMakeListsHelpers.txt | ||
| @@ -7,7 +7,7 @@ function (findOpenMP) | ||
| # and happily cached, thus messing up the compilation flags forever | ||
| unset(OpenMP_C_FLAGS CACHE) | ||
| unset(OpenMP_CXX_FLAGS CACHE) | ||
| -if(APPLE AND NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU") | ||
| +if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") | ||
| execute_process( | ||
| COMMAND brew --prefix libomp | ||
| OUTPUT_VARIABLE BREW_OMP_PREFIX | ||
| @@ -90,27 +90,25 @@ if(Jemalloc_FOUND) | ||
| endif() | ||
| endif() | ||
|
|
||
| -if(Jemalloc_FOUND) | ||
| - message(STATUS "Configuring Folly") | ||
| - include(external-libraries/folly/CMake/FollyConfigChecks.cmake) | ||
| - configure_file( | ||
| - external-libraries/folly/CMake/folly-config.h.cmake | ||
| - ${CMAKE_BINARY_DIR}/external-libraries/folly/include/folly/folly-config.h | ||
| - ) | ||
| - add_library(fbvector STATIC | ||
| - external-libraries/folly/folly/ScopeGuard.cpp | ||
| - external-libraries/folly/folly/memory/detail/MallocImpl.cpp | ||
| - ) | ||
| - target_include_directories(fbvector SYSTEM PRIVATE | ||
| - ${JEMALLOC_INCLUDE_DIRS} | ||
| - ${Boost_INCLUDE_DIRS} | ||
| - external-libraries/folly | ||
| - ${CMAKE_BINARY_DIR}/external-libraries/folly/include | ||
| - ${PROJECT_SOURCE_DIR}/src/common | ||
| - ) | ||
| - target_link_libraries(fbvector PRIVATE ${JEMALLOC_LIBRARIES} ${Boost_LIBRARIES}) | ||
| - set(FOLLY_FOUND TRUE PARENT_SCOPE) | ||
| -endif() | ||
| +message(STATUS "Configuring Folly") | ||
| +include(external-libraries/folly/CMake/FollyConfigChecks.cmake) | ||
| +configure_file( | ||
| + external-libraries/folly/CMake/folly-config.h.cmake | ||
| + ${CMAKE_BINARY_DIR}/external-libraries/folly/include/folly/folly-config.h | ||
| +) | ||
| +add_library(fbvector STATIC | ||
| + external-libraries/folly/folly/ScopeGuard.cpp | ||
| + external-libraries/folly/folly/memory/detail/MallocImpl.cpp | ||
| +) | ||
| +target_include_directories(fbvector SYSTEM PRIVATE | ||
| + ${JEMALLOC_INCLUDE_DIRS} | ||
| + ${Boost_INCLUDE_DIRS} | ||
| + external-libraries/folly | ||
| + ${CMAKE_BINARY_DIR}/external-libraries/folly/include | ||
| + ${PROJECT_SOURCE_DIR}/src/common | ||
| +) | ||
| +target_link_libraries(fbvector PRIVATE ${JEMALLOC_LIBRARIES} ${Boost_LIBRARIES}) | ||
| +set(FOLLY_FOUND TRUE PARENT_SCOPE) | ||
| endfunction() |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is this Linux only?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There were issues with compiling with jemalloc.
It couldn't find the jemalloc headers. When I compile locally on my MacOS, everything works. So it's a bit difficult to troubleshoot this, as this appears to be specific to the online setup and paths where it installs packages.