From 1bd7b7a42918c6fd180d390c69e64bf720114b7c Mon Sep 17 00:00:00 2001 From: luncliff Date: Wed, 16 Mar 2022 02:09:25 +0900 Subject: [PATCH 1/6] [tensorpipe] version update * update patch files * support find_package for https://github.com/microsoft/vcpkg/pull/17199 --- ports/tensorpipe/fix-cmakelists.patch | 90 +++++++++++++++---------- ports/tensorpipe/portfile.cmake | 8 ++- ports/tensorpipe/support-pybind11.patch | 30 --------- ports/tensorpipe/support-test.patch | 46 ++++++------- ports/tensorpipe/vcpkg.json | 3 +- 5 files changed, 83 insertions(+), 94 deletions(-) delete mode 100644 ports/tensorpipe/support-pybind11.patch diff --git a/ports/tensorpipe/fix-cmakelists.patch b/ports/tensorpipe/fix-cmakelists.patch index 172ac1e671e727..5dc39a594eb52f 100644 --- a/ports/tensorpipe/fix-cmakelists.patch +++ b/ports/tensorpipe/fix-cmakelists.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 640054e..18de9ea 100644 +index 77df76d..96da145 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,6 @@ include(MiscCheck) @@ -11,61 +11,79 @@ index 640054e..18de9ea 100644 - FILE TensorpipeTargets.cmake) +install(EXPORT tensorpipeTargets + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME} # share/tensorpipe -+ FILE tensorpipeTargets.cmake) ++ FILE tensorpipe-config.cmake) # we need config.cmake for find_package(tensorpipe CONFIG) diff --git a/tensorpipe/CMakeLists.txt b/tensorpipe/CMakeLists.txt -index d8624b4..dce5c6f 100644 +index efcffc2..5ef674e 100644 --- a/tensorpipe/CMakeLists.txt +++ b/tensorpipe/CMakeLists.txt -@@ -168,8 +168,9 @@ set(TP_PUBLIC_HEADERS ${TP_PUBLIC_HEADERS} - transport/uv/error.h - transport/uv/factory.h +@@ -119,8 +119,8 @@ list(APPEND TP_PUBLIC_HDRS transport/uv/utility.h) + + # Add uv package -find_package(uv REQUIRED) --target_link_libraries(tensorpipe PRIVATE uv::uv) -+# `libuv` in vcpkg +-list(APPEND TP_LINK_LIBRARIES uv::uv) +find_package(unofficial-libuv CONFIG REQUIRED) -+target_link_libraries(tensorpipe PUBLIC unofficial::libuv::libuv ${CMAKE_DL_LIBS}) ++list(APPEND TP_LINK_LIBRARIES unofficial::libuv::libuv) ### shm -@@ -233,11 +234,14 @@ configure_file(config.h.in config.h) - - ## Libnop - --# We should keep libnop headers private as they should not be exposed to downstream users, --# but they're currently transitively included by tensorpipe/transport/connection.h (which --# is still unclear whether it should be a public or private header). --target_include_directories(tensorpipe PUBLIC $) -- -+# `libnop` in vcpkg -+find_path(LIBNOP_INCLUDE_DIRS "nop/serializer.h") -+if(LIBNOP_INCLUDE_DIRS-NOTFOUND) -+ message(FATAL_ERROR "Failed to find header of the 'libnop' package from vcpkg.") -+else() -+ message(STATUS "Using 'libnop': ${LIBNOP_INCLUDE_DIRS}") -+endif() -+target_include_directories(tensorpipe PUBLIC $) +@@ -184,7 +184,8 @@ configure_file(config.h.in config.h) + # We should keep libnop headers private as they should not be exposed to downstream users, + # but they're currently transitively included by tensorpipe/transport/connection.h (which + # is still unclear whether it should be a public or private header). +-list(APPEND TP_INCLUDE_DIRS $) ++find_path(LIBNOP_INCLUDE_DIRS "nop/serializer.h" REQUIRED) ++list(APPEND TP_INCLUDE_DIRS $) - ## Python bindings -@@ -262,10 +266,17 @@ endif() + ## Target +@@ -204,8 +205,14 @@ target_include_directories(tensorpipe PUBLIC ${TP_INCLUDE_DIRS}) ## Install +install(DIRECTORY channel common core transport util -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tensorpipe ++ DESTINATION ${TP_INSTALL_INCLUDEDIR}/tensorpipe + FILES_MATCHING PATTERN "*.h") +install(FILES tensorpipe.h -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tensorpipe) ++ DESTINATION ${TP_INSTALL_INCLUDEDIR}/tensorpipe) + install(TARGETS tensorpipe - EXPORT TensorpipeTargets -- LIBRARY DESTINATION ${TP_INSTALL_LIBDIR} -- ARCHIVE DESTINATION ${TP_INSTALL_LIBDIR}) + EXPORT tensorpipeTargets -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${TP_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${TP_INSTALL_LIBDIR}) + +@@ -306,7 +313,7 @@ if(TP_USE_CUDA) + target_include_directories(tensorpipe_cuda PUBLIC ${TP_CUDA_INCLUDE_DIRS}) + + install(TARGETS tensorpipe_cuda +- EXPORT TensorpipeTargets ++ EXPORT tensorpipeTargets + LIBRARY DESTINATION ${TP_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${TP_INSTALL_LIBDIR}) + +diff --git a/tensorpipe/python/CMakeLists.txt b/tensorpipe/python/CMakeLists.txt +index ce49472..f6b6ab0 100644 +--- a/tensorpipe/python/CMakeLists.txt ++++ b/tensorpipe/python/CMakeLists.txt +@@ -4,13 +4,13 @@ + # This source code is licensed under the BSD-style license found in the + # LICENSE file in the root directory of this source tree. + +-if(NOT (COMMAND pybind11_add_module)) +- add_subdirectory( +- ${PROJECT_SOURCE_DIR}/third_party/pybind11 +- ${PROJECT_BINARY_DIR}/third_party/pybind11 +- EXCLUDE_FROM_ALL) +-endif() ++find_package(pybind11 CONFIG REQUIRED) + + set(PYBIND11_CPP_STANDARD -std=c++14) + pybind11_add_module(pytensorpipe tensorpipe.cc) +-target_link_libraries(pytensorpipe PRIVATE tensorpipe) ++target_link_libraries(pytensorpipe PRIVATE tensorpipe pybind11::module) ++ ++install(TARGETS pytensorpipe ++ EXPORT tensorpipeTargets + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - foreach(_header_file ${TP_PUBLIC_HEADERS}) - get_filename_component(_TP_HEADER_SUBDIR "${_header_file}" DIRECTORY) diff --git a/ports/tensorpipe/portfile.cmake b/ports/tensorpipe/portfile.cmake index b81a37c89117b7..751dec9ada2df8 100644 --- a/ports/tensorpipe/portfile.cmake +++ b/ports/tensorpipe/portfile.cmake @@ -3,12 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pytorch/tensorpipe - REF c5a21994bc766659f7f85edb75478e13f429f46c - SHA512 05a3989286610edea2f0fcfb9197c563e947f0386f2b52110dd060053d68b62477fcd4778a45a3030b9a53b6ceccead91e4dd96c9f0153023e97414459fbd8dd + REF 52791a2fd214b2a9dc5759d36725909c1daa7f2e + SHA512 1e5faf17a7236c5506c08cb28be16069b11bb929bbca64ed9745ce4277d46739186ab7d6597da7437d90ed2d166d4c37ef2f3bceabe8083ef3adbb0e8e5f227e PATCHES fix-cmakelists.patch support-test.patch - support-pybind11.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -33,6 +32,9 @@ vcpkg_cmake_configure( -DTP_ENABLE_CMA=OFF -DTP_BUILD_LIBUV=OFF # will use libuv package -DTP_ENABLE_CUDA_GDR=OFF + MAYBE_UNUSED_VARIABLES + TP_ENABLE_CUDA_GDR + TP_ENABLE_CUDA_IPC ) vcpkg_cmake_install() vcpkg_copy_pdbs() diff --git a/ports/tensorpipe/support-pybind11.patch b/ports/tensorpipe/support-pybind11.patch deleted file mode 100644 index 7a87cd285f4adc..00000000000000 --- a/ports/tensorpipe/support-pybind11.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/tensorpipe/python/CMakeLists.txt b/tensorpipe/python/CMakeLists.txt -index 41958dd..02562b4 100644 ---- a/tensorpipe/python/CMakeLists.txt -+++ b/tensorpipe/python/CMakeLists.txt -@@ -4,13 +4,17 @@ - # This source code is licensed under the BSD-style license found in the - # LICENSE file in the root directory of this source tree. - --if(NOT (COMMAND pybind11_add_module)) -- add_subdirectory( -- ${PROJECT_SOURCE_DIR}/third_party/pybind11 -- ${PROJECT_BINARY_DIR}/third_party/pybind11 -- EXCLUDE_FROM_ALL) --endif() -+find_package(pybind11 CONFIG REQUIRED) - --set(PYBIND11_CPP_STANDARD -std=c++14) - pybind11_add_module(pytensorpipe tensorpipe.cc) --target_link_libraries(pytensorpipe PRIVATE tensorpipe) -+set_target_properties(pytensorpipe -+PROPERTIES -+ CXX_STANDARD 14 -+) -+target_link_libraries(pytensorpipe PRIVATE tensorpipe pybind11::module) -+ -+install(TARGETS pytensorpipe -+ EXPORT tensorpipeTargets -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/ports/tensorpipe/support-test.patch b/ports/tensorpipe/support-test.patch index 16c54ab37dee05..af128048582cc2 100644 --- a/ports/tensorpipe/support-test.patch +++ b/ports/tensorpipe/support-test.patch @@ -1,39 +1,39 @@ diff --git a/tensorpipe/test/CMakeLists.txt b/tensorpipe/test/CMakeLists.txt -index c0320aa..1414bdd 100644 +index 53e8643..c49ada6 100644 --- a/tensorpipe/test/CMakeLists.txt +++ b/tensorpipe/test/CMakeLists.txt -@@ -86,11 +86,8 @@ if(TP_USE_CUDA) - endif() - - --add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/googletest -- ${PROJECT_BINARY_DIR}/third_party/googletest) -+find_package(GTest CONFIG REQUIRED) - - target_link_libraries(tensorpipe_test PRIVATE - tensorpipe -- uv::uv -- gmock -- gtest_main) -+ unofficial::libuv::libuv GTest::gmock GTest::gtest_main) - -diff --git a/tensorpipe/test/CMakeLists.txt b/tensorpipe/test/CMakeLists.txt -index fecc731..031e40d 100644 ---- a/tensorpipe/test/CMakeLists.txt -+++ b/tensorpipe/test/CMakeLists.txt -@@ -80,10 +80,11 @@ if(TP_USE_CUDA) +@@ -93,25 +93,24 @@ if(TP_USE_CUDA) channel/cuda_ipc/cuda_ipc_test.cc ) endif() - -- target_sources(tensorpipe_test PRIVATE +- list(APPEND TP_TEST_SRCS - channel/cuda_gdr/cuda_gdr_test.cc - ) +- + if(TP_ENABLE_CUDA_GDR) -+ target_sources(tensorpipe_test PRIVATE ++ list(APPEND TP_TEST_SRCS + channel/cuda_gdr/cuda_gdr_test.cc + ) + endif() + cuda_add_library(tensorpipe_cuda_kernel channel/kernel.cu) + list(APPEND TP_TEST_LINK_LIBRARIES tensorpipe_cuda_kernel) + + list(APPEND TP_TEST_LINK_LIBRARIES tensorpipe_cuda) endif() +-add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/googletest +- ${PROJECT_BINARY_DIR}/third_party/googletest EXCLUDE_FROM_ALL) ++find_package(GTest CONFIG REQUIRED) + + list(APPEND TP_TEST_LINK_LIBRARIES + tensorpipe +- uv::uv +- gmock +- gtest_main) ++ unofficial::libuv::libuv ++ GTest::gmock ++ GTest::gtest_main) + + add_executable(tensorpipe_test ${TP_TEST_SRCS}) diff --git a/ports/tensorpipe/vcpkg.json b/ports/tensorpipe/vcpkg.json index 3ddcb1d5a2b1fa..7f24e731f40c37 100644 --- a/ports/tensorpipe/vcpkg.json +++ b/ports/tensorpipe/vcpkg.json @@ -1,7 +1,6 @@ { "name": "tensorpipe", - "version-date": "2021-04-26", - "port-version": 1, + "version-date": "2022-03-16", "description": "A tensor-aware point-to-point communication primitive for machine learning", "homepage": "https://github.com/pytorch/tensorpipe", "supports": "linux | osx", From a84de6997c71bc00802588372f4b1fa4eed52865 Mon Sep 17 00:00:00 2001 From: luncliff Date: Wed, 16 Mar 2022 02:16:15 +0900 Subject: [PATCH 2/6] [tensorpipe] update versions JSON --- versions/baseline.json | 4 ++-- versions/t-/tensorpipe.json | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 01e87268226dd7..d5f04a582da666 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6837,8 +6837,8 @@ "port-version": 2 }, "tensorpipe": { - "baseline": "2021-04-26", - "port-version": 1 + "baseline": "2022-03-16", + "port-version": 0 }, "termcolor": { "baseline": "2.0.0", diff --git a/versions/t-/tensorpipe.json b/versions/t-/tensorpipe.json index 7ecdfe6e700d19..e2b189d14a6431 100644 --- a/versions/t-/tensorpipe.json +++ b/versions/t-/tensorpipe.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb170c73ae6e6faf12a3f84d699a39b7a8b5a6e0", + "version-date": "2022-03-16", + "port-version": 0 + }, { "git-tree": "fc442cfbc144a4fc95ca41d9349ef04564d7ce5a", "version-date": "2021-04-26", From 1a0d93a726dd5002cf6acc0c71df80a002af82e3 Mon Sep 17 00:00:00 2001 From: luncliff Date: Fri, 25 Mar 2022 23:49:46 +0900 Subject: [PATCH 3/6] [tensorpipe] use mainstream PR * rename existing patch files * update versions JSON --- ports/tensorpipe/portfile.cmake | 19 ++++--- .../{fix-cmakelists.patch => use-vcpkg.patch} | 53 +++---------------- versions/t-/tensorpipe.json | 2 +- 3 files changed, 20 insertions(+), 54 deletions(-) rename ports/tensorpipe/{fix-cmakelists.patch => use-vcpkg.patch} (51%) diff --git a/ports/tensorpipe/portfile.cmake b/ports/tensorpipe/portfile.cmake index 751dec9ada2df8..943f52ded2ec8f 100644 --- a/ports/tensorpipe/portfile.cmake +++ b/ports/tensorpipe/portfile.cmake @@ -1,12 +1,19 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +vcpkg_download_distfile(INSTALL_PACKAGE_CONFIG_PATCH + URLS "https://patch-diff.githubusercontent.com/raw/pytorch/tensorpipe/pull/435.diff" + FILENAME tensorpipe-pr-435.patch + SHA512 149539467ddd39feb6e715bf483d67954338998cbbcfef65de5a85831af902165f9347cd097fa8e82b10b2b8dbc388fcfe42664eeaf5de1954ae885f129583ed +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pytorch/tensorpipe REF 52791a2fd214b2a9dc5759d36725909c1daa7f2e SHA512 1e5faf17a7236c5506c08cb28be16069b11bb929bbca64ed9745ce4277d46739186ab7d6597da7437d90ed2d166d4c37ef2f3bceabe8083ef3adbb0e8e5f227e PATCHES - fix-cmakelists.patch + "${INSTALL_PACKAGE_CONFIG_PATCH}" + use-vcpkg.patch support-test.patch ) @@ -24,7 +31,7 @@ if("pybind11" IN_LIST FEATURES) endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DTP_ENABLE_SHM=${VCPKG_TARGET_IS_LINUX} @@ -38,9 +45,9 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup() +vcpkg_cmake_config_fixup(CONFIG_PATH "share/cmake/Tensorpipe") -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" ) diff --git a/ports/tensorpipe/fix-cmakelists.patch b/ports/tensorpipe/use-vcpkg.patch similarity index 51% rename from ports/tensorpipe/fix-cmakelists.patch rename to ports/tensorpipe/use-vcpkg.patch index 5dc39a594eb52f..b08d2cb107d6ab 100644 --- a/ports/tensorpipe/fix-cmakelists.patch +++ b/ports/tensorpipe/use-vcpkg.patch @@ -1,19 +1,5 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 77df76d..96da145 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -23,6 +23,6 @@ include(MiscCheck) - - add_subdirectory(tensorpipe) - --install(EXPORT TensorpipeTargets -- DESTINATION share/cmake/Tensorpipe -- FILE TensorpipeTargets.cmake) -+install(EXPORT tensorpipeTargets -+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME} # share/tensorpipe -+ FILE tensorpipe-config.cmake) # we need config.cmake for find_package(tensorpipe CONFIG) diff --git a/tensorpipe/CMakeLists.txt b/tensorpipe/CMakeLists.txt -index efcffc2..5ef674e 100644 +index efcffc2..e167fae 100644 --- a/tensorpipe/CMakeLists.txt +++ b/tensorpipe/CMakeLists.txt @@ -119,8 +119,8 @@ list(APPEND TP_PUBLIC_HDRS @@ -37,36 +23,11 @@ index efcffc2..5ef674e 100644 ## Target -@@ -204,8 +205,14 @@ target_include_directories(tensorpipe PUBLIC ${TP_INCLUDE_DIRS}) - - ## Install - -+install(DIRECTORY channel common core transport util -+ DESTINATION ${TP_INSTALL_INCLUDEDIR}/tensorpipe -+ FILES_MATCHING PATTERN "*.h") -+install(FILES tensorpipe.h -+ DESTINATION ${TP_INSTALL_INCLUDEDIR}/tensorpipe) -+ - install(TARGETS tensorpipe -- EXPORT TensorpipeTargets -+ EXPORT tensorpipeTargets - LIBRARY DESTINATION ${TP_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${TP_INSTALL_LIBDIR}) - -@@ -306,7 +313,7 @@ if(TP_USE_CUDA) - target_include_directories(tensorpipe_cuda PUBLIC ${TP_CUDA_INCLUDE_DIRS}) - - install(TARGETS tensorpipe_cuda -- EXPORT TensorpipeTargets -+ EXPORT tensorpipeTargets - LIBRARY DESTINATION ${TP_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${TP_INSTALL_LIBDIR}) - diff --git a/tensorpipe/python/CMakeLists.txt b/tensorpipe/python/CMakeLists.txt -index ce49472..f6b6ab0 100644 +index b722381..688886a 100644 --- a/tensorpipe/python/CMakeLists.txt +++ b/tensorpipe/python/CMakeLists.txt -@@ -4,13 +4,13 @@ +@@ -4,16 +4,11 @@ # This source code is licensed under the BSD-style license found in the # LICENSE file in the root directory of this source tree. @@ -82,8 +43,6 @@ index ce49472..f6b6ab0 100644 pybind11_add_module(pytensorpipe tensorpipe.cc) -target_link_libraries(pytensorpipe PRIVATE tensorpipe) +target_link_libraries(pytensorpipe PRIVATE tensorpipe pybind11::module) -+ -+install(TARGETS pytensorpipe -+ EXPORT tensorpipeTargets -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + install(TARGETS pytensorpipe + EXPORT TensorpipeTargets diff --git a/versions/t-/tensorpipe.json b/versions/t-/tensorpipe.json index e2b189d14a6431..65de9cc2923178 100644 --- a/versions/t-/tensorpipe.json +++ b/versions/t-/tensorpipe.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "cb170c73ae6e6faf12a3f84d699a39b7a8b5a6e0", + "git-tree": "d373747c8b2ca38cdb6fd359809d7608ada5e6bd", "version-date": "2022-03-16", "port-version": 0 }, From 9d49d32cc92053233338c14f41b7b85a543152c4 Mon Sep 17 00:00:00 2001 From: luncliff Date: Fri, 25 Mar 2022 23:53:45 +0900 Subject: [PATCH 4/6] [tensorpipe] update license --- ports/tensorpipe/vcpkg.json | 1 + versions/t-/tensorpipe.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/tensorpipe/vcpkg.json b/ports/tensorpipe/vcpkg.json index 7f24e731f40c37..ac5f0d27122bbd 100644 --- a/ports/tensorpipe/vcpkg.json +++ b/ports/tensorpipe/vcpkg.json @@ -3,6 +3,7 @@ "version-date": "2022-03-16", "description": "A tensor-aware point-to-point communication primitive for machine learning", "homepage": "https://github.com/pytorch/tensorpipe", + "license": "BSD-3-Clause", "supports": "linux | osx", "dependencies": [ "libnop", diff --git a/versions/t-/tensorpipe.json b/versions/t-/tensorpipe.json index 65de9cc2923178..e2341e43926518 100644 --- a/versions/t-/tensorpipe.json +++ b/versions/t-/tensorpipe.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d373747c8b2ca38cdb6fd359809d7608ada5e6bd", + "git-tree": "c6ad5763b180c3775f1b3cb567abd755367dfd7c", "version-date": "2022-03-16", "port-version": 0 }, From 7b1fd8b4d0ed50c6211df35874ed83f9e143f1be Mon Sep 17 00:00:00 2001 From: luncliff Date: Mon, 9 May 2022 16:04:46 +0900 Subject: [PATCH 5/6] [tensorpipe] fix patch's SHA512 value --- ports/tensorpipe/portfile.cmake | 2 +- versions/t-/tensorpipe.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/tensorpipe/portfile.cmake b/ports/tensorpipe/portfile.cmake index 943f52ded2ec8f..5598679b6acfbc 100644 --- a/ports/tensorpipe/portfile.cmake +++ b/ports/tensorpipe/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(INSTALL_PACKAGE_CONFIG_PATCH URLS "https://patch-diff.githubusercontent.com/raw/pytorch/tensorpipe/pull/435.diff" FILENAME tensorpipe-pr-435.patch - SHA512 149539467ddd39feb6e715bf483d67954338998cbbcfef65de5a85831af902165f9347cd097fa8e82b10b2b8dbc388fcfe42664eeaf5de1954ae885f129583ed + SHA512 7bcf604a967da36b8af936f8b8ab87b442834024b0b2cb886811c15e80893be842fbee2667bbbc39886814ec9b2f4ed0c2527de51fdb7dc293b25cce515f5e4b ) vcpkg_from_github( diff --git a/versions/t-/tensorpipe.json b/versions/t-/tensorpipe.json index e2341e43926518..0dd256c6db6587 100644 --- a/versions/t-/tensorpipe.json +++ b/versions/t-/tensorpipe.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c6ad5763b180c3775f1b3cb567abd755367dfd7c", + "git-tree": "f78594bb71084f0ea1b9e0bba9b9804696e4c011", "version-date": "2022-03-16", "port-version": 0 }, From 76b383ff70c601870825043e89c0bfe437bd90f1 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Mon, 16 May 2022 12:08:39 -0700 Subject: [PATCH 6/6] Add cuda-nvml-dev-11-6 to VMs. --- scripts/azure-pipelines/linux/provision-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh index d72c669cca7b86..1272260686b2a1 100755 --- a/scripts/azure-pipelines/linux/provision-image.sh +++ b/scripts/azure-pipelines/linux/provision-image.sh @@ -78,7 +78,7 @@ apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repo add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/ /" apt-get -y update apt-get install -y --no-install-recommends cuda-compiler-11-6 cuda-libraries-dev-11-6 cuda-driver-dev-11-6 \ - cuda-cudart-dev-11-6 libcublas-11-6 libcurand-dev-11-6 libcudnn8-dev libnccl2 libnccl-dev + cuda-cudart-dev-11-6 libcublas-11-6 libcurand-dev-11-6 cuda-nvml-dev-11-6 libcudnn8-dev libnccl2 libnccl-dev # Install PowerShell wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb