mirror of
https://github.com/microsoft/vcpkg.git
synced 2026-01-18 01:11:23 +01:00
[vcpkg baseline] Fix cblas and opencv related regressions (#48576)
This commit is contained in:
Kai Pastor
@@ -10,9 +10,10 @@ SET(VCPKG_POLICY_EMPTY_PACKAGE enabled)
|
||||
#
|
||||
# If we are on Windows and arm or uwp, that we use gfortran as our fortran compiler creates an issue
|
||||
# because there is no available libgfortran. This means we can't use lapack-reference at all.
|
||||
# We choose clapack instead.
|
||||
#
|
||||
# If we are on Windows and static, there is a linking problem caused by static gfortran in the same
|
||||
# link as openblas, so we have to use the blas implementation from lapack-reference.
|
||||
# link as openblas, so we choose clapack again.
|
||||
#
|
||||
# That results in roughly the following decision tree:
|
||||
#
|
||||
@@ -31,8 +32,8 @@ SET(VCPKG_POLICY_EMPTY_PACKAGE enabled)
|
||||
# };
|
||||
# } else {
|
||||
# return {
|
||||
# "blas": "lapack-reference[blas]",
|
||||
# "lapack": "lapack-reference[blas]"
|
||||
# "blas": "openblas",
|
||||
# "lapack": "clapack"
|
||||
# };
|
||||
# }
|
||||
#
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"$comment": "Keep the platform expressions in sync with the wrappers installed by the portfiles!",
|
||||
"name": "blas",
|
||||
"version-date": "2023-04-14",
|
||||
"port-version": 4,
|
||||
"port-version": 5,
|
||||
"description": "Metapackage for packages which provide BLAS",
|
||||
"license": null,
|
||||
"dependencies": [
|
||||
|
||||
@@ -1,23 +1,8 @@
|
||||
SET(VCPKG_POLICY_EMPTY_PACKAGE enabled)
|
||||
|
||||
# This block should be kept in sync with the port 'blas'
|
||||
if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS)
|
||||
# Use Apple's accelerate framework where available
|
||||
set(BLA_VENDOR Apple)
|
||||
set(requires "")
|
||||
set(libs "-framework Accelerate")
|
||||
set(cflags "-framework Accelerate")
|
||||
elseif(VCPKG_TARGET_IS_UWP
|
||||
OR (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "arm")
|
||||
OR NOT VCPKG_TARGET_IS_WINDOWS
|
||||
OR NOT (VCPKG_LIBRARY_LINKAGE STREQUAL "static"))
|
||||
set(BLA_VENDOR OpenBLAS)
|
||||
set(requires openblas)
|
||||
else()
|
||||
set(BLA_VENDOR Generic)
|
||||
set(requires "cblas-reference")
|
||||
endif()
|
||||
|
||||
# See explanation in ports/blas/portfile.cmake for which blas implementation is chosen.
|
||||
set(requires blas)
|
||||
|
||||
configure_file("${CMAKE_CURRENT_LIST_DIR}/cblas.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/cblas.pc" @ONLY)
|
||||
if(NOT VCPKG_BUILD_TYPE)
|
||||
configure_file("${CMAKE_CURRENT_LIST_DIR}/cblas.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/cblas.pc" @ONLY)
|
||||
|
||||
@@ -1,21 +1,11 @@
|
||||
{
|
||||
"$comment": "Keep the platform expressions in sync with the wrappers installed by the portfiles!",
|
||||
"name": "cblas",
|
||||
"version-date": "2024-03-19",
|
||||
"version-date": "2025-10-29",
|
||||
"description": "Metapackage for packages which provide CBLAS",
|
||||
"license": null,
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "lapack-reference",
|
||||
"features": [
|
||||
"cblas"
|
||||
],
|
||||
"platform": "!osx & !ios & !uwp & !(windows & arm) & windows & static"
|
||||
},
|
||||
{
|
||||
"name": "openblas",
|
||||
"platform": "!osx & !ios & (uwp | (windows & arm) | !windows | !static)"
|
||||
},
|
||||
"blas",
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
|
||||
@@ -79,8 +79,8 @@ lapack-test:arm64-windows=pass # clapack
|
||||
lapack-test:x64-linux=pass # lapack-reference[noblas]
|
||||
lapack-test:x64-uwp=pass # clapack
|
||||
lapack-test:x64-windows-release=pass # lapack-reference[noblas]
|
||||
lapack-test:x64-windows-static-md=pass # lapack-reference[blas]
|
||||
lapack-test:x64-windows-static=pass # lapack-reference[blas]
|
||||
lapack-test:x64-windows-static-md=pass # clapack
|
||||
lapack-test:x64-windows-static=pass # clapack
|
||||
lapack-test:x64-windows=pass # lapack-reference[noblas]
|
||||
lapack-test:x86-windows=pass # lapack-reference[noblas]
|
||||
vcpkg-ci-blas:arm64-android=pass # openblas
|
||||
@@ -96,11 +96,13 @@ vcpkg-ci-blas:x64-windows-static=pass # openblas
|
||||
vcpkg-ci-blas:x64-windows=pass # openblas
|
||||
vcpkg-ci-blas:x86-windows=pass # openblas
|
||||
|
||||
clapack:arm-neon-android=fail
|
||||
clapack:arm64-android=fail
|
||||
clapack:arm-neon-android=skip
|
||||
clapack:arm64-android=skip
|
||||
clapack:arm64-osx=skip
|
||||
clapack:x64-android=fail
|
||||
clapack:arm64-uwp=pass
|
||||
clapack:x64-android=skip
|
||||
clapack:x64-linux=skip
|
||||
clapack:x64-uwp=pass
|
||||
clapack:x64-windows-release=skip
|
||||
clapack:x64-windows-static-md=pass
|
||||
clapack:x64-windows-static=pass
|
||||
@@ -349,6 +351,7 @@ isal:x64-android=fail
|
||||
# Failing on try_run() in cross builds
|
||||
itk:arm-neon-android=fail
|
||||
itk:arm64-android=fail
|
||||
itk:arm64-windows-static-md=fail
|
||||
itk:arm64-windows=fail
|
||||
itk:x64-android=fail
|
||||
jaeger-client-cpp:arm-neon-android=fail
|
||||
@@ -570,6 +573,7 @@ openmpi:arm-neon-android=fail
|
||||
openmpi:arm64-android=fail
|
||||
openmpi:x64-android=fail
|
||||
openmvg:arm64-windows-static-md=fail
|
||||
openmvs:arm64-windows-static-md=fail # no _M_ARM64 detection
|
||||
# MSVC is not supported
|
||||
openslide:x64-windows-release=fail
|
||||
openslide:x64-windows=fail
|
||||
@@ -943,13 +947,9 @@ vcpkg-ci-mathgl:x86-windows=pass
|
||||
vcpkg-ci-opencv:arm-neon-android=pass
|
||||
vcpkg-ci-opencv:arm64-android=pass
|
||||
vcpkg-ci-opencv:arm64-osx=pass
|
||||
# OpenCV appears to be trying to use __fp16 on a platform that does not support that
|
||||
# buildtrees\opencv4\src\4.11.0-46ecfbc8ae.clean\modules\dnn\src\layers\cpu_kernels\conv_winograd_f63.simd.hpp(1371): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
|
||||
#vcpkg-ci-opencv:arm64-windows-static-md=pass
|
||||
opencv4:arm64-windows-static-md=fail
|
||||
#vcpkg-ci-opencv:arm64-windows=pass
|
||||
opencv4:arm64-windows=fail
|
||||
vcpkg-ci-opencv:arm64-uwp=pass
|
||||
vcpkg-ci-opencv:arm64-windows-static-md=pass
|
||||
vcpkg-ci-opencv:arm64-windows=pass
|
||||
vcpkg-ci-opencv:x64-android=pass
|
||||
vcpkg-ci-opencv:x64-linux=pass
|
||||
vcpkg-ci-opencv:x64-uwp=pass
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "240d6e92a04768c856492186df3e2b5f642c5e37",
|
||||
"version-date": "2023-04-14",
|
||||
"port-version": 5
|
||||
},
|
||||
{
|
||||
"git-tree": "d47ddd31b0da28c8da1ec016005b3381c69996da",
|
||||
"version-date": "2023-04-14",
|
||||
|
||||
@@ -742,7 +742,7 @@
|
||||
},
|
||||
"blas": {
|
||||
"baseline": "2023-04-14",
|
||||
"port-version": 4
|
||||
"port-version": 5
|
||||
},
|
||||
"blaze": {
|
||||
"baseline": "3.8.2",
|
||||
@@ -1609,7 +1609,7 @@
|
||||
"port-version": 0
|
||||
},
|
||||
"cblas": {
|
||||
"baseline": "2024-03-19",
|
||||
"baseline": "2025-10-29",
|
||||
"port-version": 0
|
||||
},
|
||||
"cccapstone": {
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "afad678ca66533d2fca102e6ead5fbdb41601f65",
|
||||
"version-date": "2025-10-29",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "6a032c6c0adaaff9972edc4d05b0a8e3d189e810",
|
||||
"version-date": "2024-03-19",
|
||||
|
||||
Reference in New Issue
Block a user