Skip to content

Commit 700fcec

Browse files
authored
Merge pull request #209 from rust-ndarray/cargo-workspace
Cargo workspace
2 parents d299104 + a3c79a6 commit 700fcec

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+126
-116
lines changed

.github/workflows/ndarray-linalg.yml

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
name: ndarray-linalg
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request: {}
8+
9+
jobs:
10+
windows:
11+
runs-on: windows-2019
12+
steps:
13+
- uses: actions/checkout@v1
14+
- uses: actions-rs/cargo@v1
15+
with:
16+
command: test
17+
args: --manifest-path=ndarray-linalg/Cargo.toml --features=intel-mkl --no-default-features
18+
19+
macos:
20+
runs-on: macos-10.15
21+
env:
22+
CC: gcc-9
23+
FC: gfortran-9
24+
LIBRARY_PATH: /usr/local/opt/gcc/lib/gcc/9
25+
strategy:
26+
fail-fast: false
27+
matrix:
28+
feature:
29+
- netlib
30+
- openblas
31+
- intel-mkl
32+
steps:
33+
- uses: actions/checkout@v1
34+
- uses: actions-rs/cargo@v1
35+
with:
36+
command: test
37+
args: --manifest-path=ndarray-linalg/Cargo.toml --features=${{ matrix.feature }} --no-default-features
38+
39+
linux:
40+
runs-on: ubuntu-18.04
41+
strategy:
42+
fail-fast: false
43+
matrix:
44+
feature:
45+
- netlib
46+
- openblas
47+
- intel-mkl
48+
steps:
49+
- uses: actions/checkout@v1
50+
- name: apt-install gfortran
51+
run: |
52+
sudo apt update
53+
sudo apt install -y gfortran
54+
if: ${{ matrix.feature != 'intel-mkl' }}
55+
- uses: actions-rs/cargo@v1
56+
with:
57+
command: test
58+
args: --manifest-path=ndarray-linalg/Cargo.toml --features=${{ matrix.feature }} --no-default-features

.github/workflows/rust.yml

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -7,56 +7,6 @@ on:
77
pull_request: {}
88

99
jobs:
10-
windows:
11-
runs-on: windows-2019
12-
steps:
13-
- uses: actions/checkout@v1
14-
- uses: actions-rs/cargo@v1
15-
with:
16-
command: test
17-
args: --features=intel-mkl --no-default-features
18-
19-
macos:
20-
runs-on: macos-10.15
21-
env:
22-
CC: gcc-9
23-
FC: gfortran-9
24-
LIBRARY_PATH: /usr/local/opt/gcc/lib/gcc/9
25-
strategy:
26-
fail-fast: false
27-
matrix:
28-
feature:
29-
- netlib
30-
- openblas
31-
- intel-mkl
32-
steps:
33-
- uses: actions/checkout@v1
34-
- uses: actions-rs/cargo@v1
35-
with:
36-
command: test
37-
args: --features=${{ matrix.feature }} --no-default-features
38-
39-
linux:
40-
runs-on: ubuntu-18.04
41-
strategy:
42-
fail-fast: false
43-
matrix:
44-
feature:
45-
- netlib
46-
- openblas
47-
- intel-mkl
48-
steps:
49-
- uses: actions/checkout@v1
50-
- name: apt-install gfortran
51-
run: |
52-
sudo apt update
53-
sudo apt install -y gfortran
54-
if: ${{ matrix.feature != 'intel-mkl' }}
55-
- uses: actions-rs/cargo@v1
56-
with:
57-
command: test
58-
args: --features=${{ matrix.feature }} --no-default-features
59-
6010
check-format:
6111
runs-on: ubuntu-18.04
6212
steps:

Cargo.toml

Lines changed: 2 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,2 @@
1-
[package]
2-
name = "ndarray-linalg"
3-
version = "0.13.0-alpha.0"
4-
authors = ["Toshiki Teramura <[email protected]>"]
5-
edition = "2018"
6-
7-
description = "Linear algebra package for rust-ndarray using LAPACK"
8-
documentation = "https://docs.rs/ndarray-linalg/"
9-
repository = "https://github.com/rust-ndarray/ndarray-linalg"
10-
keywords = ["ndarray", "lapack", "matrix"]
11-
license = "MIT"
12-
readme = "README.md"
13-
categories = ["algorithms", "science"]
14-
15-
[features]
16-
default = []
17-
intel-mkl = ["lapack-src/intel-mkl", "blas-src/intel-mkl"]
18-
netlib = ["lapack-src/netlib", "blas-src/netlib"]
19-
openblas = ["lapack-src/openblas", "blas-src/openblas"]
20-
serde-1 = ["ndarray/serde-1", "num-complex/serde"]
21-
22-
static = ["openblas-static"]
23-
openblas-static = ["openblas", "openblas-src"]
24-
25-
[dependencies]
26-
lapacke = "0.2.0"
27-
num-traits = "0.2.11"
28-
cauchy = "0.2.2"
29-
num-complex = "0.2.4"
30-
rand = "0.5"
31-
thiserror = "1.0.20"
32-
33-
[dependencies.ndarray]
34-
version = "0.13.0"
35-
features = ["blas", "approx"]
36-
default-features = false
37-
38-
[dependencies.blas-src]
39-
version = "0.6.1"
40-
default-features = false
41-
42-
[dependencies.lapack-src]
43-
version = "0.6.0"
44-
default-features = false
45-
46-
[dependencies.openblas-src]
47-
version = "0.9.0"
48-
default-features = false
49-
features = ["static"]
50-
optional = true
51-
52-
[dev-dependencies]
53-
paste = "0.1.9"
54-
criterion = "0.3.1"
55-
approx = { version = "0.3.2", features = ["num-complex"] }
56-
57-
[[bench]]
58-
name = "truncated_eig"
59-
harness = false
60-
61-
[[bench]]
62-
name = "eigh"
63-
harness = false
64-
65-
[package.metadata.docs.rs]
66-
rustdoc-args = ["--html-in-header", "katex-header.html"]
1+
[workspace]
2+
members = ["ndarray-linalg"]

ndarray-linalg/Cargo.toml

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
[package]
2+
name = "ndarray-linalg"
3+
version = "0.13.0-alpha.0"
4+
authors = ["Toshiki Teramura <[email protected]>"]
5+
edition = "2018"
6+
7+
description = "Linear algebra package for rust-ndarray using LAPACK"
8+
documentation = "https://docs.rs/ndarray-linalg/"
9+
repository = "https://github.com/rust-ndarray/ndarray-linalg"
10+
keywords = ["ndarray", "lapack", "matrix"]
11+
license = "MIT"
12+
readme = "README.md"
13+
categories = ["algorithms", "science"]
14+
15+
[features]
16+
default = []
17+
intel-mkl = ["lapack-src/intel-mkl", "blas-src/intel-mkl"]
18+
netlib = ["lapack-src/netlib", "blas-src/netlib"]
19+
openblas = ["lapack-src/openblas", "blas-src/openblas"]
20+
serde-1 = ["ndarray/serde-1", "num-complex/serde"]
21+
22+
static = ["openblas-static"]
23+
openblas-static = ["openblas", "openblas-src"]
24+
25+
[dependencies]
26+
lapacke = "0.2.0"
27+
num-traits = "0.2.11"
28+
cauchy = "0.2.2"
29+
num-complex = "0.2.4"
30+
rand = "0.5"
31+
thiserror = "1.0.20"
32+
33+
[dependencies.ndarray]
34+
version = "0.13.0"
35+
features = ["blas", "approx"]
36+
default-features = false
37+
38+
[dependencies.blas-src]
39+
version = "0.6.1"
40+
default-features = false
41+
42+
[dependencies.lapack-src]
43+
version = "0.6.0"
44+
default-features = false
45+
46+
[dependencies.openblas-src]
47+
version = "0.9.0"
48+
default-features = false
49+
features = ["static"]
50+
optional = true
51+
52+
[dev-dependencies]
53+
paste = "0.1.9"
54+
criterion = "0.3.1"
55+
approx = { version = "0.3.2", features = ["num-complex"] }
56+
57+
[[bench]]
58+
name = "truncated_eig"
59+
harness = false
60+
61+
[[bench]]
62+
name = "eigh"
63+
harness = false
64+
65+
[package.metadata.docs.rs]
66+
rustdoc-args = ["--html-in-header", "katex-header.html"]
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)