From 0e94a60c4e60de82086fa68a2fd5b1c0f354a88a Mon Sep 17 00:00:00 2001 From: YangZhou Date: Mon, 21 Nov 2022 17:12:15 +0800 Subject: [PATCH] fix windows cblas compile error --- audio/cmake/external/openblas.cmake | 2 +- audio/paddleaudio/third_party/kaldi/CMakeLists.txt | 6 ------ speechx/speechx/kaldi/matrix/kaldi-blas.h | 6 ++++++ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/audio/cmake/external/openblas.cmake b/audio/cmake/external/openblas.cmake index 745d9a44d..f98239e8f 100644 --- a/audio/cmake/external/openblas.cmake +++ b/audio/cmake/external/openblas.cmake @@ -39,7 +39,7 @@ if(NOT WIN32) if(CMAKE_SYSTEM_PROCESSOR MATCHES "^x86(_64)?$") set(OPTIONAL_ARGS DYNAMIC_ARCH=1 NUM_THREADS=64) endif() - set(COMMON_ARGS CC=${OPENBLAS_CC} NO_SHARED=1 libs) + set(COMMON_ARGS CC=${OPENBLAS_CC} NO_SHARED=1) endif() ExternalProject_Add( diff --git a/audio/paddleaudio/third_party/kaldi/CMakeLists.txt b/audio/paddleaudio/third_party/kaldi/CMakeLists.txt index 1f722c2ad..39865aac8 100644 --- a/audio/paddleaudio/third_party/kaldi/CMakeLists.txt +++ b/audio/paddleaudio/third_party/kaldi/CMakeLists.txt @@ -20,12 +20,6 @@ add_library(kaldi-base STATIC target_include_directories(kaldi-base PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) # kaldi-matrix -if (MSVC OR APPLE) - find_package(GFortranLibs REQUIRED) - include(FortranCInterface) - include(FindGFortranLibs REQUIRED) -endif() - if (APPLE) find_package(GFortranLibs REQUIRED) include(FortranCInterface) diff --git a/speechx/speechx/kaldi/matrix/kaldi-blas.h b/speechx/speechx/kaldi/matrix/kaldi-blas.h index 143781c8e..e8a703c08 100644 --- a/speechx/speechx/kaldi/matrix/kaldi-blas.h +++ b/speechx/speechx/kaldi/matrix/kaldi-blas.h @@ -96,6 +96,12 @@ #elif defined(HAVE_OPENBLAS) // getting cblas.h and lapacke.h from /. // putting in "" not <> to search -I before system libraries. + #if defined(_MSC_VER) + #include + #define LAPACK_COMPLEX_CUSTOM + #define lapack_complex_float _Fcomplex + #define lapack_complex_double _Dcomplex + #endif #include "cblas.h" #include "lapacke.h" #undef I