[BLAS] add metaport (#13448)

* [BLAS] add metaport * [openblas] enable also on macOS to allow lapack-reference previous setup * [clapack] bump port version * [blas, lapack] Remove incorrect comments about "outside vcpkg" Co-authored-by: Billy Robert O'Neal III <[email protected]>
microsoft · Nov 18, 2020 · 3e2120f · 3e2120f
1 parent 3217e25
commit 3e2120f
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 14 deletions.
diff --git a/ports/armadillo/CONTROL b/ports/armadillo/CONTROL
@@ -2,4 +2,4 @@ Source: armadillo
 Version: 10.1.0
 Homepage: https://gitlab.com/conradsnicta/armadillo-code
 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
diff --git a/ports/blas/CMakeLists.txt b/ports/blas/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.17)
+
+project(Find_BLAS_external)
+find_package(BLAS REQUIRED)
diff --git a/ports/blas/CONTROL b/ports/blas/CONTROL
@@ -0,0 +1,4 @@
+Source: blas
+Version: 1
+Description: Metapackage for packages which provide BLAS
+Build-Depends: openblas
diff --git a/ports/blas/portfile.cmake b/ports/blas/portfile.cmake
@@ -0,0 +1,5 @@
+SET(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+
+# Make sure BLAS can be found
+vcpkg_configure_cmake(SOURCE_PATH ${CURRENT_PORT_DIR}
+                      OPTIONS -DCMAKE_PREFIX_PATH="${CURRENT_PACKAGES_DIR}")
diff --git a/ports/clapack/CONTROL b/ports/clapack/CONTROL
@@ -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
diff --git a/ports/dlib/CONTROL b/ports/dlib/CONTROL
@@ -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://github.com/davisking/dlib
 Description: Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++
 Default-Features: fftw3, sqlite3

diff --git a/ports/ensmallen/CONTROL b/ports/ensmallen/CONTROL
@@ -2,4 +2,4 @@ Source: ensmallen
 Version: 2.14.2
 Homepage: https://github.com/mlpack/ensmallen
 Description: A header-only C++ library for mathematical optimization.
-Build-Depends: openblas, lapack, armadillo
+Build-Depends: blas, lapack, armadillo
diff --git a/ports/geogram/CONTROL b/ports/geogram/CONTROL
@@ -3,7 +3,7 @@ Version: 1.7.5
 Port-Version: 2
 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

diff --git a/ports/halide/CONTROL b/ports/halide/CONTROL
@@ -61,3 +61,4 @@ Build-Depends: llvm[core,target-riscv]
 Feature: target-x86
 Description: Include X86 target
 Build-Depends: llvm[core,target-x86]
+
diff --git a/ports/hypre/CONTROL b/ports/hypre/CONTROL
@@ -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
diff --git a/ports/lapack-reference/CONTROL b/ports/lapack-reference/CONTROL
@@ -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

diff --git a/ports/lapack/CMakeLists.txt b/ports/lapack/CMakeLists.txt
@@ -2,4 +2,3 @@ cmake_minimum_required(VERSION 3.17)
 
 project(Find_LAPACK_external)
 find_package(LAPACK REQUIRED)
-#TODO make sure that the found LAPACK is outside VCPKG
diff --git a/ports/lapack/CONTROL b/ports/lapack/CONTROL
@@ -1,4 +1,5 @@
 Source: lapack
 Version: 3
+Port-Version: 1
 Description: Metapackage for packages which provide LAPACK
 Build-Depends: clapack(arm&windows), lapack-reference(!arm|!windows)
diff --git a/ports/shogun/CONTROL b/ports/shogun/CONTROL
@@ -1,6 +1,6 @@
 Source: shogun
 Version: 6.1.4
-Port-Version: 3
-Build-Depends: bzip2, eigen3, liblzma, libxml2, openblas, nlopt, rxcpp, snappy, zlib, protobuf, curl, lzo, dirent
+Port-Version: 4
+Build-Depends: bzip2, eigen3, liblzma, libxml2, blas, nlopt, rxcpp, snappy, zlib, protobuf, curl, lzo, dirent
 Homepage: https://github.com/shogun-toolbox/shogun
-Description: Unified and efficient Machine Learning
+Description: Unified and efficient Machine Learning
diff --git a/ports/superlu/CONTROL b/ports/superlu/CONTROL
@@ -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://github.com/xiaoyeli/superlu
-Supports: !(uwp|arm)
+Supports: !(uwp|arm)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -61,3 +61,4 @@ Build-Depends: llvm[core,target-riscv]
		Feature: target-x86
		Description: Include X86 target
		Build-Depends: llvm[core,target-x86]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,3 @@ cmake_minimum_required(VERSION 3.17)

		project(Find_LAPACK_external)
		find_package(LAPACK REQUIRED)
		#TODO make sure that the found LAPACK is outside VCPKG