Skip to content
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.

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

Replace com.github.fommil.netlib with dev.ludovic.netlib #811

Merged
merged 1 commit into from
May 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dist: trusty
before_install:
- sudo apt-get update -qq
#- sudo apt-get install -qq libatlas3gf-base libopenblas-base
sbt_args: -Dcom.github.fommil.netlib.BLAS=com.github.fommil.netlib.F2jBLAS -Dcom.github.fommil.netlib.LAPACK=com.github.fommil.netlib.F2jLAPACK -Dcom.github.fommil.netlib.ARPACK=com.github.fommil.netlib.F2jARPACK
sbt_args:
cache:
directories:
- $HOME/.ivy2
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package breeze.linalg
import breeze.benchmark.{MyRunner, BreezeBenchmark}
import breeze.linalg.operators.DenseVectorSupportMethods
import breeze.stats.distributions.Rand
import com.github.fommil.netlib.BLAS
import dev.ludovic.netlib.BLAS
import spire.syntax.cfor._

/**
Expand Down
4 changes: 3 additions & 1 deletion math/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ name := "breeze"
Common.commonSettings

libraryDependencies ++= Seq(
"com.github.fommil.netlib" % "core" % "1.1.2",
"dev.ludovic.netlib" % "blas" % "2.0.0",
"dev.ludovic.netlib" % "lapack" % "2.0.0",
"dev.ludovic.netlib" % "arpack" % "2.0.0",
"net.sourceforge.f2j" % "arpack_combined_all" % "0.1",
"net.sf.opencsv" % "opencsv" % "2.3",
"com.github.wendykierp" % "JTransforms" % "3.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import breeze.macros.expand
import breeze.math.{Field, Semiring}
import breeze.storage.Zero
import breeze.util.ArrayUtil
import com.github.fommil.netlib.BLAS.{getInstance => blas}
import com.github.fommil.netlib.LAPACK.{getInstance => lapack}
import dev.ludovic.netlib.BLAS.{getInstance => blas}
import dev.ludovic.netlib.LAPACK.{getInstance => lapack}
import org.netlib.util.intW
import scalaxy.debug._
import spire.syntax.cfor._
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import breeze.linalg.support._
import breeze.macros.expand
import breeze.math.{Complex, Field, Ring, Semiring}
import breeze.util.ArrayUtil
import com.github.fommil.netlib.BLAS.{getInstance => blas}
import dev.ludovic.netlib.BLAS.{getInstance => blas}
import scalaxy.debug._
import spire.syntax.cfor._

Expand Down
2 changes: 1 addition & 1 deletion math/src/main/scala/breeze/linalg/DenseVector.scala
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import breeze.util._
import breeze.storage.Zero

import scala.reflect.ClassTag
import com.github.fommil.netlib.BLAS.{getInstance => blas}
import dev.ludovic.netlib.BLAS.{getInstance => blas}
import breeze.macros.expand

import scala.math.BigInt
Expand Down
2 changes: 1 addition & 1 deletion math/src/main/scala/breeze/linalg/functions/LU.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package breeze.linalg

import org.netlib.util.intW
import com.github.fommil.netlib.LAPACK.{ getInstance => lapack }
import dev.ludovic.netlib.LAPACK.{ getInstance => lapack }
import breeze.generic.UFunc
import breeze.math.Semiring
import breeze.storage.Zero
Expand Down
2 changes: 1 addition & 1 deletion math/src/main/scala/breeze/linalg/functions/cholesky.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package breeze.linalg

import breeze.generic.UFunc
import org.netlib.util.intW
import com.github.fommil.netlib.LAPACK.{getInstance => lapack}
import dev.ludovic.netlib.LAPACK.{getInstance => lapack}
import breeze.linalg._

/**
Expand Down
2 changes: 1 addition & 1 deletion math/src/main/scala/breeze/linalg/functions/eig.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package breeze.linalg

import breeze.generic.UFunc
import org.netlib.util.intW
import com.github.fommil.netlib.LAPACK.{getInstance => lapack}
import dev.ludovic.netlib.LAPACK.{getInstance => lapack}

/**
* Eigenvalue decomposition (right eigenvectors)
Expand Down
2 changes: 1 addition & 1 deletion math/src/main/scala/breeze/linalg/functions/inv.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package breeze.linalg

import breeze.macros.expand
import org.netlib.util.intW
import com.github.fommil.netlib.LAPACK.{getInstance => lapack}
import dev.ludovic.netlib.LAPACK.{getInstance => lapack}
import breeze.generic.UFunc
import breeze.linalg.operators.{OpSolveMatrixBy, OpMulMatrix}
import breeze.linalg.support.CanTranspose
Expand Down
2 changes: 1 addition & 1 deletion math/src/main/scala/breeze/linalg/functions/qr.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package breeze.linalg

import breeze.generic.UFunc
import org.netlib.util.intW
import com.github.fommil.netlib.LAPACK.{getInstance => lapack}
import dev.ludovic.netlib.LAPACK.{getInstance => lapack}
import spire.implicits.{cforRange, cforRange2}

sealed private[this] trait QRMode
Expand Down
2 changes: 1 addition & 1 deletion math/src/main/scala/breeze/linalg/functions/rank.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package breeze.linalg

import breeze.generic.UFunc
import breeze.linalg.svd.SVD
import com.github.fommil.netlib.LAPACK.{getInstance => lapack}
import dev.ludovic.netlib.LAPACK.{getInstance => lapack}
import breeze.linalg.support.CanTraverseValues
import breeze.linalg.support.CanTraverseValues.ValuesVisitor
import breeze.math.Field
Expand Down
4 changes: 2 additions & 2 deletions math/src/main/scala/breeze/linalg/functions/svd.scala
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package breeze.linalg

import breeze.generic.UFunc
import com.github.fommil.netlib.LAPACK.{getInstance => lapack}
import com.github.fommil.netlib.ARPACK
import dev.ludovic.netlib.LAPACK.{getInstance => lapack}
import dev.ludovic.netlib.ARPACK
import org.netlib.util.intW
import org.netlib.util.doubleW
import breeze.linalg.operators.OpMulMatrix
Expand Down
2 changes: 1 addition & 1 deletion math/src/main/scala/breeze/linalg/package.scala
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,6 @@ package object linalg {
/**
* val to determine if breeze is using natives or f2jblas
*/
lazy val usingNatives = com.github.fommil.netlib.BLAS.getInstance.getClass.getName != "com.github.fommil.netlib.F2jBLAS"
lazy val usingNatives = dev.ludovic.netlib.BLAS.getInstance.isInstanceOf[dev.ludovic.netlib.NativeBLAS]

}
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import org.netlib.util.intW
import breeze.optimize.proximal.Constraint._
import scala.math.abs
import breeze.numerics._
import com.github.fommil.netlib.LAPACK.{getInstance => lapack}
import com.github.fommil.netlib.BLAS.{getInstance => blas}
import dev.ludovic.netlib.LAPACK.{getInstance => lapack}
import dev.ludovic.netlib.BLAS.{getInstance => blas}
import breeze.optimize.linear.{PowerMethod, NNLS, ConjugateGradient}
import breeze.stats.distributions.Rand
import spire.syntax.cfor._
Expand Down
2 changes: 1 addition & 1 deletion math/src/main/scala/breeze/stats/regression/Lasso.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package breeze.stats.regression

import breeze.generic.UFunc
import breeze.linalg._
import com.github.fommil.netlib.LAPACK.{getInstance => lapack}
import dev.ludovic.netlib.LAPACK.{getInstance => lapack}
import spire.implicits.cfor

private case class LassoCalculator(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package breeze.stats.regression
import breeze.generic.UFunc
import breeze.linalg._
import org.netlib.util.intW
import com.github.fommil.netlib.LAPACK.{getInstance => lapack}
import dev.ludovic.netlib.LAPACK.{getInstance => lapack}
import java.util.Arrays

private object leastSquaresImplementation {
Expand Down
4 changes: 2 additions & 2 deletions math/src/test/scala/breeze/linalg/UsingNativesTest.scala
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ class UsingNativesTest extends FunSuite with Checkers {

test("Using natives") {
if (!usingNatives) {
assert(com.github.fommil.netlib.BLAS.getInstance.getClass.getName == "com.github.fommil.netlib.F2jBLAS")
assert(dev.ludovic.netlib.BLAS.getInstance.isInstanceOf[dev.ludovic.netlib.JavaBLAS])
} else {
assert(com.github.fommil.netlib.BLAS.getInstance.getClass.getName != "com.github.fommil.netlib.F2jBLAS")
assert(dev.ludovic.netlib.BLAS.getInstance.isInstanceOf[dev.ludovic.netlib.NativeBLAS])
}
}

Expand Down
4 changes: 0 additions & 4 deletions natives/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ Common.commonSettings

name := "breeze-natives"

libraryDependencies ++= Seq(
("com.github.fommil.netlib" % "all" % "1.1.2").pomOnly()
)

// see https://github.com/typesafehub/scalalogging/issues/23
testOptions in Test += Tests.Setup(
classLoader =>
Expand Down