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.

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

[armadillo] Add dependent port superlu on osx #11063

Merged
merged 4 commits into from
Apr 30, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 ports/armadillo/CONTROL
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: armadillo
Version: 2019-04-16-6
Version: 2019-04-16-8
Description: Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use
Build-Depends: openblas (!osx), clapack (!osx)
92 changes: 92 additions & 0 deletions ports/armadillo/add-disable-find-package.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
diff --git a/cmake_aux/Modules/ARMA_FindACML.cmake b/cmake_aux/Modules/ARMA_FindACML.cmake
index 7d0655e..fa435ff 100644
--- a/cmake_aux/Modules/ARMA_FindACML.cmake
+++ b/cmake_aux/Modules/ARMA_FindACML.cmake
@@ -5,6 +5,11 @@
# also defined, but not for general use are
# ACML_LIBRARY, where to find the ACML library.

+if(CMAKE_DISABLE_FIND_PACKAGE_ACML)
+ set(ACML_FOUND "NO")
+ return()
+endif()
+
SET(ACML_NAMES ${ACML_NAMES} acml)
FIND_LIBRARY(ACML_LIBRARY
NAMES ${ACML_NAMES}
diff --git a/cmake_aux/Modules/ARMA_FindACMLMP.cmake b/cmake_aux/Modules/ARMA_FindACMLMP.cmake
index 3390179..ead7b1e 100644
--- a/cmake_aux/Modules/ARMA_FindACMLMP.cmake
+++ b/cmake_aux/Modules/ARMA_FindACMLMP.cmake
@@ -5,6 +5,11 @@
# also defined, but not for general use are
# ACMLMP_LIBRARY, where to find the ACMLMP library.

+if(CMAKE_DISABLE_FIND_PACKAGE_ACMLMP)
+ set(ACMLMP_FOUND NO)
+ return()
+endif()
+
SET(ACMLMP_NAMES ${ACMLMP_NAMES} acml_mp)
FIND_LIBRARY(ACMLMP_LIBRARY
NAMES ${ACMLMP_NAMES}
diff --git a/cmake_aux/Modules/ARMA_FindARPACK.cmake b/cmake_aux/Modules/ARMA_FindARPACK.cmake
index 1a709ad..3029c25 100644
--- a/cmake_aux/Modules/ARMA_FindARPACK.cmake
+++ b/cmake_aux/Modules/ARMA_FindARPACK.cmake
@@ -4,6 +4,10 @@
# ARPACK_FOUND - system has ARPACK
# ARPACK_LIBRARY - Link this to use ARPACK

+if(CMAKE_DISABLE_FIND_PACKAGE_ARPACK)
+ set(ARPACK_FOUND NO)
+ return()
+endif()

find_library(ARPACK_LIBRARY
NAMES arpack
diff --git a/cmake_aux/Modules/ARMA_FindATLAS.cmake b/cmake_aux/Modules/ARMA_FindATLAS.cmake
index 491a361..e40a0ff 100644
--- a/cmake_aux/Modules/ARMA_FindATLAS.cmake
+++ b/cmake_aux/Modules/ARMA_FindATLAS.cmake
@@ -1,3 +1,8 @@
+if(CMAKE_DISABLE_FIND_PACKAGE_ATLAS)
+ set(ATLAS_FOUND NO)
+ return()
+endif()
+
find_path(ATLAS_CBLAS_INCLUDE_DIR
NAMES cblas.h
PATHS /usr/include/atlas/ /usr/include/ /usr/local/include/atlas/ /usr/local/include/
diff --git a/cmake_aux/Modules/ARMA_FindMKL.cmake b/cmake_aux/Modules/ARMA_FindMKL.cmake
index 0fd5b06..d6bcd49 100644
--- a/cmake_aux/Modules/ARMA_FindMKL.cmake
+++ b/cmake_aux/Modules/ARMA_FindMKL.cmake
@@ -6,6 +6,11 @@
## the link below explains why we're linking only with mkl_rt
## https://software.intel.com/en-us/articles/a-new-linking-model-single-dynamic-library-mkl_rt-since-intel-mkl-103

+if(CMAKE_DISABLE_FIND_PACKAGE_MKL)
+ set(MKL_FOUND NO)
+ return()
+endif()
+
set(MKL_NAMES ${MKL_NAMES} mkl_rt)
#set(MKL_NAMES ${MKL_NAMES} mkl_lapack)
#set(MKL_NAMES ${MKL_NAMES} mkl_intel_thread)
diff --git a/cmake_aux/Modules/ARMA_FindSuperLU5.cmake b/cmake_aux/Modules/ARMA_FindSuperLU5.cmake
index abf046d..e496cb0 100644
--- a/cmake_aux/Modules/ARMA_FindSuperLU5.cmake
+++ b/cmake_aux/Modules/ARMA_FindSuperLU5.cmake
@@ -5,6 +5,11 @@
# SuperLU_LIBRARY - Link this to use SuperLU
# SuperLU_INCLUDE_DIR - directory of SuperLU headers

+if(CMAKE_DISABLE_FIND_PACKAGE_SuperLU)
+ set(SuperLU_FOUND OFF)
+ return()
+endif()
+
find_path(SuperLU_INCLUDE_DIR slu_ddefs.h
/usr/include/superlu/
/usr/include/SuperLU/
11 changes: 8 additions & 3 deletions ports/armadillo/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
include(vcpkg_common_functions)

vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

vcpkg_from_gitlab(
Expand All @@ -11,7 +9,8 @@ vcpkg_from_gitlab(
HEAD_REF 9.400.x
PATCHES
remove_custom_modules.patch
fix-CMakePath.patch
fix-CMakePath.patch
add-disable-find-package.patch
)

file(REMOVE ${SOURCE_PATH}/cmake_aux/Modules/ARMA_FindBLAS.cmake)
Expand All @@ -24,6 +23,12 @@ vcpkg_configure_cmake(
PREFER_NINJA
OPTIONS
-DDETECT_HDF5=false
-DCMAKE_DISABLE_FIND_PACKAGE_SuperLU=ON
-DCMAKE_DISABLE_FIND_PACKAGE_ACML=ON
-DCMAKE_DISABLE_FIND_PACKAGE_ACMLMP=ON
-DCMAKE_DISABLE_FIND_PACKAGE_ARPACK=ON
-DCMAKE_DISABLE_FIND_PACKAGE_ATLAS=ON
-DCMAKE_DISABLE_FIND_PACKAGE_MKL=ON
)

vcpkg_install_cmake()
Expand Down
2 changes: 0 additions & 2 deletions scripts/ci.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1081,8 +1081,6 @@ miniupnpc:arm-uwp=fail
miniupnpc:x64-uwp=fail
minizip:arm-uwp=fail
minizip:x64-uwp=fail
mlpack:x64-linux=ignore
mlpack:x64-osx=ignore
mman:x64-linux=fail
mman:x64-osx=fail
# mmx installs many problematic headers, such as `json.h` and `sched.h`
Expand Down