Skip to content

Commit c9d2e4f

Browse files
authored
Merge pull request #795 from rust-ndarray/prepare-0.13.1
Prepare 0.13.1
2 parents 25cf334 + c913363 commit c9d2e4f

File tree

6 files changed

+60
-17
lines changed

6 files changed

+60
-17
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
Cargo.lock
22
target/
3-
.idea/

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ approx = { version = "0.3.2", optional = true }
3838

3939
# Use via the `blas` crate feature!
4040
cblas-sys = { version = "0.1.4", optional = true, default-features = false }
41-
blas-src = { version = "0.4.0", optional = true, default-features = false }
41+
blas-src = { version = "0.2.0", optional = true, default-features = false }
4242

4343
matrixmultiply = { version = "0.2.0" }
4444
serde = { version = "1.0", optional = true }

RELEASES.md

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,47 @@
1+
Version 0.13.1 (2020-04)
2+
===========================
3+
4+
New features
5+
------------
6+
7+
- New *amazing* slicing methods `multi_slice_*` by [@jturner314]
8+
https://github.com/rust-ndarray/ndarray/pull/717
9+
- New method `.cast()` for raw views by [@bluss]
10+
https://github.com/rust-ndarray/ndarray/pull/734
11+
- New aliases `ArcArray1`, `ArcArray2` by [@d-dorazio]
12+
https://github.com/rust-ndarray/ndarray/pull/741
13+
- New array constructor `from_shape_simple_fn` by [@bluss]
14+
https://github.com/rust-ndarray/ndarray/pull/728
15+
- `Dimension::Larger` now requires `RemoveAxis` by [@TheLortex]
16+
https://github.com/rust-ndarray/ndarray/pull/792
17+
18+
19+
Enhancements
20+
------------
21+
22+
- Remove itertools as dependency by [@bluss]
23+
https://github.com/rust-ndarray/ndarray/pull/730
24+
- Improve `zip_mut_with` (and thus arithmetic ops) for f-order arrays by [@nilgoyette]
25+
https://github.com/rust-ndarray/ndarray/pull/754
26+
- Implement `fold` for `IndicesIter` by [@jturner314]
27+
https://github.com/rust-ndarray/ndarray/pull/733
28+
29+
API changes
30+
-----------
31+
32+
- Remove alignment restriction on raw views by [@jturner314]
33+
https://github.com/rust-ndarray/ndarray/pull/738
34+
35+
Other changes
36+
-------------
37+
38+
- Fix documentation in ndarray for numpy users by [@jturner314]
39+
- Improve blas version documentation by [@jturner314]
40+
- Doc improvements by [@mockersf] https://github.com/rust-ndarray/ndarray/pull/751
41+
- Doc and lint related improvements by [@viniciusd] https://github.com/rust-ndarray/ndarray/pull/750
42+
- Release management by [@bluss]
43+
44+
145
Version 0.13.0 (2019-09-23)
246
===========================
347

@@ -895,3 +939,8 @@ Earlier releases
895939
[@termoshtt]: https://github.com/termoshtt
896940
[@rth]: https://github.com/rth
897941
[@nitsky]: https://github.com/nitsky
942+
[@d-dorazio]: https://github.com/d-dorazio
943+
[@nilgoyette]: https://github.com/nilgoyette
944+
[@TheLortex]: https://github.com/TheLortex
945+
[@mockersf]: https://github.com/mockersf
946+
[@viniciusd]: https://github.com/viniciusd

blas-tests/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ test = false
1010
[dev-dependencies]
1111
approx = "0.3.2"
1212
ndarray = { path = "../", features = ["approx", "blas"] }
13-
blas-src = { version = "0.4.0", default-features = false, features = ["openblas"] }
14-
openblas-src = { version = "0.7.0", default-features = false, features = ["cblas", "system"] }
13+
blas-src = { version = "0.2.0", default-features = false, features = ["openblas"] }
14+
openblas-src = { version = "0.6.0", default-features = false, features = ["cblas", "system"] }
1515
defmac = "0.2"
1616
num-traits = "0.2"

scripts/all-tests.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ set -e
66
FEATURES=$1
77
CHANNEL=$2
88

9-
([ "$CHANNEL" != "beta" ] || (rustup component add rustfmt && cargo fmt --all -- --check))
109
cargo build --verbose --no-default-features
1110
# Testing both dev and release profiles helps find bugs, especially in low level code
1211
cargo test --verbose --no-default-features

src/indexes.rs

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -273,18 +273,14 @@ where
273273
if !self.has_remaining {
274274
return (0, Some(0));
275275
}
276-
let l = match self.index {
277-
ref ix => {
278-
let gone = self
279-
.dim
280-
.fortran_strides()
281-
.slice()
282-
.iter()
283-
.zip(ix.slice().iter())
284-
.fold(0, |s, (&a, &b)| s + a as usize * b as usize);
285-
self.dim.size() - gone
286-
}
287-
};
276+
let gone = self
277+
.dim
278+
.fortran_strides()
279+
.slice()
280+
.iter()
281+
.zip(self.index.slice().iter())
282+
.fold(0, |s, (&a, &b)| s + a as usize * b as usize);
283+
let l = self.dim.size() - gone;
288284
(l, Some(l))
289285
}
290286
}

0 commit comments

Comments
 (0)