-
Notifications
You must be signed in to change notification settings - Fork 3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
SKETCH-2181. Sketcher/rdkit_extensions build infrastructure; macOS runner works #6
Merged
cdvonbargen
merged 6 commits into
schrodinger:main
from
cdvonbargen:ExternalProject_Add
Mar 14, 2024
Merged
SKETCH-2181. Sketcher/rdkit_extensions build infrastructure; macOS runner works #6
cdvonbargen
merged 6 commits into
schrodinger:main
from
cdvonbargen:ExternalProject_Add
Mar 14, 2024
Conversation
This file contains 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
cdvonbargen
requested review from
ricrogz,
KevKeating,
ZontaNicola and
ethan-schrodinger
March 11, 2024 22:43
Just for reference, I abandoned #5 which uses FetchContent_Declare for this setup using ExternalProject_Add -- annoyingly, many projects don't adhere to CMake conventions that would make FetchContent_Declare friendly, so I just gave up. |
ricrogz
approved these changes
Mar 12, 2024
KevKeating
reviewed
Mar 13, 2024
KevKeating
approved these changes
Mar 14, 2024
ricrogz
reviewed
Mar 14, 2024
ricrogz
approved these changes
Mar 14, 2024
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.
LGTM
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Added a pair of CMakeLIsts.txt and github runner yaml files for building:
The cmake file in external/ uses
ExternalProject_Add
to pulls dependencies down from github, apply patches if necessary, and configure/build/install the dependency as static libs using cmake itself. The build-external/action.yml action will build one dependency library target in that cmake file if the requested version/os has not been built before, using actions/cache@v4. (Should I also cache on a SHA of the cmake file? a SHA of all of external?)NOTE: the point of using
ExternalProject_Add
is to hopefully streamline a WASM build since everything is built with CMake.There are two patches to the dependency libraries:
The toplevel cmake file builds the rdkit_extensions and sketcher libraries, tests for both libraries, and the sketcher_app executable. The interesting/different bit here is that because we compile static libs in the runners, both libraries require a define that clear out the declspec (LIBNAME_STATIC_DEFINE) which is the only small, necessary departure from our existing definition.h files (which are always used to build shared libraries).
I also have a script that will build this toy system using /software/lib/, but it sadly doesn't work for our installed RDKit builds (see SHARED-10015) so that will have to wait for another day.
List of things I didn't figure out:
;
forcing me to use$<SEMICOLON>
in a couple places-fvisibility=hidden
to mac/linux because I gotld: warning: direct access in function to global weak symbol from file means the weak symbol cannot be overridden at runtime. This was likely caused by different translation units being compiled with different visibility settings.
when building against RDKit. I assume I need to pass that to RDK too, but we can spin that out as a separate ticket.I can spin those out a cleanup case, but would be happy for any pointers!
Testing Done
Verified that the macOS runner succeeds; kicked out subtasks for linux, windows, and WASM