mirror of https://github.com/microsoft/vcpkg.git
[openblas] Update to 0.3.29 (#44150)
This commit is contained in:
parent
68673b14cd
commit
53295f2e59
|
|
@ -1,21 +0,0 @@
|
|||
diff --git a/common_arm.h b/common_arm.h
|
||||
index a3db995..5f45976 100644
|
||||
--- a/common_arm.h
|
||||
+++ b/common_arm.h
|
||||
@@ -104,9 +104,16 @@ static inline int blas_quickdivide(blasint x, blasint y){
|
||||
|
||||
#if defined(ASSEMBLER) && !defined(NEEDPARAM)
|
||||
|
||||
+#if !defined(__APPLE__) && !defined(_WIN32)
|
||||
+#define OPENBLAS_ARM_TYPE_FUNCTION .type REALNAME, %function ;
|
||||
+#else
|
||||
+#define OPENBLAS_ARM_TYPE_FUNCTION
|
||||
+#endif
|
||||
+
|
||||
#define PROLOGUE \
|
||||
.arm ;\
|
||||
.global REALNAME ;\
|
||||
+ OPENBLAS_ARM_TYPE_FUNCTION \
|
||||
REALNAME:
|
||||
|
||||
#define EPILOGUE
|
||||
|
|
@ -1,22 +1,14 @@
|
|||
vcpkg_download_distfile(ARM64_WINDOWS_UWP_PATCH
|
||||
URLS "https://patch-diff.githubusercontent.com/raw/OpenMathLib/OpenBLAS/pull/4926.diff?full_index=1"
|
||||
FILENAME "openblas-fix-arm64-windows-uwp.patch"
|
||||
SHA512 808d375628499641f1134b4751c9861384b719dae14cf6bd4d9d4b09c9bfd9f8b13b2663e9fa9d09867b5b40817c26387ac659d2f6459d40a46455b2f540d018
|
||||
)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO OpenMathLib/OpenBLAS
|
||||
REF "v${VERSION}"
|
||||
SHA512 358301c8a60bedf920c07a110c772feb639e52412bd783789741fd2fd0686aac97e6b17ebcdf01ce48a2a15841058f82df0fee551af952f6e70b58140c055133
|
||||
SHA512 046316b4297460bffca09c890ecad17ea39d8b3db92ff445d03b547dd551663d37e40f38bce8ae11e2994374ff01e622b408da27aa8e40f4140185ee8f001a60
|
||||
HEAD_REF develop
|
||||
PATCHES
|
||||
arm32-asm-function.diff
|
||||
disable-testing.diff
|
||||
getarch.diff
|
||||
system-check-msvc.diff
|
||||
win32-uwp.diff
|
||||
${ARM64_WINDOWS_UWP_PATCH}
|
||||
)
|
||||
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS OPTIONS
|
||||
|
|
@ -56,7 +48,6 @@ vcpkg_cmake_configure(
|
|||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
${OPTIONS}
|
||||
-DCMAKE_POLICY_DEFAULT_CMP0054=NEW
|
||||
"-DCMAKE_PROJECT_INCLUDE=${CURRENT_PORT_DIR}/cmake-project-include.cmake"
|
||||
-DBUILD_TESTING=OFF
|
||||
-DBUILD_WITHOUT_LAPACK=ON
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
"name": "openblas",
|
||||
"version": "0.3.28",
|
||||
"port-version": 1,
|
||||
"version": "0.3.29",
|
||||
"description": "OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.",
|
||||
"homepage": "https://github.com/OpenMathLib/OpenBLAS",
|
||||
"license": "BSD-3-Clause",
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ diff --git a/cmake/system.cmake b/cmake/system.cmake
|
|||
index 683c318..eae7436 100644
|
||||
--- a/cmake/system.cmake
|
||||
+++ b/cmake/system.cmake
|
||||
@@ -502,7 +502,7 @@ if (USE_SIMPLE_THREADED_LEVEL3)
|
||||
@@ -507,7 +507,7 @@ if (USE_SIMPLE_THREADED_LEVEL3)
|
||||
set(CCOMMON_OPT "${CCOMMON_OPT} -DUSE_SIMPLE_THREADED_LEVEL3")
|
||||
endif ()
|
||||
|
||||
|
|
@ -33,7 +33,7 @@ index 683c318..eae7436 100644
|
|||
if (DEFINED MAX_STACK_ALLOC)
|
||||
if (NOT ${MAX_STACK_ALLOC} EQUAL 0)
|
||||
set(CCOMMON_OPT "${CCOMMON_OPT} -DMAX_STACK_ALLOC=${MAX_STACK_ALLOC}")
|
||||
@@ -511,7 +511,7 @@ else ()
|
||||
@@ -516,7 +516,7 @@ else ()
|
||||
set(CCOMMON_OPT "${CCOMMON_OPT} -DMAX_STACK_ALLOC=2048")
|
||||
endif ()
|
||||
endif ()
|
||||
|
|
@ -42,7 +42,7 @@ index 683c318..eae7436 100644
|
|||
if (DEFINED BLAS3_MEM_ALLOC_THRESHOLD)
|
||||
if (NOT ${BLAS3_MEM_ALLOC_THRESHOLD} EQUAL 32)
|
||||
set(CCOMMON_OPT "${CCOMMON_OPT} -DBLAS3_MEM_ALLOC_THRESHOLD=${BLAS3_MEM_ALLOC_THRESHOLD}")
|
||||
@@ -628,7 +628,7 @@ endif()
|
||||
@@ -633,7 +633,7 @@ endif()
|
||||
set(LAPACK_FPFLAGS "${LAPACK_FPFLAGS} ${FPFLAGS}")
|
||||
|
||||
#Disable -fopenmp for LAPACK Fortran codes on Windows.
|
||||
|
|
@ -51,7 +51,7 @@ index 683c318..eae7436 100644
|
|||
set(FILTER_FLAGS "-fopenmp;-mp;-openmp;-xopenmp=parallel")
|
||||
foreach (FILTER_FLAG ${FILTER_FLAGS})
|
||||
string(REPLACE ${FILTER_FLAG} "" LAPACK_FFLAGS ${LAPACK_FFLAGS})
|
||||
@@ -660,11 +660,11 @@ if (INTERFACE64)
|
||||
@@ -665,11 +665,11 @@ if (INTERFACE64)
|
||||
set(LAPACK_CFLAGS "${LAPACK_CFLAGS} -DLAPACK_ILP64")
|
||||
endif ()
|
||||
|
||||
|
|
@ -64,4 +64,4 @@ index 683c318..eae7436 100644
|
|||
+if (${CMAKE_C_COMPILER} STREQUAL "LSB" OR WIN32)
|
||||
set(LAPACK_CFLAGS "${LAPACK_CFLAGS} -DLAPACK_COMPLEX_STRUCTURE")
|
||||
endif ()
|
||||
|
||||
if (${CMAKE_C_COMPILER_ID} MATCHES "IntelLLVM" AND ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
|
||||
|
|
|
|||
|
|
@ -6685,8 +6685,8 @@
|
|||
"port-version": 0
|
||||
},
|
||||
"openblas": {
|
||||
"baseline": "0.3.28",
|
||||
"port-version": 1
|
||||
"baseline": "0.3.29",
|
||||
"port-version": 0
|
||||
},
|
||||
"opencascade": {
|
||||
"baseline": "7.9.0",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "3d3d198cfb372ccd328a36248c4c12fb7c6b3bb6",
|
||||
"version": "0.3.29",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "73b8d762190120c2155870da8e148f307d9a4294",
|
||||
"version": "0.3.28",
|
||||
|
|
|
|||
Loading…
Reference in New Issue