Skip to content

Commit f031b5a

Browse files
authored
Merge pull request #6 from bnaras/r-src
Add r as source of lapack
2 parents fedd02c + 532f093 commit f031b5a

File tree

5 files changed

+80
-49
lines changed

5 files changed

+80
-49
lines changed

.github/workflows/build.yml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: build
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
branches:
9+
- master
10+
workflow_dispatch:
11+
12+
jobs:
13+
macos:
14+
name: macOS
15+
runs-on: macos-latest
16+
strategy:
17+
matrix:
18+
feature:
19+
- accelerate
20+
- intel-mkl
21+
- netlib
22+
- openblas
23+
steps:
24+
- uses: actions/checkout@v3
25+
- name: Run the test suite
26+
uses: actions-rs/cargo@v1
27+
with:
28+
command: test
29+
args: >
30+
--features=${{ matrix.feature }}
31+
env:
32+
CC: gcc-13
33+
FC: gfortran-13
34+
LIBRARY_PATH: /usr/local/opt/gcc@13/lib/gcc/13
35+
36+
ubuntu:
37+
name: Ubuntu
38+
runs-on: ubuntu-latest
39+
strategy:
40+
matrix:
41+
feature:
42+
- intel-mkl
43+
- netlib
44+
- openblas
45+
steps:
46+
- uses: actions/checkout@v3
47+
- name: Run the test suite
48+
uses: actions-rs/cargo@v1
49+
with:
50+
command: test
51+
args: >
52+
--features=${{ matrix.feature }}

.travis.yml

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

Cargo.toml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "lapack-src"
3-
version = "0.8.0"
3+
version = "0.9.0"
44
license = "Apache-2.0/MIT"
55
authors = [
66
"Ivan Ukhov <[email protected]>",
@@ -21,6 +21,7 @@ accelerate = ["accelerate-src"]
2121
intel-mkl = ["intel-mkl-src"]
2222
netlib = ["netlib-src"]
2323
openblas = ["openblas-src"]
24+
r = ["r-src"]
2425

2526
[dependencies.accelerate-src]
2627
version = "0.3"
@@ -37,3 +38,7 @@ optional = true
3738
[dependencies.openblas-src]
3839
version = "0.10"
3940
optional = true
41+
42+
[dependencies.r-src]
43+
version = "0.1"
44+
optional = true

README.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,20 @@ The following implementations are available:
1010

1111
* `accelerate`, which is the one in the [Accelerate] framework (macOS only),
1212
* `intel-mkl`, which is the one in [Intel MKL],
13-
* `netlib`, which is the reference one by [Netlib], and
14-
* `openblas`, which is the one in [OpenBLAS].
13+
* `netlib`, which is the reference one by [Netlib],
14+
* `openblas`, which is the one in [OpenBLAS], and
15+
* `r`, which is the one in [R].
16+
1517

1618
An implementation can be chosen as follows:
1719

1820
```toml
1921
[dependencies]
20-
lapack-src = { version = "0.8", features = ["accelerate"] }
21-
lapack-src = { version = "0.8", features = ["intel-mkl"] }
22-
lapack-src = { version = "0.8", features = ["netlib"] }
23-
lapack-src = { version = "0.8", features = ["openblas"] }
22+
lapack-src = { version = "0.9", features = ["accelerate"] }
23+
lapack-src = { version = "0.9", features = ["intel-mkl"] }
24+
lapack-src = { version = "0.9", features = ["netlib"] }
25+
lapack-src = { version = "0.9", features = ["openblas"] }
26+
lapack-src = { version = "0.9", features = ["r"] }
2427
```
2528

2629
## Contribution
@@ -36,6 +39,7 @@ will be licensed according to the terms given in [LICENSE.md](LICENSE.md).
3639
[intel mkl]: https://software.intel.com/en-us/mkl
3740
[netlib]: http://www.netlib.org/
3841
[openblas]: http://www.openblas.net/
42+
[R]: https://cran.r-project.org
3943

4044
[build-img]: https://travis-ci.org/blas-lapack-rs/lapack-src.svg?branch=master
4145
[build-url]: https://travis-ci.org/blas-lapack-rs/lapack-src

src/lib.rs

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,19 @@
88
//!
99
//! * `accelerate`, which is the one in the [Accelerate] framework (macOS only),
1010
//! * `intel-mkl`, which is the one in [Intel MKL],
11-
//! * `netlib`, which is the reference one by [Netlib], and
12-
//! * `openblas`, which is the one in [OpenBLAS].
11+
//! * `netlib`, which is the reference one by [Netlib],
12+
//! * `openblas`, which is the one in [OpenBLAS], and
13+
//! * `r`, which is the one in [R].
1314
//!
1415
//! An implementation can be chosen as follows:
1516
//!
1617
//! ```toml
1718
//! [dependencies]
18-
//! lapack-src = { version = "0.8", features = ["accelerate"] }
19-
//! lapack-src = { version = "0.8", features = ["intel-mkl"] }
20-
//! lapack-src = { version = "0.8", features = ["netlib"] }
21-
//! lapack-src = { version = "0.8", features = ["openblas"] }
19+
//! lapack-src = { version = "0.9", features = ["accelerate"] }
20+
//! lapack-src = { version = "0.9", features = ["intel-mkl"] }
21+
//! lapack-src = { version = "0.9", features = ["netlib"] }
22+
//! lapack-src = { version = "0.9", features = ["openblas"] }
23+
//! lapack-src = { version = "0.9", features = ["r"] }
2224
//! ```
2325
//!
2426
//! [architecture]: https://blas-lapack-rs.github.io/architecture
@@ -28,6 +30,7 @@
2830
//! [intel mkl]: https://software.intel.com/en-us/mkl
2931
//! [netlib]: http://www.netlib.org/
3032
//! [openblas]: http://www.openblas.net/
33+
//! [R]: https://cran.r-project.org
3134
3235
#![no_std]
3336

@@ -42,3 +45,6 @@ extern crate netlib_src as raw;
4245

4346
#[cfg(feature = "openblas")]
4447
extern crate openblas_src as raw;
48+
49+
#[cfg(feature = "r")]
50+
extern crate r_src as raw;

0 commit comments

Comments
 (0)