Cherry-picks for 1.9.x-aws #385
Merged
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
Add libpthread to the library list, so it will be directly linked in both the net plugin and executables. The plugin uses pthreads, so should have been including this by default. We got lucky because the pthread calls were in something we were building as a .so and not in the unit tests. But breaking that in a future commit breaks the getting lucky part of the equation. Signed-off-by: Brian Barrett <bbarrett@amazon.com> (cherry picked from commit 53d1e90)
The tuner uses the log2 function that is defined in libm, but we were relying on someone else to pull in libm, which is technically wrong. Checking for what library provides libm fixes this issue, with the side effect of adding a -lm to the link line for the libnccl-net plugin. This is not strictly needed, but linkers also will do the right thing most of the time and not actually include that dependency in the list of libraries that must be loaded for the plugin. So this is a lot less configure code compared to each plugin having its own LIBS list, for the same outcome. Signed-off-by: Brian Barrett <bbarrett@amazon.com> (cherry picked from commit 5a27309)
The plugins don't have a link-time dependency on libcuda.so, so only check for the library if we actually need it (ie, we're building the functional tests). This works around a problem building on containers, where it's likely that the libcuda.so library is either not there or stubbed out (to be pulled up from the base AMI later). Signed-off-by: Brian Barrett <bbarrett@amazon.com>
rajachan
added
the
BuildTriggerRequest
bwbarrett
approved these changes
Apr 11, 2024
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.
2cebf50 cuda: Tie libcuda check and tests
ea2f19b Add -lm to library list for plugins
1475da5 Add libpthread to library list
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.