Merge branch 'main' into update/ci

luncliff · Dec 20, 2023 · 059711b · 059711b
2 parents 3c6c3a1 + f8b30ad
commit 059711b
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 68 deletions.
diff --git 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
@@ -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/ports/ruy/fix-cmake.patch b/ports/ruy/fix-cmake.patch
diff --git 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
@@ -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
@@ -21,7 +21,7 @@
       "port-version": 0
     },
     "directml": {
-      "baseline": "1.12.1",
+      "baseline": "1.13.0",
       "port-version": 0
     },
     "eigen3": {
@@ -101,7 +101,7 @@
       "port-version": 0
     },
     "ruy": {
-      "baseline": "2023-07-26",
+      "baseline": "2023-12-20",
       "port-version": 0
     },
     "rvo2": {

diff --git 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",

diff --git 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",