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

LiuShiHan · May 4, 2021 · cdc3563 · cdc3563
1 parent 31e9a79
commit cdc3563
Show file tree

Hide file tree

Showing 19 changed files with 24 additions and 26 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -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
diff --git a/benchmark/src/main/scala/breeze/linalg/DenseAxpyBenchmark.scala b/benchmark/src/main/scala/breeze/linalg/DenseAxpyBenchmark.scala
@@ -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._
 
 /**

diff --git a/math/build.sbt b/math/build.sbt
@@ -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",

diff --git a/math/src/main/codegen/breeze/linalg/operators/DenseMatrixOps.scala b/math/src/main/codegen/breeze/linalg/operators/DenseMatrixOps.scala
@@ -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._

diff --git a/math/src/main/codegen/breeze/linalg/operators/DenseVectorOps.scala b/math/src/main/codegen/breeze/linalg/operators/DenseVectorOps.scala
@@ -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._
 

diff --git a/math/src/main/scala/breeze/linalg/DenseVector.scala b/math/src/main/scala/breeze/linalg/DenseVector.scala
@@ -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

diff --git a/math/src/main/scala/breeze/linalg/functions/LU.scala b/math/src/main/scala/breeze/linalg/functions/LU.scala
@@ -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

diff --git a/math/src/main/scala/breeze/linalg/functions/cholesky.scala b/math/src/main/scala/breeze/linalg/functions/cholesky.scala
@@ -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._
 
 /**

diff --git a/math/src/main/scala/breeze/linalg/functions/eig.scala b/math/src/main/scala/breeze/linalg/functions/eig.scala
@@ -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)

diff --git a/math/src/main/scala/breeze/linalg/functions/inv.scala b/math/src/main/scala/breeze/linalg/functions/inv.scala
@@ -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

diff --git a/math/src/main/scala/breeze/linalg/functions/qr.scala b/math/src/main/scala/breeze/linalg/functions/qr.scala
@@ -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

diff --git a/math/src/main/scala/breeze/linalg/functions/rank.scala b/math/src/main/scala/breeze/linalg/functions/rank.scala
@@ -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

diff --git a/math/src/main/scala/breeze/linalg/functions/svd.scala b/math/src/main/scala/breeze/linalg/functions/svd.scala
@@ -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

diff --git a/math/src/main/scala/breeze/linalg/package.scala b/math/src/main/scala/breeze/linalg/package.scala
@@ -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]
 
 }
diff --git a/math/src/main/scala/breeze/optimize/proximal/QuadraticMinimizer.scala b/math/src/main/scala/breeze/optimize/proximal/QuadraticMinimizer.scala
@@ -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._

diff --git a/math/src/main/scala/breeze/stats/regression/Lasso.scala b/math/src/main/scala/breeze/stats/regression/Lasso.scala
@@ -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(

diff --git a/math/src/main/scala/breeze/stats/regression/LeastSquares.scala b/math/src/main/scala/breeze/stats/regression/LeastSquares.scala
@@ -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 {

diff --git a/math/src/test/scala/breeze/linalg/UsingNativesTest.scala b/math/src/test/scala/breeze/linalg/UsingNativesTest.scala
@@ -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])
     }
   }
 

diff --git a/natives/build.sbt b/natives/build.sbt
@@ -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 =>