-
Notifications
You must be signed in to change notification settings - Fork 14
Conversation
2243e7a
to
0f5b6d6
Compare
Sanity test is legacy, smoke test runs make sanity_tests under the hood.
All issues have been resolved --
There was one failure in I would like to handle the merge as I want to squash everything into one commit and re-word. |
This is a good catch. We also have other similar conditional declarations, e.g. for threading. We should get all definitions from |
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.
Thanks! There're some minor cmake comments
# TODO: use Folly::folly_deps? | ||
if(MSVC) | ||
find_package(Libevent COMPONENTS core REQUIRED) | ||
list(APPEND Folly_LIBRARIES libevent::core) |
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.
I think Folly::folly
already exports it, so you don't need it
@@ -49,6 +49,10 @@ if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) | |||
"Debug" "Release" "MinSizeRel" "RelWithDebInfo") | |||
endif () | |||
|
|||
# External Dependencies | |||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules") | |||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/omniscidb/cmake/Modules") |
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.
I wish we could avoid using any legacy cmake stuff
This PR is almost identical to #226, but includes one additional commit which propagates the folly compiler definition to the cython code. The previous segfault occurred because cython code was using a
std::shared_timed_mutex
, whereas the compiled libraries were usingfolly::mutex
.This does bring up an interesting issue which is the need to propagate compiler definitions to cython more generally. I just did a one-off to get folly working, but I am interested in ways to propagate the set definitions using cmake variables (as a followup).
Also, I found a cython flag to enable gdb. On ubuntu using the conda environment, this gave me enough debug symbols (with regular gdb) to get a stacktrace. I turned the flag off but left it in
setup.py.in
for future use.Supersedes #226