diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt index c86325c11..6c91f1ad0 100644 --- a/framework/CMakeLists.txt +++ b/framework/CMakeLists.txt @@ -160,27 +160,6 @@ elseif( ${SAF_PERFORMANCE_LIB} MATCHES "SAF_USE_OPEN_BLAS_AND_LAPACKE") message(STATUS "Using OpenBLAS. Linking against: ${OPENBLAS_LIBRARY}; ${LAPACKE_LIBRARY}") -elseif( ${SAF_PERFORMANCE_LIB} MATCHES "SAF_USE_OPEN_BLAS") - target_compile_definitions(${PROJECT_NAME} PUBLIC SAF_USE_OPEN_BLAS=1) - - # find and link libraries - if (NOT DEFINED OPENBLAS_LIBRARY) - find_library(OPENBLAS_LIBRARY openblas HINTS /usr/lib/x86_64-linux-gnu /usr/lib/arm-linux-gnueabihf) - endif() - target_link_libraries(${PROJECT_NAME} PUBLIC ${OPENBLAS_LIBRARY}) - - # Add header search paths if they are defined - if(DEFINED OPENBLAS_HEADER_PATH) - target_include_directories(${PROJECT_NAME} PUBLIC ${OPENBLAS_HEADER_PATH}) - endif() - - # Disable this particular warning... We know, but it's OK. - if(UNIX) - target_compile_options(${PROJECT_NAME} PRIVATE -Wno-incompatible-pointer-types) - endif() - - message(STATUS "Using OpenBLAS. Linking against: ${OPENBLAS_LIBRARY}") - elseif( ${SAF_PERFORMANCE_LIB} MATCHES "SAF_USE_ATLAS") message(STATUS "Using ATLAS...") message(SEND_ERROR "Not yet supported! Please contribute if you use this library.") diff --git a/framework/include/saf_externals.h b/framework/include/saf_externals.h index d77c80871..2cd0e2085 100644 --- a/framework/include/saf_externals.h +++ b/framework/include/saf_externals.h @@ -78,7 +78,6 @@ extern "C" { #if (defined(SAF_USE_INTEL_MKL_LP64) + \ defined(SAF_USE_INTEL_MKL_ILP64) + \ defined(SAF_USE_OPEN_BLAS_AND_LAPACKE) + \ - defined(SAF_USE_OPEN_BLAS) + \ defined(SAF_USE_ATLAS) + \ defined(SAF_USE_GSL) + \ defined(SAF_USE_APPLE_ACCELERATE)) != 1 @@ -145,28 +144,6 @@ extern "C" { # include "cblas.h" # include "lapacke.h" -#elif defined(SAF_USE_OPEN_BLAS) -/* - * Using OpenBLAS and the included LAPACK interface - * (A decent option for both x86 and ARM based architectures) - * - * This option provides implementations of the CBLAS/LAPACK functions which have - * decent performance. However, unlike Intel MKL or Apple Accelerate, it does - * not offer an optimised DFT/FFT or any other linear algebra functions outside - * of these standards. Therefore, consider also using Intel's IPP library or - * FFTW for the DFT/FFT with: "SAF_USE_INTEL_IPP" or "SAF_USE_FFTW" - * - * Note that "SAF_USE_INTEL_IPP" also offers support for certain linear algebra - * operations not covered by the CBLAS/LAPACK standards, which SAF can leverage. - * - * Alternatively, SSE/AVX/AVX-512 fallback implementations for certain linear - * algebra operations may be enabled with: "SAF_ENABLE_SIMD" - * - * More information regarding these additional options can be found below. - */ -# include "cblas.h" -# include "lapack.h" - #elif defined(SAF_USE_ATLAS) /* * Using the Automatically Tuned Linear Algebra Software (ATLAS) library @@ -334,8 +311,6 @@ extern "C" { # define SAF_CURRENT_PERFORMANCE_LIBRARY_STRING "Intel MKL (ILP64)" #elif defined(SAF_USE_OPEN_BLAS_AND_LAPACKE) # define SAF_CURRENT_PERFORMANCE_LIBRARY_STRING "OpenBLAS with LAPACKE" -#elif defined(SAF_USE_OPEN_BLAS) -# define SAF_CURRENT_PERFORMANCE_LIBRARY_STRING "OpenBLAS" #elif defined(SAF_USE_ATLAS) # define SAF_CURRENT_PERFORMANCE_LIBRARY_STRING "ATLAS" #elif defined(__APPLE__) && defined(SAF_USE_APPLE_ACCELERATE) diff --git a/framework/modules/saf_utilities/saf_utility_veclib.c b/framework/modules/saf_utilities/saf_utility_veclib.c index b2e2a8129..b181b2533 100644 --- a/framework/modules/saf_utilities/saf_utility_veclib.c +++ b/framework/modules/saf_utilities/saf_utility_veclib.c @@ -57,8 +57,6 @@ # define SAF_VECLIB_USE_LAPACKE_INTERFACE /**< LAPACK interface */ #elif defined(SAF_USE_OPEN_BLAS_AND_LAPACKE) # define SAF_VECLIB_USE_LAPACKE_INTERFACE /**< LAPACK interface */ -#elif defined(SAF_USE_OPEN_BLAS) -# define SAF_VECLIB_USE_LAPACK_FORTRAN_INTERFACE /**< LAPACK interface */ #elif defined(SAF_USE_ATLAS) # define SAF_VECLIB_USE_CLAPACK_INTERFACE /**< LAPACK interface */ #elif defined(__APPLE__) && defined(SAF_USE_APPLE_ACCELERATE)