Skip to content
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

Update OpenBLAS include dir seach paths for static library #1533

Merged
merged 1 commit into from
Jan 4, 2025
Merged

Update OpenBLAS include dir seach paths for static library #1533

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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1886,7 +1886,7 @@ if(USE_MKL)
status(" MKL include dir:" "${MKL_INCLUDE_DIRS}")
endif()
if(USE_OPENBLAS)
status(" OpenBLAS dir:" "${OpenBLAS_DIR}")
status(" OpenBLAS include dir:" "${OpenBLAS_INCLUDE_DIR}")
endif()
if(USE_OPENCV)
status(" OpenCV dir:" "${OpenCV_DIR}")
Expand Down
12 changes: 8 additions & 4 deletions cmake/FindOpenBLAS.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,10 @@
set(OpenBLAS_INCLUDE_SEARCH_PATHS
$ENV{OpenBLAS_HOME}
$ENV{OpenBLAS_HOME}/include
$ENV{OpenBLAS_HOME}/include/openblas
$ENV{OpenBLAS_DIR}
$ENV{OpenBLAS_DIR}/include
$ENV{OpenBLAS_DIR}/include/openblas
/opt/OpenBLAS/include
/usr/local/opt/openblas/include
/usr/local/include/openblas
Expand Down Expand Up @@ -134,13 +136,15 @@ if(OpenBLAS_FOUND)
else()
set(OpenBLAS_LIBRARIES ${OpenBLAS_LAPACK_LIB})
endif()
if(NOT OpenBLAS_FIND_QUIETLY)
message(STATUS "Found OpenBLAS libraries: ${OpenBLAS_LAPACK_LIB}")
message(STATUS "Found OpenBLAS include: ${OpenBLAS_INCLUDE_DIR}")
endif()

get_filename_component(OpenBLAS_LIB_DIR ${OpenBLAS_LIB} PATH)
vp_parse_header3(OpenBLAS "${OpenBLAS_INCLUDE_DIR}/openblas_config.h" "OPENBLAS_VERSION" OpenBLAS_VERSION)
if(NOT OpenBLAS_FIND_QUIETLY)
message(STATUS "Found OpenBLAS Lapack libraries: ${OpenBLAS_LAPACK_LIB}")
message(STATUS "Found OpenBLAS include dir: ${OpenBLAS_INCLUDE_DIR}")
message(STATUS "Found OpenBLAS library dir: ${OpenBLAS_LIB}")
message(STATUS "Found OpenBLAS version: ${OpenBLAS_VERSION}")
endif()
else()
if(OpenBLAS_FIND_REQUIRED)
message(FATAL_ERROR "Could not find OpenBLAS")
Expand Down
3 changes: 2 additions & 1 deletion modules/tracker/mbt/src/vpMbGenericTracker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5302,7 +5302,8 @@
tracker->testTracking();
isOneTestTrackingOk = true;
}
catch (...) {
catch (const vpException &e) {
std::cerr << "[" << it->first << "] " << e.what() << std::endl;

Check warning on line 5306 in modules/tracker/mbt/src/vpMbGenericTracker.cpp

View check run for this annotation

Codecov / codecov/patch

modules/tracker/mbt/src/vpMbGenericTracker.cpp#L5305-L5306 

Added lines #L5305 - L5306 were not covered by tests
}
}

Expand Down
Loading