Skip to content

Commit

Permalink
Remove unnecessary BLAS_VENDOR flag (#124)
Browse files Browse the repository at this point in the history
We don't use BLAS directly in qmd-progress so we might as well remove
this variable from the CMakeLists.txt file.
  • Loading branch information
nicolasbock authored and cnegre committed Jul 9, 2018
1 parent 35654bf commit a0f0f49
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 8 deletions.
5 changes: 1 addition & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,10 @@ endif()

include(FindPkgConfig)

pkg_check_modules(BML bml REQUIRED)
pkg_check_modules(BML REQUIRED bml)
message(STATUS "Found bml: ${BML_LDFLAGS}")
list(APPEND LINK_LIBRARIES ${BML_LDFLAGS})

set(BLAS_VENDOR ""
CACHE STRING "If set, the preferred BLAS/LAPACK vendor. Possible choices: {Intel,MKL,ACML}")

set(PROGRESS_GRAPHLIB FALSE CACHE BOOL "Compile with externel graph libraries")
if(PROGRESS_GRAPHLIB)
find_library(FOUND_METIS metis)
Expand Down
3 changes: 0 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ EOF
echo "PROGRESS_EXAMPLES {yes,no} (default is ${PROGRESS_EXAMPLES})"
echo "PROGRESS_GRAPHLIB {yes,no} (default is ${PROGRESS_GRAPHLIB})"
echo "BUILD_DIR Path to build dir (default is ${BUILD_DIR})"
echo "BLAS_VENDOR {,Intel,MKL,ACML} (default is '${BLAS_VENDOR}')"
echo "INSTALL_DIR Path to install dir (default is ${INSTALL_DIR})"
echo "EXTRA_FCFLAGS Extra fortran flags (default is '${EXTRA_FCFLAGS}')"
echo "EXTRA_LINK_FLAGS Any extra link flag (default is '${EXTRA_LINK_FLAGS}')"
Expand All @@ -58,7 +57,6 @@ set_defaults() {
: ${PROGRESS_TESTING:=no}
: ${PROGRESS_EXAMPLES:=no}
: ${PROGRESS_GRAPHLIB:=no}
: "${BLAS_VENDOR:=}"
: "${EXTRA_FCFLAGS:=}"
: ${EXTRA_LINK_FLAGS:=""}
: ${SANITY_CHECK:=no}
Expand Down Expand Up @@ -118,7 +116,6 @@ configure() {
-DPROGRESS_TESTING="${PROGRESS_TESTING}" \
-DPROGRESS_EXAMPLES="${PROGRESS_EXAMPLES}" \
-DPROGRESS_GRAPHLIB="${PROGRESS_GRAPHLIB}" \
-DBLAS_VENDOR="${BLAS_VENDOR}" \
-DEXTRA_FCFLAGS="${EXTRA_FCFLAGS}" \
-DEXTRA_LINK_FLAGS="${EXTRA_LINK_FLAGS}" \
-DCMAKE_VERBOSE_MAKEFILE=${VERBOSE_MAKEFILE} \
Expand Down
1 change: 0 additions & 1 deletion example_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ MY_PATH=`pwd`
export CC=${CC:=gcc}
export FC=${FC:=gfortran}
export CXX=${CXX:=g++}
export BLAS_VENDOR=${BLAS_VENDOR:=MKL}
export PROGRESS_OPENMP=${PROGRESS_OPENMP:=yes}
export INSTALL_DIR=${INSTALL_DIR:="${MY_PATH}/install"}
export PROGRESS_GRAPHLIB=${PROGRESS_GRAPHLIB:=no}
Expand Down

0 comments on commit a0f0f49

Please sign in to comment.