Commit 322770e9 authored by Jakub Klinkovský's avatar Jakub Klinkovský Committed by Tomáš Oberhuber
Browse files

Fixed linking to cblas

parent 1ef82dc7

CMakeLists.txt

+0 −8
Original line number Diff line number Diff line
@@ -317,13 +317,6 @@ if( ${WITH_TESTS} ) 
   endif()

endif()



if( ${WITH_BLAS} )

   find_package( BLAS )

   if( BLAS_FOUND )

      set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_BLAS" )

      set( HAVE_BLAS TRUE)

   endif()

endif()

#if( BUILD_MPI )

#   FIND_PATH( PETSC_INCLUDE_DIR petsc.h

#     /usr/include/petsc
@@ -457,4 +450,3 @@ message( " CMAKE_SHARED_LINKER_FLAGS_DEBUG = ${CMAKE_SHARED_LINKER_FLAGS_DEBUG 
message( "   CMAKE_SHARED_LINKER_FLAGS_RELEASE = ${CMAKE_SHARED_LINKER_FLAGS_RELEASE}" )

message( "   CUDA_NVCC_FLAGS = ${CUDA_NVCC_FLAGS}" )

message( "   GMP_LIBRARIES = ${GMP_LIBRARIES}" )
 
message( "   BLAS_libraries = ${BLAS_LIBRARIES}" )

build

+0 −4
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ WITH_EXAMPLES="yes" 
WITH_PYTHON="yes"

WITH_TOOLS="yes"

WITH_BENCHMARKS="yes"

WITH_BLAS="yes"



WITH_TEMPLATE_INSTANTIATION="no"

INSTANTIATE_LONG_INT="no"
@@ -66,7 +65,6 @@ do 
        --with-examples=*                ) WITH_EXAMPLES="${option#*=}" ;;

        --with-tools=*                   ) WITH_TOOLS="${option#*=}" ;;

        --with-benchmarks=*              ) WITH_BENCHMARKS="${option#*=}" ;;

        --with-blas=*                    ) WITH_BLAS="${option#*=}" ;;

        --with-python=*                  ) WITH_PYTHON="${option#*=}" ;;

        --with-templates-instantiation=* ) WITH_TEMPLATE_INSTANTIATION="${option#*=}" ;;

        --instantiate-long-int=*         ) INSTANTIATE_LONG_INT="${option#*=}" ;;
@@ -108,7 +106,6 @@ if [[ ${HELP} == "yes" ]]; then 
    echo "   --with-tools=yes/no                   Compile the 'src/Tools' directory. 'yes' by default."

    echo "   --with-python=yes/no                  Compile the Python bindings. 'yes' by default."

    echo "   --with-benchmarks=yes/no              Compile the 'src/Benchmarks' directory. 'yes' by default."

    echo "   --with-blas=yes/no                    Compile the BLAS support - for benchmark purposes only. 'yes' by default."

    echo "   --with-templates-instantiation=yes/no Precompiles some TNL templates during the build. 'no' by default."

    echo "   --cmake=CMAKE                         Path to cmake. 'cmake' by default."

    echo "   --verbose                             It enables verbose build."
@@ -182,7 +179,6 @@ cmake_command=( 
         -DWITH_TOOLS=${WITH_TOOLS}

         -DWITH_PYTHON=${WITH_PYTHON}

         -DWITH_BENCHMARKS=${WITH_BENCHMARKS}

         -DWITH_BLAS=${WITH_BLAS}

         -DDCMTK_DIR=${DCMTK_DIR}

         -DWITH_TEMPLATE_INSTANTIATION=${WITH_TEMPLATE_INSTANTIATION}

         -DINSTANTIATE_FLOAT=${INSTANTIATE_FLOAT}

src/Benchmarks/BLAS/CMakeLists.txt

+12 −5
Original line number Diff line number Diff line 
if( BUILD_CUDA )

    CUDA_ADD_EXECUTABLE( tnl-benchmark-blas tnl-benchmark-blas.cu )

    CUDA_ADD_CUBLAS_TO_TARGET( tnl-benchmark-blas )

    cuda_add_executable( tnl-benchmark-blas tnl-benchmark-blas.cu )

    cuda_add_cublas_to_target( tnl-benchmark-blas )

else()

    ADD_EXECUTABLE( tnl-benchmark-blas tnl-benchmark-blas.cpp )

    add_executable( tnl-benchmark-blas tnl-benchmark-blas.cpp )

endif()

if( HAVE_BLAS )

   target_link_libraries( tnl-benchmark-blas ${BLAS_LIBRARIES} )



find_library( CBLAS_LIBRARY NAMES cblas

              PATHS /usr/lib

                    /usr/lib64

                    /usr/local/lib

                    /usr/local/lib64 )

if( CBLAS_LIBRARY )

   target_compile_options( tnl-benchmark-blas PUBLIC "-DHAVE_BLAS" )

   target_link_libraries( tnl-benchmark-blas ${CBLAS_LIBRARY} )

endif()



install( TARGETS tnl-benchmark-blas RUNTIME DESTINATION bin )