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

Jump to bottom

[blas] Resolve baseline problems #38467

Merged
merged 10 commits into from
May 23, 2024
Merged

[blas] Resolve baseline problems #38467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e90a3db
Fix blas/lapck skips in ci.baseline.text to be consistent with #24327
BillyONeal Apr 29, 2024
085a813
fix arm64-android reality
BillyONeal Apr 29, 2024
5464b0b
Remove the extra backend =passes, use supports expressions.
BillyONeal May 16, 2024
9010777
Merge remote-tracking branch 'origin/master' into pass-blas
BillyONeal May 16, 2024
db8cc54
version DB
BillyONeal May 16, 2024
0172c5c
Restore openblas fail on x64-android
BillyONeal May 16, 2024
b63b527
Skip mathgl. This was previously skipped in https://dev.azure.com/vcp…
BillyONeal May 16, 2024
8c508ce
Put more android skips back.
BillyONeal May 17, 2024
14dd2c3
Use arm32
BillyONeal May 17, 2024
a0a7530
Merge remote-tracking branch 'origin/master' into pass-blas
BillyONeal May 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions ports/blas/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
"$comment": "Keep the platform expressions in sync with the wrappers installed by the portfiles!",
"name": "blas",
"version-date": "2023-04-14",
"port-version": 1,
"description": "Metapackage for packages which provide BLAS",
"license": null,
"supports": "!(android & arm32) & !(android & x64)",
"dependencies": [
{
"name": "lapack-reference",
Expand Down
2 changes: 2 additions & 0 deletions ports/lapack/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
"$comment": "Keep the platform expressions in sync with the wrappers installed by the portfiles!",
"name": "lapack",
"version-date": "2023-06-10",
"port-version": 1,
"description": "Metapackage for packages which provide LAPACK",
"license": null,
"supports": "!android",
"dependencies": [
{
"name": "clapack",
Expand Down
4 changes: 2 additions & 2 deletions ports/mathgl/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "mathgl",
"version": "8.0.1",
"port-version": 5,
"port-version": 6,
"description": "MathGL is a free library of fast C++ routines for the plotting of the data varied in one or more dimensions",
"license": "GPL-3.0-only",
"supports": "!uwp & !xbox",
"supports": "!uwp & !xbox & !android",
"dependencies": [
"getopt",
{
Expand Down
70 changes: 46 additions & 24 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ avro-c:x64-android=fail
azure-identity-cpp:arm-neon-android=fail
azure-identity-cpp:arm64-android=fail
azure-identity-cpp:x64-android=fail

# C++20 conformant compiler required
atliac-minitest:x64-linux=fail
atliac-minitest:arm64-android=fail
Expand All @@ -72,7 +71,6 @@ atliac-minitest:arm-neon-android=fail
atliac-minitest:x64-android=fail
atliac-minitest:x64-osx=fail
atliac-minitest:x64-uwp=fail

backward-cpp:arm-neon-android=fail
backward-cpp:arm64-android=fail
backward-cpp:x64-android=fail
Expand All @@ -82,7 +80,52 @@ berkeleydb:arm-neon-android=fail
berkeleydb:arm64-android=fail
berkeleydb:x64-android=fail
binlog:arm-neon-android=fail
blas:arm-neon-android=fail
################################################################
# <BLAS+LAPACK>
# These skips need to match the decision tree for which backends we use; see ports/blas/portfile.cmake
blas-test:x86-windows=pass # openblas
lapack-test:x86-windows=pass # lapack-reference[noblas]
blas-test:x64-windows=pass # openblas
lapack-test:x64-windows=pass # lapack-reference[noblas]
blas-test:x64-windows-static=pass # lapack-reference[blas]
lapack-test:x64-windows-static=pass # lapack-reference[blas]
blas-test:x64-windows-static-md=pass # lapack-reference[blas]
lapack-test:x64-windows-static-md=pass # lapack-reference[blas]
blas-test:x64-uwp=pass # openblas
lapack-test:x64-uwp=pass # clapack
blas-test:arm64-windows=pass # openblas
lapack-test:arm64-windows=pass # clapack
blas-test:arm64-uwp=pass # openblas
lapack-test:arm64-uwp=pass # clapack
blas-test:x64-osx=pass # accelerate framework
lapack-test:x64-osx=pass # accelerate framework
Comment on lines +100 to +101
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you should group the passes separately. Also the comment does not matter here.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem with making those separate is that I feel I would need to explain the expected selection on each triplet twice

blas-test:arm64-osx=pass # accelerate framework
lapack-test:arm64-osx=pass # accelerate framework
blas-test:x64-linux=pass # openblas
lapack-test:x64-linux=pass # lapack-reference[noblas]
blas-test:arm64-android=pass # openblas

clapack:arm64-android=fail
clapack:arm64-osx=skip
clapack:x64-linux=skip
clapack:x64-osx=skip
clapack:x64-windows-static-md=skip
clapack:x64-windows-static=skip
clapack:x64-windows=skip
clapack:x86-windows=skip
lapack-reference:arm64-android=fail
lapack-reference:arm64-osx=skip
lapack-reference:arm64-uwp=skip
lapack-reference:arm64-windows=skip
lapack-reference:x64-osx=skip
lapack-reference:x64-uwp=skip
openblas:arm64-osx=skip
openblas:x64-android=fail
openblas:x64-osx=skip
openblas:x64-windows-static-md=skip
openblas:x64-windows-static=skip
# </BLAS+LAPACK>
################################################################
blitz:x64-android=fail
boinc:arm-neon-android=fail
boinc:arm64-android=fail
Expand Down Expand Up @@ -178,7 +221,6 @@ chartdir:x86-windows=skip
chartdir:x64-windows=skip
chartdir:x64-windows-static-md=skip
chartdir:x64-osx=skip

# chromium-base has several problems and is upgraded to "skip" because it hits a lot of servers that can slow CI
# broken on Windows because it does not yet support VS2022
chromium-base:x64-windows=skip
Expand All @@ -189,23 +231,7 @@ chromium-base:x64-linux=skip
# broken on OSX for unknown reasons; it appears to be messing with some form of system-wide cache
# because the first attempt to build it fails, but subsequent attempts succeed
chromium-base:x64-osx=skip

clamav:arm64-windows=fail

# clapack is replaced by lapack-reference on the platforms lapack-reference supports
clapack:x64-linux=skip
clapack:x64-osx=skip
clapack:arm64-android=skip
clapack:arm64-osx=skip
clapack:x64-windows-static=skip
clapack:x64-windows-static-md=skip
clapack:x64-windows=skip
clapack:x86-windows=skip
lapack-reference:arm64-android=skip
lapack-reference:arm64-windows=skip
lapack-reference:arm64-uwp=skip
lapack-reference:x64-uwp=skip

clblas:arm-neon-android=fail
clblas:arm64-android=fail
clblas:x64-android=fail
Expand Down Expand Up @@ -284,7 +310,6 @@ discord-rpc:x64-uwp=fail
discordcoreapi:x64-linux=fail
discordcoreapi:x64-osx=fail
discount:x64-android=fail

eathread:x64-android=fail
elfio:arm-neon-android=fail
elfio:arm64-android=fail
Expand Down Expand Up @@ -408,14 +433,12 @@ graphqlparser:arm-neon-android=fail
graphqlparser:arm64-android=fail
graphqlparser:arm64-osx=fail # python2 required
graphqlparser:x64-android=fail

# gsoap does not offer stable public source downloads
gsoap:x64-android=fail
gsoap:x64-windows = skip
gsoap:x86-windows = skip
gsoap:x64-windows-static = skip
gsoap:x64-windows-static-md = skip

gstreamer:arm-neon-android=fail
gstreamer:arm64-android=fail
gstreamer:x64-android=fail
Expand Down Expand Up @@ -813,7 +836,6 @@ ompl:arm64-osx=fail
ompl:x64-linux=fail
# opencc/deps/rapidjson-1.1.0/rapidjson.h: Unknown machine endianess detected
onednn:x64-android=fail
openblas:x64-android=fail
# opencc/deps/marisa-0.2.5/lib/marisa/grimoire/io/mapper.cc currently doesn't support UWP.
opencc:x64-android=fail
opencv2:arm-neon-android=fail
Expand Down
5 changes: 5 additions & 0 deletions versions/b-/blas.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "996094c62f01e190855a43a036b6ec2e10375bd9",
"version-date": "2023-04-14",
"port-version": 1
},
{
"git-tree": "02dbca6ca7e22e44f5445b10f74e63644779eefd",
"version-date": "2023-04-14",
Expand Down
6 changes: 3 additions & 3 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@
},
"blas": {
"baseline": "2023-04-14",
"port-version": 0
"port-version": 1
},
"blaze": {
"baseline": "3.8.2",
Expand Down Expand Up @@ -4082,7 +4082,7 @@
},
"lapack": {
"baseline": "2023-06-10",
"port-version": 0
"port-version": 1
},
"lapack-reference": {
"baseline": "3.11.0",
Expand Down Expand Up @@ -5630,7 +5630,7 @@
},
"mathgl": {
"baseline": "8.0.1",
"port-version": 5
"port-version": 6
},
"matio": {
"baseline": "1.5.26",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/lapack.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "6a41c325a45d83ce6d5ee28d55a15d792ac228fa",
"version-date": "2023-06-10",
"port-version": 1
},
{
"git-tree": "aa3ae151bb1436d57dff18e7503fc19d58b45f51",
"version-date": "2023-06-10",
Expand Down
5 changes: 5 additions & 0 deletions versions/m-/mathgl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "fd038b25552f855f87b2456b8621eb789e7757d2",
"version": "8.0.1",
"port-version": 6
},
{
"git-tree": "21cc2f6ab97eed24ec95774335e364a7737c83d2",
"version": "8.0.1",
Expand Down