From bb49b5180aef241d17672ca4900b6b0ff4aa1456 Mon Sep 17 00:00:00 2001 From: Park DongHa Date: Wed, 20 Dec 2023 10:47:10 +0900 Subject: [PATCH 1/2] [directml] update to 1.13.0 (#144) * [directml] update to 1.13.0 * [directml] update baseline --- ports/directml/portfile.cmake | 2 +- ports/directml/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/directml.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/directml/portfile.cmake b/ports/directml/portfile.cmake index 8993382c..283ddaf1 100644 --- a/ports/directml/portfile.cmake +++ b/ports/directml/portfile.cmake @@ -5,7 +5,7 @@ set(ENV{NUGET_PACKAGES} "${BUILDTREES_DIR}/nuget") # see https://www.nuget.org/packages/Microsoft.AI.DirectML/ set(PACKAGE_NAME "Microsoft.AI.DirectML") -set(PACKAGE_VERSION "1.12.1") +set(PACKAGE_VERSION "1.13.0") file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${PACKAGE_NAME}") vcpkg_execute_required_process( diff --git a/ports/directml/vcpkg.json b/ports/directml/vcpkg.json index c5cd6482..5d3df4a6 100644 --- a/ports/directml/vcpkg.json +++ b/ports/directml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directml", - "version-semver": "1.12.1", + "version-semver": "1.13.0", "description": [ "DirectML is a high-performance, hardware-accelerated DirectX 12 library for machine learning.", "DirectML provides GPU acceleration for common machine learning tasks across a broad range of supported hardware and drivers, ", diff --git a/versions/baseline.json b/versions/baseline.json index 82b021a1..6924b411 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -21,7 +21,7 @@ "port-version": 0 }, "directml": { - "baseline": "1.12.1", + "baseline": "1.13.0", "port-version": 0 }, "eigen3": { diff --git a/versions/d-/directml.json b/versions/d-/directml.json index 7e6dbbb3..d9ba6e5e 100644 --- a/versions/d-/directml.json +++ b/versions/d-/directml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b8621fdac36cd2db3cea051d27b8b2e8eb8dfb33", + "version-semver": "1.13.0", + "port-version": 0 + }, { "git-tree": "db475bbabf05216178311617461c553ddadd167a", "version-semver": "1.12.1", From f8b30add67edeee3ca854f6dfe3be98943ac2e63 Mon Sep 17 00:00:00 2001 From: Park DongHa Date: Wed, 20 Dec 2023 10:47:23 +0900 Subject: [PATCH 2/2] [ruy] update to latest (#145) * [ruy] udpate to latest * [ruy] udpate baseline --- ports/ruy/fix-cmake.patch | 53 --------------------------------------- ports/ruy/portfile.cmake | 17 ++++++------- ports/ruy/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/ruy.json | 5 ++++ 5 files changed, 14 insertions(+), 65 deletions(-) delete mode 100644 ports/ruy/fix-cmake.patch diff --git a/ports/ruy/fix-cmake.patch b/ports/ruy/fix-cmake.patch deleted file mode 100644 index 7dc67889..00000000 --- a/ports/ruy/fix-cmake.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/ruy/CMakeLists.txt b/ruy/CMakeLists.txt -index 67f0f54..b6a3f8d 100644 ---- a/ruy/CMakeLists.txt -+++ b/ruy/CMakeLists.txt -@@ -2,7 +2,7 @@ - # To regenerate, run: - # cmake/bazel_to_cmake.sh - --if(CMAKE_SYSTEM_NAME STREQUAL Windows) -+if(CMAKE_SYSTEM_NAME MATCHES Windows) # Windows or WindowsStore - set(ruy_0_Wall_Wcxx14_compat_Wextra_Wundef "") - else() - set(ruy_0_Wall_Wcxx14_compat_Wextra_Wundef "-Wall;-Wextra;-Wc++14-compat;-Wundef") -@@ -105,7 +105,7 @@ ruy_cc_library( - ${ruy_2_O3} - ) - --if(CMAKE_SYSTEM_NAME STREQUAL Windows) -+if(CMAKE_SYSTEM_NAME MATCHES Windows) # Windows or WindowsStore - set(ruy_3_pthread "") - else() - set(ruy_3_pthread "-pthread") -@@ -393,7 +393,7 @@ ruy_cc_library( - ${ruy_2_O3} - ) - --if(CMAKE_SYSTEM_NAME STREQUAL Windows) -+if(CMAKE_SYSTEM_NAME MATCHES Windows) # Windows or WindowsStore - set(ruy_4_Wno_undef "") - else() - set(ruy_4_Wno_undef "-Wno-undef") -@@ -1297,7 +1297,7 @@ ruy_cc_library( - ruy_mul_params - ) - --if(CMAKE_SYSTEM_NAME STREQUAL Windows) -+if(CMAKE_SYSTEM_NAME MATCHES Windows) # Windows or WindowsStore - set(ruy_10_lm "") - else() - set(ruy_10_lm "-lm") -diff --git a/ruy/profiler/CMakeLists.txt b/ruy/profiler/CMakeLists.txt -index df4b30a..57abe0a 100644 ---- a/ruy/profiler/CMakeLists.txt -+++ b/ruy/profiler/CMakeLists.txt -@@ -8,7 +8,7 @@ else() - set(ruy_profiler_0_RUY_PROFILER "") - endif() - --if(CMAKE_SYSTEM_NAME STREQUAL Windows) -+if(CMAKE_SYSTEM_NAME MATCHES Windows) # Windows or WindowsStore - set(ruy_profiler_1_pthread "") - else() - set(ruy_profiler_1_pthread "-pthread") diff --git a/ports/ruy/portfile.cmake b/ports/ruy/portfile.cmake index a159ffe2..3d74771f 100644 --- a/ports/ruy/portfile.cmake +++ b/ports/ruy/portfile.cmake @@ -3,11 +3,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/ruy - REF c04e5e52ae6b144f74ac032652e3c538bda15c9b - SHA512 e25779a43ee5830d1294bcccbe1f8b3057971944820c050a51b55e4a46abada3800d6ea7fa8ad94e291f6f8de7179db2e75d2d1c23da5221ffd8d1cf1b463964 + REF cd7b92695b5d3f0c9ff65b865c2a1e19b99d766d + SHA512 01bf5b33cfa68e3643aa7ad8adcd392df692235bd11ffb8f1f073f5e67f5985d8abf814895406757f13f309de09cf42c54c3dc66591e5f79df4937399f343599 HEAD_REF master - PATCHES - fix-cmake.patch ) vcpkg_cmake_configure( @@ -18,11 +16,10 @@ vcpkg_cmake_configure( -DRUY_FIND_CPUINFO=ON ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share -) -file(INSTALL ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" ) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/ruy/vcpkg.json b/ports/ruy/vcpkg.json index f111001f..1225dbeb 100644 --- a/ports/ruy/vcpkg.json +++ b/ports/ruy/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ruy", - "version-date": "2023-07-26", + "version-date": "2023-12-20", "description": [ "ruy is a matrix multiplication library.", "Its focus is to cover the matrix multiplication needs of neural network inference engines." diff --git a/versions/baseline.json b/versions/baseline.json index 6924b411..b564dbd8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -101,7 +101,7 @@ "port-version": 0 }, "ruy": { - "baseline": "2023-07-26", + "baseline": "2023-12-20", "port-version": 0 }, "rvo2": { diff --git a/versions/r-/ruy.json b/versions/r-/ruy.json index 174f558b..482aec20 100644 --- a/versions/r-/ruy.json +++ b/versions/r-/ruy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d60650b80af3921e213ed3a19b8628360b4cebfa", + "version-date": "2023-12-20", + "port-version": 0 + }, { "git-tree": "ede9359a9000866a10842c4385c614aafd9caf23", "version-date": "2023-07-26",