diff --git a/ports/nccl/portfile.cmake b/ports/nccl/portfile.cmake index e6c184daabe01b..5909c49d5acb20 100644 --- a/ports/nccl/portfile.cmake +++ b/ports/nccl/portfile.cmake @@ -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 @@ -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}) diff --git a/ports/nccl/vcpkg.json b/ports/nccl/vcpkg.json index 479c4df48ea0ab..47aeef6a62af7f 100644 --- a/ports/nccl/vcpkg.json +++ b/ports/nccl/vcpkg.json @@ -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": [ diff --git a/versions/baseline.json b/versions/baseline.json index 8e9a13b5bdda03..f9275747c92d90 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4678,7 +4678,7 @@ }, "nccl": { "baseline": "2.4.6", - "port-version": 1 + "port-version": 2 }, "ncurses": { "baseline": "6.3", diff --git a/versions/n-/nccl.json b/versions/n-/nccl.json index 67df8223421ad2..5739121ed520d0 100644 --- a/versions/n-/nccl.json +++ b/versions/n-/nccl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f07fdf26f53fd4974ad4cb6d6df430dc28e52aa", + "version": "2.4.6", + "port-version": 2 + }, { "git-tree": "c9b172ef032bf322539dab71b19f5dc27b679fd0", "version-string": "2.4.6",