Skip to content

Remove unnecessary BLAS_VENDOR flag #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 9, 2018
Merged

Remove unnecessary BLAS_VENDOR flag #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions CMakeLists.txt
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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