Skip to content

Commit 190313c

Browse files
authored
Merge pull request #68 from termoshtt/static_lapack
Use static link for OpenBLAS/Netlib
2 parents 7240b1d + 6e9616c commit 190313c

File tree

3 files changed

+40
-7
lines changed

3 files changed

+40
-7
lines changed

Cargo.toml

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,36 @@ keywords = ["ndarray", "lapack", "matrix"]
1010
license = "MIT"
1111

1212
[features]
13-
default = ["openblas"]
14-
openblas = ["lapack/openblas"]
15-
netlib = ["lapack/netlib"]
13+
default = ["openblas-static"]
14+
openblas-shared = ["lapack/openblas"]
15+
openblas-static = ["lapack/openblas", "openblas-src/static"]
16+
openblas-system = ["lapack/openblas", "openblas-src/system"]
17+
netlib-shared = ["lapack/netlib"]
18+
netlib-static = ["lapack/netlib", "netlib-src/static"]
19+
netlib-system = ["lapack/netlib", "netlib-src/system"]
1620

1721
[dependencies]
1822
rand = "0.3"
1923
derive-new = "0.4"
2024
enum-error-derive = "0.1"
2125
num-traits = "0.1"
2226
num-complex = "0.1"
23-
ndarray = { version = "0.9", default-features = false, features = ["blas"] }
24-
lapack = { version = "0.13", default-features = false }
27+
28+
[dependencies.ndarray]
29+
version = "0.9"
30+
default-features = false
31+
features = ["blas"]
32+
33+
[dependencies.lapack]
34+
version = "0.13"
35+
default-features = false
36+
37+
[dependencies.openblas-src]
38+
version = "0.5.3"
39+
default-features = false
40+
optional = true
41+
42+
[dependencies.netlib-src]
43+
version = "0.7.0"
44+
default-features = false
45+
optional = true

README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,18 @@ Dependencies
1414

1515
and more (See Cargo.toml).
1616

17+
Feature flags
18+
--------------
19+
20+
- OpenBLAS
21+
- `openblas-static`: use OpenBLAS with static link (default)
22+
- `openblas-shared`: use OpenBLAS with shared link
23+
- `openblas-system`: use system OpenBLAS (experimental)
24+
- Netlib
25+
- `netlib-static`: use Netlib with static link (default)
26+
- `netlib-shared`: use Netlib with shared link
27+
- `netlib-system`: use system Netlib (experimental)
28+
1729
Examples
1830
---------
1931
See [examples](https://github.com/termoshtt/ndarray-linalg/tree/master/examples) directory.

wercker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ test-openblas:
44
steps:
55
- script:
66
name: test OpenBLAS backend
7-
code: cargo test --no-default-features --features=openblas
7+
code: cargo test --no-default-features --features=openblas-static
88

99
test-netlib:
1010
steps:
1111
- script:
1212
name: test NetLib backend
13-
code: cargo test --no-default-features --features=netlib
13+
code: cargo test --no-default-features --features=netlib-static

0 commit comments

Comments
 (0)