Skip to content

Commit 29ef75e

Browse files
committed
Merge pull request #192 from bluss/next
ndarray 0.5.0
2 parents b588a24 + 3faf7c4 commit 29ef75e

File tree

7 files changed

+27
-6
lines changed

7 files changed

+27
-6
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22

33
name = "ndarray"
4-
version = "0.5.0-alpha.2"
4+
version = "0.5.0"
55
authors = ["bluss"]
66
license = "MIT/Apache-2.0"
77

README.rst

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,20 @@ How to use with cargo::
8787
Recent Changes (ndarray)
8888
------------------------
8989

90+
- 0.5.0
91+
92+
- Require Rust 1.8 and exable +=, -= and other assign operators.
93+
All ``iadd, iadd_scalar`` and similar methods are now deprecated.
94+
- ndarray now has a prelude: ``use ndarray::prelude::*;``.
95+
- Constructors from_elem, zeros, from_shape_vec now all support passing a custom
96+
memory layout. A lot of specific constructors were deprecated.
97+
- Add method ``.select(Axis, &[Ix]) -> OwnedArray``, to create an array
98+
from a non-contiguous pick of subviews along an axis.
99+
- Rename ``.mat_mul()`` to just ``.dot()`` and add a function ``general_mat_mul``
100+
for matrix multiplication with scaling into an existing array.
101+
- **Change .fold() to use arbitrary order.**
102+
- See below for more details
103+
90104
- 0.5.0-alpha.2
91105

92106
- Fix a namespace bug in the stack![] macro.

ndarray-rand/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "ndarray-rand"
3-
version = "0.1.0"
3+
version = "0.1.1"
44
authors = ["bluss"]
55
license = "MIT/Apache-2.0"
66

@@ -13,4 +13,4 @@ keywords = ["multidimensional", "matrix", "rand", "ndarray"]
1313

1414
[dependencies]
1515
rand = "0.3"
16-
ndarray = { version = ">= 0.4.4, <= 0.5.0-alpha.10", path = ".." }
16+
ndarray = { version = ">= 0.4.9, < 0.6", path = ".." }

ndarray-rand/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ impl<S, D> RandomExt<S, D> for ArrayBase<S, D>
7575
Self::random_using(dim, dist, &mut rand::weak_rng())
7676
}
7777

78+
#[allow(deprecated)] // from_vec_dim
7879
fn random_using<IdS, R>(dim: D, dist: IdS, rng: &mut R) -> ArrayBase<S, D>
7980
where IdS: IndependentSample<S::Elem>,
8081
R: Rng

ndarray-rblas/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "ndarray-rblas"
3-
version = "0.1.0"
3+
version = "0.1.1"
44
authors = ["bluss"]
55
license = "MIT/Apache-2.0"
66

@@ -12,7 +12,7 @@ keywords = ["multidimensional", "matrix", "blas"]
1212

1313
[dependencies]
1414
rblas = "0.0.13"
15-
ndarray = { version = ">= 0.4.2, < 0.5.0-alpha.10", path = ".." }
15+
ndarray = { version = ">= 0.4.9, < 0.6", path = ".." }
1616

1717
[dev-dependencies]
1818
num = { version = "0.1", default-features = false }

ndarray-rblas/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ fn is_inner_contiguous<S, D>(a: &ArrayBase<S, D>) -> bool
110110

111111
/// If the array is not in the standard layout, copy all elements
112112
/// into the standard layout so that the array is C-contiguous.
113+
#[allow(deprecated)] // from_vec_dim
113114
fn ensure_standard_layout<A, S, D>(a: &mut ArrayBase<S, D>)
114115
where S: DataOwned<Elem=A>,
115116
D: Dimension,

src/impl_methods.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1260,7 +1260,12 @@ impl<A, S, D> ArrayBase<S, D> where S: Data<Elem=A>, D: Dimension
12601260
}
12611261
}
12621262

1263-
/// Fold along an axis
1263+
/// Fold along an axis.
1264+
///
1265+
/// Combine the elements of each subview with the previous using the `fold`
1266+
/// function and initial value `init`.
1267+
///
1268+
/// Return the result as an `OwnedArray`.
12641269
pub fn fold_axis<B, F>(&self, axis: Axis, init: B, mut fold: F)
12651270
-> OwnedArray<B, D::Smaller>
12661271
where D: RemoveAxis,

0 commit comments

Comments
 (0)