Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[openblas] update to 0.3.15 version and add dynamic arch feature #15238

Merged
merged 27 commits into from
Jul 26, 2021
Merged

[openblas] update to 0.3.15 version and add dynamic arch feature #15238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
1c314bd
[openblas] dynamic arch feature
Dec 21, 2020
7785fff
remove debug output
Dec 21, 2020
1cdd6ad
Update ports/openblas/CONTROL
xandox Dec 22, 2020
63a3862
update version to 0.3.13
Dec 22, 2020
2c18975
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Dec 23, 2020
69bc258
Merge remote-tracking branch 'origin/master' into openblas_dynamic_ar…
xandox Jan 25, 2021
49a7e85
osx build
xandox Jan 25, 2021
32e9675
Merge remote-tracking branch 'origin/master' into openblas_dynamic_ar…
xandox Mar 4, 2021
38fd952
fix CONTROL, add FEATURES keyword to vcpkg_check_features
xandox Mar 4, 2021
fcf02bd
x-add-version
xandox Mar 4, 2021
5bf20f2
Merge remote-tracking branch 'origin/master' into openblas_dynamic_ar…
Apr 23, 2021
73390f9
bump openblas version to 0.3.14
Apr 23, 2021
7b3558e
./vcpkg x-add-version openblas
Apr 23, 2021
54781bd
apply format.diff from ci
Apr 23, 2021
ba4f9ab
./vcpkg x-add-version openblas --overwrite-version
Apr 23, 2021
0bc587a
Update versions/o-/openblas.json
xandox Apr 26, 2021
4a51c7c
Merge remote-tracking branch 'origin/master' into openblas_dynamic_ar…
May 3, 2021
0d91b22
update port to version 0.3.15
May 3, 2021
b0c581b
./vcpkg x-add-version openblas
May 3, 2021
db3e8a6
Merge branch 'openblas_dynamic_arch_feature' of github.com:xandox/vcp…
May 3, 2021
0fb4f39
vcpkg_check_linkage
May 26, 2021
2f659c2
./vcpkg x-add-version openblas --overwrite-version
May 26, 2021
78ae86f
Merge remote-tracking branch 'origin/master' into openblas_dynamic_ar…
May 26, 2021
12b92b3
Merge remote-tracking branch 'origin/master' into openblas_dynamic_ar…
xandox Jul 20, 2021
2248b6c
./vcpkg x-add-version openblas --overwrite-version
xandox Jul 20, 2021
e499f57
Merge branch 'master' of https://github.com/Microsoft/vcpkg into open…
Jul 23, 2021
e8d9a66
Update versions/o-/openblas.json
Jul 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions ports/openblas/fix-pkg-config.patch
View file
Open in desktop

This file was deleted.

20 changes: 16 additions & 4 deletions ports/openblas/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO xianyi/OpenBLAS
REF 63b03efc2af332c88b86d4fd8079d00f4b439adf # v0.3.10
SHA512 269852348e042fe32d0d400d5e6f4cf758024389d3966a9b1bc217061d4a03b3a7003a399212130ec4e783f1e1e5b423eb531e6e0948485b5d5ac9fdc58982cb
REF 904f9a267dddb30e9f187e57231ed160ab2f2704 # v0.3.15
SHA512 ddb1eba7b0def08483d7610675335648017eff41de3cbe24357bd15c6938c7997f12c449f32d8225abbb5ef8f7a2e7501320ec05e970e8ddf8e4c25fd81e8002
HEAD_REF develop
PATCHES
uwp.patch
fix-space-path.patch
fix-redefinition-function.patch
fix-pkg-config.patch
fix-uwp-build.patch
fix-marco-conflict.patch
)
Expand All @@ -34,6 +33,18 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

set(COMMON_OPTIONS -DBUILD_WITHOUT_LAPACK=ON)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
"dynamic-arch" DYNAMIC_ARCH
)

if(VCPKG_TARGET_IS_OSX)
if("dynamic-arch" IN_LIST FEATURES)
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
message(STATUS "Openblas with \"dynamic-arch\" option for OSX supports only dynamic linkage. It's not a bag of openblas but bug of combination cmake+ninja+osx. See: https://gitlab.kitware.com/cmake/cmake/-/issues/16731")
endif()
endif()

# for UWP version, must build non uwp first for helper
# binaries.
if(VCPKG_TARGET_IS_UWP)
Expand Down Expand Up @@ -77,6 +88,7 @@ elseif(VCPKG_TARGET_IS_WINDOWS)
SOURCE_PATH ${SOURCE_PATH}
OPTIONS
${COMMON_OPTIONS}
${FEATURE_OPTIONS}
)
else()
string(APPEND VCPKG_C_FLAGS " -DNEEDBUNDERSCORE") # Required to get common BLASFUNC to append extra _
Expand All @@ -85,7 +97,7 @@ else()
SOURCE_PATH ${SOURCE_PATH}
OPTIONS
${COMMON_OPTIONS}
-DCMAKE_SYSTEM_PROCESSOR=AMD64
${FEATURE_OPTIONS}
-DNOFORTRAN=ON
-DBU=_ #required for all blas functions to append extra _ using NAME
)
Expand Down
13 changes: 9 additions & 4 deletions ports/openblas/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
{
"name": "openblas",
"version": "0.3.10",
"port-version": 3,
"version": "0.3.15",
"description": "OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.",
"homepage": "https://github.com/xianyi/OpenBLAS",
"default-features": [
"threads"
"dependencies": [
{
"name": "pthread",
"platform": "!windows & !uwp"
}
],
"features": {
"dynamic-arch": {
"description": "Support for multiple targets in a single library"
},
"simplethread": {
"description": "Use simple thread",
"dependencies": [
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4545,8 +4545,8 @@
"port-version": 0
},
"openblas": {
"baseline": "0.3.10",
"port-version": 3
"baseline": "0.3.15",
"port-version": 0
},
"opencascade": {
"baseline": "7.5.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/openblas.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2a214e1bac47c70d932caef7d74771c8658b1f7a",
"version": "0.3.15",
"port-version": 0
},
{
"git-tree": "20d57360e6e7afa4e4f033a87e1ded91571ee462",
"version": "0.3.10",
Expand Down