From 9f267c58b2857ba727180b0d899e1c5af1fb5686 Mon Sep 17 00:00:00 2001 From: John Gebbie <me@johngebbie.com> Date: Fri, 9 Sep 2022 09:00:04 +0100 Subject: [PATCH] update OpenBLAS to version 0.3.21 --- src/matrix/cblas-wrappers.h | 16 ++++++++-------- tools/extras/install_openblas_clapack.sh | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/matrix/cblas-wrappers.h b/src/matrix/cblas-wrappers.h index f869ab7e078..bcc2c2b75b8 100644 --- a/src/matrix/cblas-wrappers.h +++ b/src/matrix/cblas-wrappers.h @@ -383,10 +383,10 @@ inline void mul_elements( // add clapack here #if !defined(HAVE_ATLAS) inline void clapack_Xtptri(KaldiBlasInt *num_rows, float *Mdata, KaldiBlasInt *result) { - stptri_(const_cast<char *>("U"), const_cast<char *>("N"), num_rows, Mdata, result); + stptri_(const_cast<char *>("U"), const_cast<char *>("N"), num_rows, Mdata, result, 1, 1); } inline void clapack_Xtptri(KaldiBlasInt *num_rows, double *Mdata, KaldiBlasInt *result) { - dtptri_(const_cast<char *>("U"), const_cast<char *>("N"), num_rows, Mdata, result); + dtptri_(const_cast<char *>("U"), const_cast<char *>("N"), num_rows, Mdata, result, 1, 1); } // inline void clapack_Xgetrf2(KaldiBlasInt *num_rows, KaldiBlasInt *num_cols, @@ -420,7 +420,7 @@ inline void clapack_Xgesvd(char *v, char *u, KaldiBlasInt *num_cols, sgesvd_(v, u, num_cols, num_rows, Mdata, stride, sv, Vdata, vstride, Udata, ustride, - p_work, l_work, result); + p_work, l_work, result, 1, 1); } inline void clapack_Xgesvd(char *v, char *u, KaldiBlasInt *num_cols, KaldiBlasInt *num_rows, double *Mdata, KaldiBlasInt *stride, @@ -430,25 +430,25 @@ inline void clapack_Xgesvd(char *v, char *u, KaldiBlasInt *num_cols, dgesvd_(v, u, num_cols, num_rows, Mdata, stride, sv, Vdata, vstride, Udata, ustride, - p_work, l_work, result); + p_work, l_work, result, 1, 1); } // void inline clapack_Xsptri(KaldiBlasInt *num_rows, float *Mdata, KaldiBlasInt *ipiv, float *work, KaldiBlasInt *result) { - ssptri_(const_cast<char *>("U"), num_rows, Mdata, ipiv, work, result); + ssptri_(const_cast<char *>("U"), num_rows, Mdata, ipiv, work, result, 1); } void inline clapack_Xsptri(KaldiBlasInt *num_rows, double *Mdata, KaldiBlasInt *ipiv, double *work, KaldiBlasInt *result) { - dsptri_(const_cast<char *>("U"), num_rows, Mdata, ipiv, work, result); + dsptri_(const_cast<char *>("U"), num_rows, Mdata, ipiv, work, result, 1); } // void inline clapack_Xsptrf(KaldiBlasInt *num_rows, float *Mdata, KaldiBlasInt *ipiv, KaldiBlasInt *result) { - ssptrf_(const_cast<char *>("U"), num_rows, Mdata, ipiv, result); + ssptrf_(const_cast<char *>("U"), num_rows, Mdata, ipiv, result, 1); } void inline clapack_Xsptrf(KaldiBlasInt *num_rows, double *Mdata, KaldiBlasInt *ipiv, KaldiBlasInt *result) { - dsptrf_(const_cast<char *>("U"), num_rows, Mdata, ipiv, result); + dsptrf_(const_cast<char *>("U"), num_rows, Mdata, ipiv, result, 1); } #else inline void clapack_Xgetrf(MatrixIndexT num_rows, MatrixIndexT num_cols, diff --git a/tools/extras/install_openblas_clapack.sh b/tools/extras/install_openblas_clapack.sh index 08274d25775..63f084d6e7d 100755 --- a/tools/extras/install_openblas_clapack.sh +++ b/tools/extras/install_openblas_clapack.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -OPENBLAS_VERSION=0.3.20 +OPENBLAS_VERSION=0.3.21 CLAPACK_VERSION=3.2.1 git clone -b v${OPENBLAS_VERSION} --single-branch https://github.com/xianyi/OpenBLAS