-
Notifications
You must be signed in to change notification settings - Fork 6.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[openblas] make openblas build on MinGW (#20986)
* [openblas] make openblas build on MinGW * Portfile cleanup: Join separate vcpkg_check_feature calls and add double quotes according to maintainer guidelines. * Portfile cleanup: Migrate vcpkg cmake commands from deprecated to new functions. * Portfile cleanup: Migrate vcpkg cmake commands from deprecated to new functions (2) - missed a spot. * Re-factory code * version * [shogun] Fix include cblas path * version Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
- Loading branch information
1 parent
297ff7b
commit 4389f62
Showing
9 changed files
with
102 additions
and
72 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake | ||
index 0c126e3..bb0124b 100644 | ||
--- a/cmake/prebuild.cmake | ||
+++ b/cmake/prebuild.cmake | ||
@@ -558,6 +558,8 @@ else(NOT CMAKE_CROSSCOMPILING) | ||
if (NOT ${GETARCH_RESULT}) | ||
MESSAGE(FATAL_ERROR "Compiling getarch failed ${GETARCH_LOG}") | ||
endif () | ||
+ | ||
+ install(FILES "${PROJECT_BINARY_DIR}/${GETARCH_BIN}" DESTINATION bin) | ||
endif () | ||
unset (HAVE_AVX2) | ||
unset (HAVE_AVX) | ||
@@ -601,6 +603,8 @@ execute_process(COMMAND "${BLASHELPER_BINARY_DIR}/${GETARCH_BIN}" 1 OUTPUT_VARIA | ||
if (NOT ${GETARCH2_RESULT}) | ||
MESSAGE(FATAL_ERROR "Compiling getarch_2nd failed ${GETARCH2_LOG}") | ||
endif () | ||
+ | ||
+ install(FILES "${PROJECT_BINARY_DIR}/${GETARCH2_BIN}" DESTINATION bin) | ||
endif () | ||
|
||
# use the cmake binary w/ the -E param to run a shell command in a cross-platform way |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git a/src/shogun/mathematics/lapack.h b/src/shogun/mathematics/lapack.h | ||
index 6ba466f..f5de479 100644 | ||
--- a/src/shogun/mathematics/lapack.h | ||
+++ b/src/shogun/mathematics/lapack.h | ||
@@ -38,7 +38,7 @@ extern "C" { | ||
#include <vecLib/cblas.h> | ||
#endif | ||
#else | ||
-#include <cblas.h> | ||
+#include <openblas/cblas.h> | ||
#endif | ||
|
||
#ifdef HAVE_ACML |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters