From d8e314fcf7dc7d15f97181ece5f6a6596a1dc7b1 Mon Sep 17 00:00:00 2001 From: Pierre Pebay Date: Tue, 5 Nov 2024 10:22:09 -0500 Subject: [PATCH] Remove BLAS and LAPACK options --- .github/workflows/ci-trilinos.yml | 2 -- tests/cmake/options.cmake | 20 -------------------- 2 files changed, 22 deletions(-) diff --git a/.github/workflows/ci-trilinos.yml b/.github/workflows/ci-trilinos.yml index c4e44b4..9ce2cdd 100644 --- a/.github/workflows/ci-trilinos.yml +++ b/.github/workflows/ci-trilinos.yml @@ -64,8 +64,6 @@ jobs: -D PRESSIO_ENABLE_TPL_TRILINOS:BOOL=ON \ -D PRESSIO_ENABLE_EPETRA:BOOL=${{ matrix.epetra_toggle }} \ -D PRESSIO_ENABLE_TPL_KOKKOS:BOOL=ON \ - -D PRESSIO_ENABLE_TPL_BLAS:BOOL=ON \ - -D PRESSIO_ENABLE_TPL_LAPACK:BOOL=ON \ -D EIGEN_INCLUDE_DIR=/eigen/eigen-${{ env.eigen_version }} \ -D Trilinos_DIR=${{ env.trilinos_dir }}/lib/cmake/Trilinos \ -D CMAKE_INSTALL_PREFIX:PATH=../install \ diff --git a/tests/cmake/options.cmake b/tests/cmake/options.cmake index d9f0033..6fbe263 100644 --- a/tests/cmake/options.cmake +++ b/tests/cmake/options.cmake @@ -35,8 +35,6 @@ if(PRESSIO_ENABLE_TPL_TRILINOS) set(PRESSIO_ENABLE_TPL_KOKKOS ON) set(PRESSIO_ENABLE_TPL_MPI ON) - set(PRESSIO_ENABLE_TPL_BLAS ON) - set(PRESSIO_ENABLE_TPL_LAPACK ON) find_package(Trilinos REQUIRED) # TODO: it is possible to use find_package() for each (sub)package @@ -75,21 +73,3 @@ if(PRESSIO_ENABLE_TPL_MPI) find_package(MPI REQUIRED) include_directories(SYSTEM ${MPI_CXX_INCLUDE_DIRS}) endif() - -if(PRESSIO_ENABLE_TPL_BLAS) - message(">> Enabling BLAS since PRESSIO_ENABLE_TPL_BLAS=ON") - add_definitions(-DPRESSIO_ENABLE_TPL_BLAS) - cmake_policy(SET CMP0074 NEW) - find_package(BLAS REQUIRED) - link_libraries(${BLAS_LIBRARIES}) - message("BLASLIBS=${BLAS_LIBRARIES}") -endif() - -if(PRESSIO_ENABLE_TPL_LAPACK) - message(">> Enabling LAPACK since PRESSIO_ENABLE_TPL_LAPACK=ON") - add_definitions(-DPRESSIO_ENABLE_TPL_LAPACK) - cmake_policy(SET CMP0074 NEW) - find_package(LAPACK REQUIRED) - link_libraries(${LAPACK_LIBRARIES}) - message("LAPLIBS=${LAPACK_LIBRARIES}") -endif()