Skip to content

Commit 01b5ba7

Browse files
committed
Merge branch 'master' into update
2 parents afd09ba + 54a0154 commit 01b5ba7

File tree

5 files changed

+59
-77
lines changed

5 files changed

+59
-77
lines changed

.circleci/config.yml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
version: 2.0
2+
3+
references:
4+
rust_cfg: &rust_cfg
5+
docker:
6+
- image: rust:1.26.2
7+
8+
jobs:
9+
test-openblas:
10+
<<: *rust_cfg
11+
steps:
12+
- checkout
13+
- run:
14+
name: test OpenBLAS backend
15+
command: |
16+
apt update && apt install -y gfortran
17+
cargo test --no-default-features --features=openblas
18+
19+
test-netlib:
20+
<<: *rust_cfg
21+
steps:
22+
- checkout
23+
- run:
24+
name: test NetLib backend
25+
command: |
26+
apt update && apt install -y cmake gfortran
27+
cargo test --no-default-features --features=netlib
28+
29+
test-intel-mkl:
30+
<<: *rust_cfg
31+
steps:
32+
- checkout
33+
- run:
34+
name: test Intel MKL backend
35+
command: cargo test --no-default-features --features=intel-mkl
36+
37+
format:
38+
<<: *rust_cfg
39+
steps:
40+
- checkout
41+
- run:
42+
name: check format
43+
command: |
44+
rustup component add rustfmt-preview
45+
cargo fmt -- --write-mode=diff
46+
47+
workflows:
48+
version: 2
49+
tests:
50+
jobs:
51+
- test-openblas
52+
- test-netlib
53+
- test-intel-mkl
54+
- format

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@ ndarray-linalg
22
===============
33
[![Crate](http://meritbadge.herokuapp.com/ndarray-linalg)](https://crates.io/crates/ndarray-linalg)
44
[![docs.rs](https://docs.rs/ndarray-linalg/badge.svg)](https://docs.rs/ndarray-linalg)
5-
[![wercker status](https://app.wercker.com/status/f04aeba682ea6e79577e15bd946344a5/s/master "wercker status")](https://app.wercker.com/project/byKey/f04aeba682ea6e79577e15bd946344a5)
5+
[![CircleCI](https://circleci.com/gh/termoshtt/ndarray-linalg.svg?style=shield)](https://circleci.com/gh/termoshtt/ndarray-linalg)
66
[![Gitter chat](https://badges.gitter.im/termoshtt-scirust/ndarray-linalg.png)](https://gitter.im/termoshtt-scirust/ndarray-linalg)
77

8-
98
Linear algebra package for Rust with [rust-ndarray](https://github.com/bluss/rust-ndarray).
109

1110
LAPACKE Backend
@@ -14,9 +13,11 @@ LAPACKE Backend
1413
Currently three LAPACKE implementations are supported and tested:
1514

1615
- [OpenBLAS](https://github.com/cmr/openblas-src)
16+
- needs `gfortran` (or other Fortran compiler)
1717
- [Netlib](https://github.com/cmr/netlib-src)
18+
- needs `cmake` and `gfortran`
1819
- [Intel MKL](https://github.com/termoshtt/rust-intel-mkl) (non-free license, see the linked page)
19-
20+
- needs `curl`
2021
There are two ways to link LAPACKE backend:
2122

2223
### backend features (recommended)

rust-toolchain

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
stable

rustfmt.toml

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2,55 +2,8 @@ max_width = 120
22
hard_tabs = false
33
tab_spaces = 4
44
newline_style = "Unix"
5-
use_small_heuristics = true
6-
indent_style = "Block"
75
wrap_comments = false
8-
comment_width = 100
96
normalize_comments = false
10-
format_strings = false
11-
empty_item_single_line = true
12-
struct_lit_single_line = true
13-
fn_single_line = false
14-
where_single_line = false
15-
imports_indent = "Visual"
16-
imports_layout = "Mixed"
17-
merge_imports = false
18-
reorder_imports = true
19-
reorder_modules = true
20-
reorder_impl_items = false
21-
type_punctuation_density = "Wide"
22-
space_before_colon = false
23-
space_after_colon = true
24-
spaces_around_ranges = false
25-
spaces_within_parens_and_brackets = false
26-
binop_separator = "Front"
27-
remove_blank_lines_at_start_or_end_of_block = true
28-
combine_control_expr = true
29-
struct_field_align_threshold = 0
30-
match_arm_blocks = true
31-
force_multiline_blocks = false
32-
fn_args_density = "Tall"
33-
brace_style = "SameLineWhere"
34-
control_brace_style = "AlwaysSameLine"
35-
trailing_semicolon = true
36-
trailing_comma = "Vertical"
37-
match_block_trailing_comma = false
38-
blank_lines_upper_bound = 1
39-
blank_lines_lower_bound = 0
407
merge_derives = true
41-
use_try_shorthand = false
42-
condense_wildcard_suffixes = false
438
force_explicit_abi = true
44-
use_field_init_shorthand = false
45-
write_mode = "Overwrite"
46-
color = "Auto"
479
unstable_features = false
48-
disable_all_formatting = false
49-
skip_children = false
50-
hide_parse_errors = false
51-
error_on_line_overflow = false
52-
error_on_unformatted = false
53-
report_todo = "Never"
54-
report_fixme = "Never"
55-
ignore = []
56-
verbose_diff = false

wercker.yml

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

0 commit comments

Comments
 (0)