diff --git a/ports/torch-th/portfile.cmake b/ports/torch-th/portfile.cmake index 6b75bbac34..3e65e56ce7 100644 --- a/ports/torch-th/portfile.cmake +++ b/ports/torch-th/portfile.cmake @@ -12,6 +12,10 @@ vcpkg_from_github( fix-cmake4.patch # Note: The portfile currently deletes all cmake files ) +file(REMOVE "${SOURCE_PATH}/lib/TH/cmake/FindBLAS.cmake") +file(REMOVE "${SOURCE_PATH}/lib/TH/cmake/FindLAPACK.cmake") +file(REMOVE "${SOURCE_PATH}/lib/TH/cmake/FindMKL.cmake") + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/lib/TH" OPTIONS diff --git a/ports/torch-th/vcpkg.json b/ports/torch-th/vcpkg.json index 6cec9982c7..5d545ff5f8 100644 --- a/ports/torch-th/vcpkg.json +++ b/ports/torch-th/vcpkg.json @@ -1,11 +1,13 @@ { "name": "torch-th", "version-date": "2019-04-19", - "port-version": 5, + "port-version": 6, "description": "Torch's TH library", "homepage": "https://github.com/torch/torch7", "license": "BSD-3-Clause", "dependencies": [ + "blas", + "lapack", { "name": "vcpkg-cmake", "host": true diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index b4f7a929fc..4636b0bea9 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -39,7 +39,6 @@ ## # Add new items alphabetically -angelscript:x64-osx=fail apr:arm-neon-android=fail apr:arm64-android=fail apr:x64-android=fail @@ -171,7 +170,6 @@ clockutils:arm-neon-android=fail # gnustl_shared is no longer supported. Please clockutils:arm64-android=fail clockutils:x64-android=fail clrng:arm-neon-android=fail -coin-or-ipopt:x64-linux=fail coin-or-ipopt:x64-windows-static-md=fail coin-or-ipopt:x64-windows-static=fail coroutine:arm-neon-android=fail @@ -796,12 +794,9 @@ tgui:x64-android=fail tinycthread:arm-neon-android=fail tinycthread:arm64-android=fail tinycthread:x64-android=fail -torch-th:arm-neon-android=fail -torch-th:arm64-android=fail torch-th:arm64-uwp=fail torch-th:arm64-windows-static-md=fail torch-th:arm64-windows=fail -torch-th:x64-android=fail torch-th:x64-uwp=fail torch-th:x64-windows-static=fail urho3d:x64-osx=fail diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index fa5b7dfda8..a5f56695a2 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -275,12 +275,12 @@ telnetpp(android)=fail telnetpp(uwp)=fail tensorflow-cc(windows)=fail # tensorflow does not support VS2022 tensorflow(windows)=fail # tensorflow does not support VS2022 -torch-th:arm-neon-android=fail -torch-th:arm64-android=fail +torch-th:arm-neon-android=cascade +torch-th:arm64-android=cascade torch-th:arm64-uwp=fail torch-th:arm64-windows-static-md=fail torch-th:arm64-windows=fail -torch-th:x64-android=fail +torch-th:x64-android=cascade torch-th:x64-uwp=fail torch-th:x64-windows-static=fail treehopper:x64-windows-static=fail diff --git a/versions/baseline.json b/versions/baseline.json index ab177108bc..1be2bc70a2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9786,7 +9786,7 @@ }, "torch-th": { "baseline": "2019-04-19", - "port-version": 5 + "port-version": 6 }, "tracy": { "baseline": "0.11.1", diff --git a/versions/t-/torch-th.json b/versions/t-/torch-th.json index 435440c05b..49d41a6349 100644 --- a/versions/t-/torch-th.json +++ b/versions/t-/torch-th.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0703328485766fb084a8f7ca5c968453cfc7883e", + "version-date": "2019-04-19", + "port-version": 6 + }, { "git-tree": "c89a8250bd96aa24c7dbd3f3683fe5fb542952f8", "version-date": "2019-04-19",