diff options
-rw-r--r-- | blas/CMakeLists.txt | 6 | ||||
-rw-r--r-- | blas/level3_impl.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/blas/CMakeLists.txt b/blas/CMakeLists.txt index e71076f9d..d1f5b5676 100644 --- a/blas/CMakeLists.txt +++ b/blas/CMakeLists.txt @@ -4,9 +4,9 @@ add_custom_target(blas) set(EigenBlas_SRCS single.cpp double.cpp complex_single.cpp complex_double.cpp xerbla.cpp) -add_library(eigen_blas ${EigenBlas_SRCS}) -# add_library(eigen_blas SHARED ${EigenBlas_SRCS}) -add_dependencies(blas eigen_blas) +add_library(eigen_blas_static ${EigenBlas_SRCS}) +add_library(eigen_blas SHARED ${EigenBlas_SRCS}) +add_dependencies(blas eigen_blas eigen_blas_static) install(TARGETS eigen_blas RUNTIME DESTINATION bin diff --git a/blas/level3_impl.h b/blas/level3_impl.h index 6a0e64392..a4b04ce1c 100644 --- a/blas/level3_impl.h +++ b/blas/level3_impl.h @@ -27,7 +27,7 @@ int EIGEN_BLAS_FUNC(gemm)(char *opa, char *opb, int *m, int *n, int *k, RealScalar *palpha, RealScalar *pa, int *lda, RealScalar *pb, int *ldb, RealScalar *pbeta, RealScalar *pc, int *ldc) { // std::cerr << "in gemm " << *opa << " " << *opb << " " << *m << " " << *n << " " << *k << " " << *lda << " " << *ldb << " " << *ldc << " " << *palpha << " " << *pbeta << "\n"; - typedef void (*functype)(int, int, int, const Scalar *, int, const Scalar *, int, Scalar *, int, Scalar); + typedef void (*functype)(int, int, int, const Scalar *, int, const Scalar *, int, Scalar *, int, Scalar, Eigen::GemmParallelInfo<Scalar>*); static functype func[12]; static bool init = false; @@ -67,7 +67,7 @@ int EIGEN_BLAS_FUNC(gemm)(char *opa, char *opb, int *m, int *n, int *k, RealScal else matrix(c, *m, *n, *ldc) *= beta; - func[code](*m, *n, *k, a, *lda, b, *ldb, c, *ldc, alpha); + func[code](*m, *n, *k, a, *lda, b, *ldb, c, *ldc, alpha, 0); return 0; } |