Skip to content

Commit

Permalink
[lapack-reference|fortran] Add new port (#12805)
Browse files Browse the repository at this point in the history
* [vcpkg/script] add vcpkg_find_fortran

* [openblas] add pkg-config fixes

* [lapack] add lapack-reference and reduce dependency on clapack

* fix build issues

* dont touch any main files

* move toolchain var into parent scope

* fix a few more issues

* create link in the noblas case

* removed unnecessary check handled by vcpkg_find_fortran.

* move dumpbin check

* fix last issue

* depend on openblas

* set cmake_binary_dir so that compiler id run gets put into buildtree.

* more paths

* add missing PARENT_SCOPE

* ws change

* [mlpack] remove dep on clapack

* comment out patches

* remove openblas again

* Install lapack wrapper since it is missing linkage against -lm and -lgfortran

* PREPEND mingw path to make sure cmake picks it up correctly

* depend on openblas also on osx

* add clapack on windows to skip due to conflicting library installs

* add clapack to skip on linux

* add -fPIC as a fortran compiler flag

* do not add the flag on windows

* add gcc explicitly to the cmake args.

* ws change

* applyrequested changes from CR

* fix the failing patch
  • Loading branch information
Neumann-A authored Aug 12, 2020
1 parent dea7619 commit f3b96f3
Show file tree
Hide file tree
Showing 18 changed files with 878 additions and 32 deletions.
2 changes: 1 addition & 1 deletion ports/clapack/CONTROL
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
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)

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

# Handle copyright
Expand Down
16 changes: 16 additions & 0 deletions ports/lapack-reference/CONTROL
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))
Description: Use external optimized BLAS
Loading

0 comments on commit f3b96f3

Please sign in to comment.