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

[lapack-reference|fortran] Add new port #12805

Merged
merged 30 commits into from
Aug 12, 2020
Merged

[lapack-reference|fortran] Add new port #12805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
d7a475c
[vcpkg/script] add vcpkg_find_fortran
Neumann-A Aug 7, 2020
7dbb51c
[openblas] add pkg-config fixes
Neumann-A Aug 7, 2020
9470516
[lapack] add lapack-reference and reduce dependency on clapack
Neumann-A Aug 7, 2020
7602456
fix build issues
Neumann-A Aug 7, 2020
7c641d0
dont touch any main files
Neumann-A Aug 7, 2020
21fb89f
move toolchain var into parent scope
Neumann-A Aug 7, 2020
8247cd3
fix a few more issues
Neumann-A Aug 7, 2020
81cfb5b
create link in the noblas case
Neumann-A Aug 7, 2020
0685ce0
removed unnecessary check handled by vcpkg_find_fortran.
Neumann-A Aug 7, 2020
2035353
move dumpbin check
Neumann-A Aug 7, 2020
9ef1894
fix last issue
Neumann-A Aug 7, 2020
a9e0a17
depend on openblas
Neumann-A Aug 7, 2020
da34b28
set cmake_binary_dir so that compiler id run gets put into buildtree.
Neumann-A Aug 7, 2020
dc17471
more paths
Neumann-A Aug 7, 2020
fa569bc
add missing PARENT_SCOPE
Neumann-A Aug 7, 2020
61708ad
ws change
Neumann-A Aug 7, 2020
7eb3e03
[mlpack] remove dep on clapack
Neumann-A Aug 7, 2020
d8a31b8
comment out patches
Neumann-A Aug 7, 2020
66261d7
remove openblas again
Neumann-A Aug 7, 2020
3b357f4
Install lapack wrapper since it is missing linkage against -lm and -l…
Neumann-A Aug 7, 2020
fdfb8c6
PREPEND mingw path to make sure cmake picks it up correctly
Neumann-A Aug 7, 2020
7f78674
depend on openblas also on osx
Neumann-A Aug 7, 2020
824aa9c
add clapack on windows to skip due to conflicting library installs
Neumann-A Aug 7, 2020
4460b33
add clapack to skip on linux
Neumann-A Aug 7, 2020
6239ba9
add -fPIC as a fortran compiler flag
Neumann-A Aug 7, 2020
0fa6f86
do not add the flag on windows
Neumann-A Aug 7, 2020
147e01e
add gcc explicitly to the cmake args.
Neumann-A Aug 7, 2020
5e40b0a
ws change
Neumann-A Aug 7, 2020
9c2641d
applyrequested changes from CR
Neumann-A Aug 10, 2020
3887876
fix the failing patch
Neumann-A Aug 10, 2020
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/clapack/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Source: clapack
Version: 3.2.1
Port-Version: 13
Port-Version: 14
Homepage: https://www.netlib.org/clapack
Description: CLAPACK (f2c'ed version of LAPACK)
Build-Depends: openblas (!osx)
6 changes: 1 addition & 5 deletions ports/clapack/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ vcpkg_extract_source_archive_ex(
ARCHIVE ${ARCHIVE}
PATCHES
remove_internal_blas.patch
fix-ConfigFile.patch
fix-ConfigFile.patch
fix-install.patch
support-uwp.patch
)
Expand All @@ -37,10 +37,6 @@ vcpkg_copy_pdbs()
#TODO: fix the official exported targets, since they are broken (luckily it seems that no-one uses them for now)
vcpkg_fixup_cmake_targets(CONFIG_PATH share/clapack)

#we install a cmake wrapper since the official FindLAPACK module in cmake does find clapack easily, unfortunately...
file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/lapack)
file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/FindLAPACK.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/lapack)
Neumann-A marked this conversation as resolved.
Show resolved Hide resolved

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

# Handle copyright
Expand Down
16 changes: 16 additions & 0 deletions ports/lapack-reference/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
Source: lapack-reference
Version: 3.8.0
Description: LAPACK — Linear Algebra PACKage http://www.netlib.org/lapack/
Default-Features: blas-select
Build-Depends: vcpkg-gfortran (windows)

Feature: cblas
Description: Builds CBLAS

Feature: noblas
Build-Depends: openblas
Description: Use external optimized BLAS

Feature: blas-select
Build-Depends: lapack-reference[core, noblas](!windows|(windows&!static))
JackBoosY marked this conversation as resolved.
Show resolved Hide resolved
Description: Use external optimized BLAS
Loading