Skip to content

Commit 01f08e5

Browse files
authored
Merge pull request #2 from DilumAluthge/dpa/fix-ci
Fix CI and add some docs
2 parents 0f0978c + 0f158eb commit 01f08e5

20 files changed

+273
-191
lines changed
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: CI (Julia nightly)
2+
on:
3+
pull_request:
4+
branches:
5+
- master
6+
push:
7+
branches:
8+
- master
9+
tags: '*'
10+
workflow_dispatch:
11+
jobs:
12+
test-julia-nightly:
13+
name: ${{ matrix.version }}/${{ matrix.os }}${{ matrix.arch }}/t=${{ matrix.threads }}/${{ github.event_name }}
14+
runs-on: ${{ matrix.os }}
15+
strategy:
16+
fail-fast: false
17+
matrix:
18+
arch:
19+
- x64
20+
version:
21+
- 'nightly'
22+
os:
23+
- ubuntu-latest
24+
threads:
25+
- '1'
26+
- '2'
27+
steps:
28+
- uses: actions/checkout@v2
29+
- uses: julia-actions/setup-julia@v1
30+
with:
31+
version: ${{ matrix.version }}
32+
arch: ${{ matrix.arch }}
33+
- uses: actions/cache@v1
34+
env:
35+
cache-name: cache-artifacts
36+
with:
37+
path: ~/.julia/artifacts
38+
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
39+
restore-keys: |
40+
${{ runner.os }}-test-${{ env.cache-name }}-
41+
${{ runner.os }}-test-
42+
${{ runner.os }}-
43+
# TODO: remove the following line once StrideArrays is registered
44+
- run: julia --color=yes --project -e 'import Pkg; Pkg.develop(Pkg.PackageSpec(url = "https://github.com/chriselrod/StrideArrays.jl"))'
45+
shell: bash
46+
- uses: julia-actions/julia-buildpkg@v1
47+
- uses: julia-actions/julia-runtest@v1
48+
with:
49+
coverage: false
50+
env:
51+
JULIA_NUM_THREADS: ${{ matrix.threads }}

.github/workflows/ci.yml

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,29 @@
1-
name: CI
1+
name: CI
22
on:
3-
- push
4-
- pull_request
3+
pull_request:
4+
branches:
5+
- master
6+
push:
7+
branches:
8+
- master
9+
tags: '*'
10+
workflow_dispatch:
511
jobs:
612
test:
7-
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
13+
name: ${{ matrix.version }}/${{ matrix.os }}${{ matrix.arch }}/t=${{ matrix.threads }}/${{ github.event_name }}
814
runs-on: ${{ matrix.os }}
915
strategy:
1016
fail-fast: false
1117
matrix:
18+
arch:
19+
- x64
1220
version:
13-
- '1.5'
14-
- '1.7'
15-
- 'nightly'
21+
- '1'
1622
os:
1723
- ubuntu-latest
18-
- macOS-latest
19-
- windows-latest
20-
arch:
21-
- x64
24+
threads:
25+
- '1'
26+
- '2'
2227
steps:
2328
- uses: actions/checkout@v2
2429
- uses: julia-actions/setup-julia@v1
@@ -35,12 +40,15 @@ jobs:
3540
${{ runner.os }}-test-${{ env.cache-name }}-
3641
${{ runner.os }}-test-
3742
${{ runner.os }}-
43+
# TODO: remove the following line once StrideArrays is registered
44+
- run: julia --color=yes --project -e 'import Pkg; Pkg.develop(Pkg.PackageSpec(url = "https://github.com/chriselrod/StrideArrays.jl"))'
45+
shell: bash
3846
- uses: julia-actions/julia-buildpkg@v1
3947
- uses: julia-actions/julia-runtest@v1
40-
- uses: julia-actions/julia-processcoverage@v1
41-
- uses: codecov/codecov-action@v1
4248
with:
43-
file: lcov.info
49+
coverage: false
50+
env:
51+
JULIA_NUM_THREADS: ${{ matrix.threads }}
4452
docs:
4553
name: Documentation
4654
runs-on: ubuntu-latest
@@ -49,11 +57,14 @@ jobs:
4957
- uses: julia-actions/setup-julia@v1
5058
with:
5159
version: '1'
60+
# TODO: fix the following lines once StrideArrays is registered
5261
- run: |
5362
julia --project=docs -e '
5463
using Pkg
55-
Pkg.develop(PackageSpec(path=pwd()))
64+
pkgs = [PackageSpec(path = pwd()), PackageSpec(url = "https://github.com/chriselrod/StrideArrays.jl")]
65+
Pkg.develop(pkgs)
5666
Pkg.instantiate()'
67+
shell: bash
5768
- run: |
5869
julia --project=docs -e '
5970
using Documenter: doctest

.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
*.jl.*.cov
22
*.jl.cov
33
*.jl.mem
4-
/Manifest.toml
5-
/docs/build/
4+
*.png
65
*~
6+
/docs/build/
7+
Manifest.toml

Project.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ MKL_jll = "856f044c-d86e-5d09-b602-aeab76dc8ba7"
1313
Octavian = "6fd5a793-0b7e-452c-907f-f8bfe9c57db4"
1414
OpenBLAS_jll = "4536629a-c528-5b80-bd46-f80d51c5b363"
1515
ProgressMeter = "92933f4c-e287-5a05-a399-4b506db050ca"
16+
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
17+
StrideArrays = "d1fa6d79-ef01-42a6-86c9-f7c551f8593b"
1618
Tullio = "bc48ee85-29a4-5162-ae0b-a64e1601d4bc"
1719
VectorizationBase = "3d5dd08c-fd9d-11e8-17fa-ed2836048c2f"
1820
VegaLite = "112f6efa-9a02-5b7d-90c0-432ed331239a"
@@ -22,7 +24,9 @@ blis_jll = "6136c539-28a5-5bf0-87cc-b183200dce32"
2224
julia = "1.5"
2325

2426
[extras]
27+
InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
2528
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
29+
VectorizationBase = "3d5dd08c-fd9d-11e8-17fa-ed2836048c2f"
2630

2731
[targets]
28-
test = ["Test"]
32+
test = ["InteractiveUtils", "Test", "VectorizationBase"]

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
[![Stable](https://img.shields.io/badge/docs-stable-blue.svg)](https://chriselrod.github.io/BLASBenchmarks.jl/stable)
44
[![Dev](https://img.shields.io/badge/docs-dev-blue.svg)](https://chriselrod.github.io/BLASBenchmarks.jl/dev)
5-
[![Build Status](https://github.com/chriselrod/BLASBenchmarks.jl/workflows/CI/badge.svg)](https://github.com/chriselrod/BLASBenchmarks.jl/actions)
6-
[![Coverage](https://codecov.io/gh/chriselrod/BLASBenchmarks.jl/branch/master/graph/badge.svg)](https://codecov.io/gh/chriselrod/BLASBenchmarks.jl)
7-
8-
For Benchmarking BLAS Libraries.
5+
[![Continuous Integration](https://github.com/chriselrod/BLASBenchmarks.jl/workflows/CI/badge.svg)](https://github.com/chriselrod/BLASBenchmarks.jl/actions)
6+
[![Continuous Integration (Julia nightly)](https://github.com/chriselrod/BLASBenchmarks.jl/workflows/CI%20(Julia%20nightly)/badge.svg)](https://github.com/chriselrod/BLASBenchmarks.jl/actions?query=workflow%3A%22CI+%28Julia+nightly%29%22)
97

8+
BLASBenchmarks is a Julia package for benchmarking BLAS libraries.
109

10+
Please see the
11+
[documentation](https://chriselrod.github.io/BLASBenchmarks.jl/stable).

docs/Manifest.toml

Lines changed: 0 additions & 148 deletions
This file was deleted.

docs/Project.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
[deps]
22
BLASBenchmarks = "5fdc822c-4560-4d20-af7e-e5ee461714d5"
33
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
4+
StrideArrays = "d1fa6d79-ef01-42a6-86c9-f7c551f8593b"

docs/make.jl

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,22 @@ using Documenter
44
makedocs(;
55
modules=[BLASBenchmarks],
66
authors="Chris Elrod <[email protected]> and contributors",
7-
repo="https://github.com/"Chris Elrod"/BLASBenchmarks.jl/blob/{commit}{path}#L{line}",
7+
repo="https://github.com/chriselrod/BLASBenchmarks.jl/blob/{commit}{path}#L{line}",
88
sitename="BLASBenchmarks.jl",
99
format=Documenter.HTML(;
1010
prettyurls=get(ENV, "CI", "false") == "true",
11-
canonical="https://"Chris Elrod".github.io/BLASBenchmarks.jl",
11+
canonical="https://chriselrod.github.io/BLASBenchmarks.jl",
1212
assets=String[],
1313
),
1414
pages=[
1515
"Home" => "index.md",
16+
"Usage" => "usage.md",
17+
"Public API" => "public-api.md",
18+
"Internals (Private)" => "internals.md",
1619
],
20+
strict=true,
1721
)
1822

1923
deploydocs(;
20-
repo="github.com/"Chris Elrod"/BLASBenchmarks.jl",
24+
repo="github.com/chriselrod/BLASBenchmarks.jl",
2125
)

docs/src/assets/gemm_Float32_10_30_haswell_AVX2__multithreaded_logscale.svg

Lines changed: 3 additions & 0 deletions
Loading

docs/src/assets/gemm_Float64_10_30_haswell_AVX2__multithreaded_logscale.svg

Lines changed: 3 additions & 0 deletions
Loading

docs/src/index.md

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,15 @@ CurrentModule = BLASBenchmarks
44

55
# BLASBenchmarks
66

7-
```@index
8-
```
7+
BLASBenchmarks is a Julia package for benchmarking BLAS libraries.
98

10-
```@autodocs
11-
Modules = [BLASBenchmarks]
12-
```
9+
The source code for this package is available in the
10+
[GitHub repository](https://github.com/chriselrod/BLASBenchmarks.jl).
11+
12+
## Float64
13+
14+
![Float64](../assets/gemm_Float64_10_30_haswell_AVX2__multithreaded_logscale.svg)
15+
16+
## Float32
17+
18+
![Float32](../assets/gemm_Float32_10_30_haswell_AVX2__multithreaded_logscale.svg)

docs/src/internals.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
```@meta
2+
CurrentModule = BLASBenchmarks
3+
```
4+
5+
# Internals (Private)
6+
7+
```@index
8+
Pages = ["internals.md"]
9+
```
10+
11+
```@autodocs
12+
Modules = [BLASBenchmarks]
13+
Private = true
14+
Public = false
15+
```

0 commit comments

Comments
 (0)