Skip to content

[NCCL] Fix usage, add wrapper and install Find module file #22031

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.

Sign up for GitHub

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

Merged
strega-nil-ms merged 12 commits into from
Jan 12, 2022
Merged

[NCCL] Fix usage, add wrapper and install Find module file #22031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b81ddc6
fix-find_ncclConfig.cmake
Dec 15, 2021
8cbc7ef
update version
Dec 15, 2021
bce8834
change port-version
Dec 16, 2021
d1e04a7
update version
Dec 16, 2021
e6d9f37
update
Dec 16, 2021
1032461
update version
Dec 16, 2021
c305a29
update
Dec 16, 2021
f11a886
update version
Dec 16, 2021
5fec8d6
update port version
Dec 17, 2021
30aacab
update version
Dec 17, 2021
4774f16
Merge branch 'dev/Frank/NCCL' of https://github.com/FrankXie05/vcpkg …
Dec 17, 2021
08e532d
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
Jan 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ports/nccl/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
vcpkg_fail_port_install(ON_TARGET "Windows" "OSX" ON_ARCH "x86" "arm")

# Find NCCL. We can use FindNCCL directly since it doesn't call any functions
# that are disallowed in CMake script mode
Expand All @@ -16,4 +15,6 @@ else()
message(FATAL_ERROR "Please install NCCL using your system package manager (the same way you installed CUDA). For example: apt install libnccl2 libnccl-dev.")
endif()

file(INSTALL "${CURRENT_PORT_DIR}/FindNCCL.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
configure_file("${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
4 changes: 2 additions & 2 deletions ports/nccl/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "nccl",
"version-string": "2.4.6",
"port-version": 1,
"version": "2.4.6",
"port-version": 2,
"description": "Optimized primitives for collective multi-GPU communication.",
"supports": "linux & x64",
"dependencies": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4678,7 +4678,7 @@
},
"nccl": {
"baseline": "2.4.6",
"port-version": 1
"port-version": 2
},
"ncurses": {
"baseline": "6.3",
Expand Down
5 changes: 5 additions & 0 deletions versions/n-/nccl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "6f07fdf26f53fd4974ad4cb6d6df430dc28e52aa",
"version": "2.4.6",
"port-version": 2
},
{
"git-tree": "c9b172ef032bf322539dab71b19f5dc27b679fd0",
"version-string": "2.4.6",
Expand Down