Skip to content

Commit 2c5189d

Browse files
committed
s/lapack/lax/g
1 parent ce87b81 commit 2c5189d

File tree

17 files changed

+29
-25
lines changed

17 files changed

+29
-25
lines changed

ndarray-linalg/src/cholesky.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ use crate::layout::*;
5252
use crate::triangular::IntoTriangular;
5353
use crate::types::*;
5454

55-
pub use crate::lapack::UPLO;
55+
pub use lax::UPLO;
5656

5757
/// Cholesky decomposition of Hermitian (or real symmetric) positive definite matrix
5858
pub struct CholeskyFactorized<S: Data> {

ndarray-linalg/src/convert.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
//! utilities for convert array
22
3+
use lax::UPLO;
34
use ndarray::*;
45

56
use super::error::*;
6-
use super::lapack::UPLO;
77
use super::layout::*;
88
use super::types::*;
99

ndarray-linalg/src/error.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pub enum LinalgError {
1414

1515
/// LAPACK subroutine returns non-zero code
1616
#[error(transparent)]
17-
Lapack(#[from] lapack::error::Error),
17+
Lapack(#[from] lax::error::Error),
1818

1919
/// Strides of the array is not supported
2020
#[error("invalid stride: s0={}, s1={}", s0, s1)]

ndarray-linalg/src/layout.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
use super::error::*;
44
use ndarray::*;
55

6-
pub use lapack::layout::MatrixLayout;
6+
pub use lax::layout::MatrixLayout;
77

88
pub trait AllocatedArray {
99
type Elem;

ndarray-linalg/src/least_squares.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@
6060
//! // `a` and `b` have been moved, no longer valid
6161
//! ```
6262
63+
use lax::*;
6364
use ndarray::*;
6465

6566
use crate::error::*;
66-
use crate::lapack::*;
6767
use crate::layout::*;
6868
use crate::types::*;
6969

ndarray-linalg/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747

4848
#[macro_use]
4949
extern crate ndarray;
50-
extern crate lax as lapack;
5150

5251
pub mod assert;
5352
pub mod cholesky;

ndarray-linalg/src/lobpcg/eig.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
use super::lobpcg::{lobpcg, LobpcgResult, Order};
2-
use crate::{generate, Lapack, Scalar};
2+
use crate::{generate, Scalar};
3+
use lax::Lapack;
4+
35
///! Implements truncated eigenvalue decomposition
46
///
57
use ndarray::prelude::*;

ndarray-linalg/src/lobpcg/lobpcg.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
///which can be used as a solver for large symmetric positive definite eigenproblems.
55
use crate::error::{LinalgError, Result};
66
use crate::{cholesky::*, close_l2, eigh::*, norm::*, triangular::*};
7-
use crate::{Lapack, Scalar};
7+
use cauchy::Scalar;
8+
use lax::Lapack;
89
use ndarray::prelude::*;
910
use ndarray::{Data, OwnedRepr, ScalarOperand};
1011
use num_traits::{Float, NumCast};
@@ -338,7 +339,7 @@ pub fn lobpcg<
338339
let result = p_ap
339340
.as_ref()
340341
.ok_or(LinalgError::Lapack(
341-
lapack::error::Error::LapackComputationalFailure { return_code: 1 },
342+
lax::error::Error::LapackComputationalFailure { return_code: 1 },
342343
))
343344
.and_then(|(active_p, active_ap)| {
344345
let xap = x.t().dot(active_ap);

ndarray-linalg/src/lobpcg/svd.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
///! This module computes the k largest/smallest singular values/vectors for a dense matrix.
44
use super::lobpcg::{lobpcg, LobpcgResult, Order};
55
use crate::error::Result;
6-
use crate::{generate, Lapack, Scalar};
6+
use crate::generate;
7+
use cauchy::Scalar;
8+
use lax::Lapack;
79
use ndarray::prelude::*;
810
use ndarray::ScalarOperand;
911
use num_traits::{Float, NumCast};

ndarray-linalg/src/opnorm.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
//! Operator norm
22
3+
use lax::Tridiagonal;
34
use ndarray::*;
45

56
use crate::convert::*;
67
use crate::error::*;
7-
use crate::lapack::Tridiagonal;
88
use crate::layout::*;
99
use crate::types::*;
1010

11-
pub use crate::lapack::NormType;
11+
pub use lax::NormType;
1212

1313
/// Operator norm using `*lange` LAPACK routines
1414
///

0 commit comments

Comments
 (0)