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

[BLAS] add metaport #13448

Merged
merged 7 commits into from
Nov 18, 2020
Merged
Show file tree
Hide file tree
Changes from 3 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
Expand Up @@ -2,4 +2,4 @@ Source: armadillo
Version: 2019-04-16
Port-Version: 10
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, lapack
Build-Depends: blas, lapack
5 changes: 5 additions & 0 deletions ports/blas/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
cmake_minimum_required(VERSION 3.17)

project(Find_BLAS_external)
find_package(BLAS REQUIRED)
#TODO make sure that the found BLAS is outside VCPKG
BillyONeal marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 4 additions & 0 deletions ports/blas/CONTROL
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Source: blas
Version: 1
Description: Metapackage for packages which provide BLAS
Build-Depends: openblas
cenit marked this conversation as resolved.
Show resolved Hide resolved
5 changes: 5 additions & 0 deletions ports/blas/portfile.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
SET(VCPKG_POLICY_EMPTY_PACKAGE enabled)

# Make sure BLAS can be found
vcpkg_configure_cmake(SOURCE_PATH ${CURRENT_PORT_DIR}
BillyONeal marked this conversation as resolved.
Show resolved Hide resolved
OPTIONS -DCMAKE_PREFIX_PATH="${CURRENT_PACKAGES_DIR}")
4 changes: 2 additions & 2 deletions 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: 15
Port-Version: 16
Homepage: https://www.netlib.org/clapack
Description: CLAPACK (f2c'ed version of LAPACK)
Build-Depends: openblas (!osx)
Build-Depends: blas
2 changes: 1 addition & 1 deletion ports/dlib/CONTROL
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Source: dlib
Version: 19.21
Port-Version: 4
Build-Depends: libjpeg-turbo, libpng, openblas, lapack
Build-Depends: libjpeg-turbo, libpng, blas, lapack
Homepage: https:/davisking/dlib
Description: Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++
Default-Features: fftw3, sqlite3
Expand Down
2 changes: 1 addition & 1 deletion ports/ensmallen/CONTROL
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ Version: 2.11.2
Port-Version: 2
Homepage: https:/mlpack/ensmallen
Description: A header-only C++ library for mathematical optimization.
Build-Depends: openblas, lapack, armadillo
Build-Depends: blas, lapack, armadillo
2 changes: 1 addition & 1 deletion ports/geogram/CONTROL
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Version: 1.7.5
Port-Version: 1
Homepage: https://gforge.inria.fr/projects/geogram/
Description: Geogram is a programming library of geometric algorithms.
Build-Depends: openblas, lapack
Build-Depends: blas, lapack
Supports: !uwp

Feature: graphics
Expand Down
4 changes: 2 additions & 2 deletions ports/halide/CONTROL
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Source: halide
Version: master_2020_03_07
Homepage: https:/halide/Halide
Description: Halide is a programming language designed to make it easier to write high-performance image processing code on modern machines.
Build-Depends: llvm[tools], openblas
Build-Depends: llvm[tools], blas

Feature: app
Description: app support
Expand Down Expand Up @@ -46,4 +46,4 @@ Feature: docs
Description: docs

Feature: test
Description: test
Description: test
2 changes: 1 addition & 1 deletion ports/hypre/CONTROL
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ Source: hypre
Version: 2.19.0
Homepage: https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods
Description: SCALABLE LINEAR SOLVERS AND MULTIGRID METHODS
Build-Depends: mpi, openblas, lapack
Build-Depends: mpi, blas, lapack
2 changes: 1 addition & 1 deletion ports/lapack-reference/CONTROL
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Feature: cblas
Description: Builds CBLAS

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

Feature: blas-select
Expand Down
2 changes: 1 addition & 1 deletion ports/mlpack/CONTROL
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Version: 3.2.2
Port-Version: 6
Homepage: https:/mlpack/mlpack
Description: mlpack is a fast, flexible machine learning library, written in C++, that aims to provide fast, extensible implementations of cutting-edge machine learning algorithms.
Build-Depends: openblas, lapack, boost, armadillo, ensmallen, stb
Build-Depends: blas, lapack, boost, armadillo, ensmallen, stb
Supports: !uwp

Feature: tools
Expand Down
4 changes: 2 additions & 2 deletions ports/shogun/CONTROL
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Source: shogun
Version: 6.1.4
Port-Version: 2
Build-Depends: bzip2, eigen3, liblzma, libxml2, openblas, nlopt, rxcpp, snappy, zlib, protobuf, curl, lzo, dirent
Build-Depends: bzip2, eigen3, liblzma, libxml2, blas, nlopt, rxcpp, snappy, zlib, protobuf, curl, lzo, dirent
Homepage: https:/shogun-toolbox/shogun
Description: Unified and efficient Machine Learning
Description: Unified and efficient Machine Learning
4 changes: 2 additions & 2 deletions ports/superlu/CONTROL
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Source: superlu
Version: 2020-01-07
Port-Version: 2
Build-Depends: openblas
Build-Depends: blas
Description: Supernodal sparse direct solver.
Homepage: https:/xiaoyeli/superlu
Supports: !(uwp|arm)
Supports: !(uwp|arm)