Skip to content

Remove prelude #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 21, 2017
Merged

Remove prelude #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
518fa2c
Remove prelude
termoshtt Jun 21, 2017
84875f7
Drop prelude from tests
termoshtt Jun 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/bin/main.rs → examples/eigh.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
extern crate ndarray;
extern crate ndarray_linalg;

use ndarray::prelude::*;
use ndarray_linalg::prelude::*;
use ndarray::*;
use ndarray_linalg::*;

fn main() {
let a = arr2(&[[3.0, 1.0, 1.0], [1.0, 3.0, 1.0], [1.0, 1.0, 3.0]]);
Expand Down
23 changes: 18 additions & 5 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,30 @@ pub mod error;
pub mod layout;
pub mod impl2;

pub mod qr;
pub mod svd;
pub mod opnorm;
pub mod solve;
pub mod cholesky;
pub mod eigh;
pub mod opnorm;
pub mod qr;
pub mod solve;
pub mod svd;
pub mod triangular;

pub mod generate;
pub mod assert;
pub mod norm;
pub mod trace;

pub mod prelude;
pub use assert::*;
pub use generate::*;
pub use layout::*;
pub use types::*;

pub use cholesky::*;
pub use eigh::*;
pub use norm::*;
pub use opnorm::*;
pub use qr::*;
pub use solve::*;
pub use svd::*;
pub use trace::*;
pub use triangular::*;
15 changes: 0 additions & 15 deletions src/prelude.rs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion tests/cholesky.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ extern crate ndarray;
extern crate ndarray_linalg;

use ndarray::*;
use ndarray_linalg::prelude::*;
use ndarray_linalg::*;

#[test]
fn cholesky() {
Expand Down
4 changes: 2 additions & 2 deletions tests/eigh.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ extern crate ndarray;
#[macro_use]
extern crate ndarray_linalg;

use ndarray::prelude::*;
use ndarray_linalg::prelude::*;
use ndarray::*;
use ndarray_linalg::*;

#[test]
fn eigen_vector_manual() {
Expand Down
2 changes: 1 addition & 1 deletion tests/header.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ extern crate num_traits;
#[allow(unused_imports)]
use ndarray::*;
#[allow(unused_imports)]
use ndarray_linalg::prelude::*;
use ndarray_linalg::*;
#[allow(unused_imports)]
use rand_extra::*;
#[allow(unused_imports)]
Expand Down
4 changes: 2 additions & 2 deletions tests/inv.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ macro_rules! impl_test{
($modname:ident, $clone:ident) => {
mod $modname {
use super::random_square;
use ndarray::prelude::*;
use ndarray_linalg::prelude::*;
use ndarray::*;
use ndarray_linalg::*;
#[test]
fn inv_random() {
let a = random_square(3);
Expand Down
2 changes: 1 addition & 1 deletion tests/layout.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ extern crate ndarray;
extern crate ndarray_linalg;

use ndarray::*;
use ndarray_linalg::prelude::*;
use ndarray_linalg::*;
use ndarray_linalg::layout::Layout;

#[test]
Expand Down
4 changes: 2 additions & 2 deletions tests/opnorm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ fn $funcname() {
macro_rules! impl_test_opnorm {
($modname:ident, $array:ty, $range:path) => {
mod $modname {
use ndarray::prelude::*;
use ndarray_linalg::prelude::*;
use ndarray::*;
use ndarray_linalg::*;
use num_traits::Float;
fn gen(i: usize, j: usize, rev: bool) -> $array {
let n = (i * j + 1) as f64;
Expand Down
4 changes: 2 additions & 2 deletions tests/qr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ macro_rules! impl_test {
#[test]
fn $funcname() {
use std::cmp::min;
use ndarray::prelude::*;
use ndarray_linalg::prelude::*;
use ndarray::*;
use ndarray_linalg::*;
let a = $random($n, $m, $t);
let ans = a.clone();
println!("a = \n{:?}", &a);
Expand Down
4 changes: 2 additions & 2 deletions tests/svd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ macro_rules! impl_test {
#[test]
fn $funcname() {
use std::cmp::min;
use ndarray::prelude::*;
use ndarray_linalg::prelude::*;
use ndarray::*;
use ndarray_linalg::*;
let a = $random($n, $m, $t);
let answer = a.clone();
println!("a = \n{:?}", &a);
Expand Down
2 changes: 1 addition & 1 deletion tests/triangular.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ extern crate ndarray;
extern crate ndarray_linalg;

use ndarray::*;
use ndarray_linalg::prelude::*;
use ndarray_linalg::*;

fn test1d<A, Sa, Sb, Tol>(uplo: UPLO, a: ArrayBase<Sa, Ix2>, b: ArrayBase<Sb, Ix1>, tol: Tol)
where A: Field + Absolute<Output = Tol>,
Expand Down