Skip to content

[WIP] FindBLAS from eigen #11

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

Open
massich wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[WIP] FindBLAS from eigen #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73a7be3
use FindBLAS from eigen
Jan 15, 2018
9132d3f
Add blas_verbose
Jan 15, 2018
2501248
cat CMake Logs in travis
Jan 15, 2018
7e3d220
remove apple builds
Jan 15, 2018
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
2 changes: 1 addition & 1 deletion .appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ before_build:
- ps: |
mkdir build
cd build
- cmake -DBLA_STATIC=%BUILD_STATIC% -DBLA_VENDOR=%BLAS_VERSION% -G "Visual Studio 14 2015 Win64" ..
- cmake -DBLAS_VERBOSE=ON -DBLA_STATIC=%BUILD_STATIC% -DBLA_VENDOR=%BLAS_VERSION% -G "Visual Studio 14 2015 Win64" ..

build_script:
- cmake --build .
Expand Down
12 changes: 5 additions & 7 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@ matrix:
- os: linux
env:
- BACKEND=Intel10_64lp_seq
- os: osx
env:
- BACKEND=Apple
- os: osx
env:
- BACKEND=Intel10_64lp_seq

before_install:
# Dependencies required by the CI are installed in ${TRAVIS_BUILD_DIR}/deps/
Expand Down Expand Up @@ -93,7 +87,7 @@ script:
- cd ${TRAVIS_BUILD_DIR}
- mkdir -p build && cd build
- echo "cmake .. -DBLAS_VENDOR=$BACKEND"
- cmake .. -DCMAKE_CXX_STANDARD=11 -DBLA_VENDOR=$BACKEND
- cmake .. -DCMAKE_CXX_STANDARD=11 -DBLA_VENDOR=$BACKEND -DBLAS_VERBOSE=ON
- cmake --build .
- |
if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
Expand All @@ -105,5 +99,9 @@ script:
after_success:
- ./CMakeHelloWorld

after_failure:
- cat CMakeFiles/CMakeOutput.log
- cat CMakeFiles/CMakeError.log

notifications:
email: false
24 changes: 1 addition & 23 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,11 @@ set (CMakeHelloWorld_VERSION_MAJOR 1)
set (CMakeHelloWorld_VERSION_MINOR 0)

# Find the BLAS stuff
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
find_package(BLAS REQUIRED)

message(STATUS "BLAS Libraries: ${BLAS_LIBRARIES}")

# find_path(BLAS_INCLUDE_DIRS NAMES cblas.h)
# message(STATUS "BLAS Include: ${BLAS_INCLUDE_DIRS}")
# include_directories(${BLAS_INCLUDE_DIRS})

set(BLA_DEFINITIONS)
if (BLA_VENDOR MATCHES Intel)
if ("$ENV{MKLROOT}" STREQUAL "")
message(FATAL_ERROR "MKLROOT is not set. Please source the Intel MKL mklvars.sh file.")
endif()
find_path(MKL_INCLUDE_DIRS NAMES mkl.h
PATHS $ENV{MKLROOT}/include/)
message(STATUS "MKL Include: ${MKL_INCLUDE_DIRS}")
include_directories(${MKL_INCLUDE_DIRS})
set(BLA_DEFINITIONS USE_MKL)
elseif (BLA_VENDOR MATCHES ATLAS)
find_library(CBLAS_LIB NAMES cblas)
set(BLAS_LIBRARIES "${BLAS_LIBRARIES};${CBLAS_LIB}")
endif()

# include_directories(SYSTEM
# C:\\nuget_openblas\\OpenBLAS.0.2.14.1\\lib\\native\\include\\
# C:\\OpenBLAS.0.2.14.1\\lib\\native\\include\\)

#include the subdirectory containing our libs
add_subdirectory(Hello)
include_directories(Hello)
Expand Down
Loading