Skip to content

Commit

Permalink
Merge pull request #795 from rust-ndarray/prepare-0.13.1
Browse files Browse the repository at this point in the history
Prepare 0.13.1
  • Loading branch information
bluss authored Apr 15, 2020
2 parents 25cf334 + c913363 commit c9d2e4f
Show file tree
Hide file tree
Showing 6 changed files with 60 additions and 17 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
Cargo.lock
target/
.idea/
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ approx = { version = "0.3.2", optional = true }

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

matrixmultiply = { version = "0.2.0" }
serde = { version = "1.0", optional = true }
Expand Down
49 changes: 49 additions & 0 deletions RELEASES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,47 @@
Version 0.13.1 (2020-04)
===========================

New features
------------

- New *amazing* slicing methods `multi_slice_*` by [@jturner314]
https://github.com/rust-ndarray/ndarray/pull/717
- New method `.cast()` for raw views by [@bluss]
https://github.com/rust-ndarray/ndarray/pull/734
- New aliases `ArcArray1`, `ArcArray2` by [@d-dorazio]
https://github.com/rust-ndarray/ndarray/pull/741
- New array constructor `from_shape_simple_fn` by [@bluss]
https://github.com/rust-ndarray/ndarray/pull/728
- `Dimension::Larger` now requires `RemoveAxis` by [@TheLortex]
https://github.com/rust-ndarray/ndarray/pull/792


Enhancements
------------

- Remove itertools as dependency by [@bluss]
https://github.com/rust-ndarray/ndarray/pull/730
- Improve `zip_mut_with` (and thus arithmetic ops) for f-order arrays by [@nilgoyette]
https://github.com/rust-ndarray/ndarray/pull/754
- Implement `fold` for `IndicesIter` by [@jturner314]
https://github.com/rust-ndarray/ndarray/pull/733

API changes
-----------

- Remove alignment restriction on raw views by [@jturner314]
https://github.com/rust-ndarray/ndarray/pull/738

Other changes
-------------

- Fix documentation in ndarray for numpy users by [@jturner314]
- Improve blas version documentation by [@jturner314]
- Doc improvements by [@mockersf] https://github.com/rust-ndarray/ndarray/pull/751
- Doc and lint related improvements by [@viniciusd] https://github.com/rust-ndarray/ndarray/pull/750
- Release management by [@bluss]


Version 0.13.0 (2019-09-23)
===========================

Expand Down Expand Up @@ -895,3 +939,8 @@ Earlier releases
[@termoshtt]: https://github.com/termoshtt
[@rth]: https://github.com/rth
[@nitsky]: https://github.com/nitsky
[@d-dorazio]: https://github.com/d-dorazio
[@nilgoyette]: https://github.com/nilgoyette
[@TheLortex]: https://github.com/TheLortex
[@mockersf]: https://github.com/mockersf
[@viniciusd]: https://github.com/viniciusd
4 changes: 2 additions & 2 deletions blas-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ test = false
[dev-dependencies]
approx = "0.3.2"
ndarray = { path = "../", features = ["approx", "blas"] }
blas-src = { version = "0.4.0", default-features = false, features = ["openblas"] }
openblas-src = { version = "0.7.0", default-features = false, features = ["cblas", "system"] }
blas-src = { version = "0.2.0", default-features = false, features = ["openblas"] }
openblas-src = { version = "0.6.0", default-features = false, features = ["cblas", "system"] }
defmac = "0.2"
num-traits = "0.2"
1 change: 0 additions & 1 deletion scripts/all-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ set -e
FEATURES=$1
CHANNEL=$2

([ "$CHANNEL" != "beta" ] || (rustup component add rustfmt && cargo fmt --all -- --check))
cargo build --verbose --no-default-features
# Testing both dev and release profiles helps find bugs, especially in low level code
cargo test --verbose --no-default-features
Expand Down
20 changes: 8 additions & 12 deletions src/indexes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -273,18 +273,14 @@ where
if !self.has_remaining {
return (0, Some(0));
}
let l = match self.index {
ref ix => {
let gone = self
.dim
.fortran_strides()
.slice()
.iter()
.zip(ix.slice().iter())
.fold(0, |s, (&a, &b)| s + a as usize * b as usize);
self.dim.size() - gone
}
};
let gone = self
.dim
.fortran_strides()
.slice()
.iter()
.zip(self.index.slice().iter())
.fold(0, |s, (&a, &b)| s + a as usize * b as usize);
let l = self.dim.size() - gone;
(l, Some(l))
}
}
Expand Down

0 comments on commit c9d2e4f

Please sign in to comment.