Skip to content

Commit 2973371

Browse files
authored
Merge branch 'main' into blis
2 parents 4dd7753 + e7e4008 commit 2973371

File tree

4 files changed

+36
-25
lines changed

4 files changed

+36
-25
lines changed

.github/workflows/CI.yml

Lines changed: 30 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,40 @@ on:
1414

1515
jobs:
1616
test:
17+
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
1718
runs-on: ${{ matrix.os }}
1819
strategy:
1920
fail-fast: false
2021
matrix:
21-
julia-version: [1.7, 1.8]
22-
julia-arch: [x64]
23-
os: [ubuntu-latest, windows-latest, macOS-latest]
24-
# exclude:
25-
# - os: macOS-latest
26-
# julia-arch: x86
27-
22+
version:
23+
- '1.10'
24+
- '1'
25+
os:
26+
- ubuntu-latest
27+
- windows-latest
28+
arch:
29+
- x64
30+
include:
31+
- os: macOS-latest
32+
arch: aarch64
33+
version: '1.10'
34+
- os: macOS-latest
35+
arch: aarch64
36+
version: '1'
37+
2838
steps:
29-
- uses: actions/[email protected]
30-
- uses: julia-actions/setup-julia@latest
39+
- uses: actions/checkout@v5
40+
- uses: julia-actions/setup-julia@v2
41+
with:
42+
version: ${{ matrix.version }}
43+
arch: ${{ matrix.arch }}
44+
- uses: julia-actions/cache@v1
45+
- uses: julia-actions/julia-buildpkg@v1
46+
- uses: julia-actions/julia-runtest@v1
47+
- uses: julia-actions/julia-processcoverage@v1
48+
- uses: codecov/codecov-action@v5
3149
with:
32-
version: ${{ matrix.julia-version }}
33-
- uses: julia-actions/julia-buildpkg@main
34-
- uses: julia-actions/julia-runtest@main
35-
- uses: julia-actions/julia-uploadcodecov@master
50+
file: lcov.info
51+
token: ${{ secrets.CODECOV_TOKEN }}
3652
env:
37-
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
38-
# - uses: julia-actions/julia-uploadcoveralls@master
39-
# env:
40-
# COVERALLS_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
53+
JULIA_NUM_THREADS: 4,2

Project.toml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
name = "BLISBLAS"
22
uuid = "6f275bd8-fec0-4d39-945b-7e95a765fa1e"
33
authors = ["Carsten Bauer <[email protected]> and contributors"]
4-
version = "0.1.0"
4+
version = "0.1.1"
55

66
[deps]
77
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
88
blis_jll = "6136c539-28a5-5bf0-87cc-b183200dce32"
99

1010
[compat]
11-
blis_jll = "0.9"
12-
julia = "1"
11+
blis_jll = "2"
12+
julia = "1.10"
1313

1414
[extras]
15+
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
1516
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1617
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
1718
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
1819

1920
[targets]
20-
test = ["Test", "LinearAlgebra", "Random"]
21+
test = ["Test", "LinearAlgebra", "Random", "Libdl"]

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@ julia> @btime $A * $B;
5050
2.729 ms (2 allocations: 7.63 MiB)
5151
```
5252

53-
## Caveats
54-
55-
Currently, the LAPACK functions (OpenBLAS) don't use BLIS for BLAS operations but still the BLAS implementations provided by OpenBLAS. There are plans to fix this in a general manner, see https://github.com/JuliaPackaging/Yggdrasil/issues/2657 and https://github.com/JuliaPackaging/Yggdrasil/pull/2658.
56-
5753
## Related packages
5854

5955
* A more manual approach to accessing BLIS is provided by [BLIS.jl](https://github.com/JuliaLinearAlgebra/BLIS.jl)

test/runtests.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using Test
22
using LinearAlgebra
33
using Random
4+
using Libdl
45

56
function blas()
67
libs = BLAS.get_config().loaded_libs

0 commit comments

Comments
 (0)