diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2021-07-17 03:55:36 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-16 12:55:36 -0700 |
| commit | ee9de9fcc40bbb80d14debd14cbc55eff0158be7 (patch) | |
| tree | fbfc4183827e55033e5c7d840b877962ef9f88ab | |
| parent | bbe9763f6254298470dddb6eaf186b13c37459fd (diff) | |
| download | vcpkg-ee9de9fcc40bbb80d14debd14cbc55eff0158be7.tar.gz vcpkg-ee9de9fcc40bbb80d14debd14cbc55eff0158be7.zip | |
[mlpack] Add feature openmp (#18942)
* [mlpack] Add feature openmp
* format manifest
* add version stuff
* Update ports/mlpack/portfile.cmake
* Update versions/m-/mlpack.json
| -rw-r--r-- | ports/mlpack/fix-dependencies.patch | 13 | ||||
| -rw-r--r-- | ports/mlpack/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/mlpack/vcpkg.json | 5 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/m-/mlpack.json | 5 |
5 files changed, 27 insertions, 3 deletions
diff --git a/ports/mlpack/fix-dependencies.patch b/ports/mlpack/fix-dependencies.patch new file mode 100644 index 000000000..2de2682ac --- /dev/null +++ b/ports/mlpack/fix-dependencies.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4dd92f0..bfa697d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -488,7 +488,7 @@ add_definitions(-DBOOST_TEST_DYN_LINK) + # } + # #endif + if (USE_OPENMP) +- find_package(OpenMP) ++ find_package(OpenMP REQUIRED) + endif () + + if (OPENMP_FOUND) diff --git a/ports/mlpack/portfile.cmake b/ports/mlpack/portfile.cmake index 51e2ac6f0..058bcf9f8 100644 --- a/ports/mlpack/portfile.cmake +++ b/ports/mlpack/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( cmakelists.patch fix-configure-error.patch fix-test-dependency.patch + fix-dependencies.patch ) file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindACML.cmake) @@ -22,7 +23,9 @@ file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindOpenBLAS.cmake) file(REMOVE ${SOURCE_PATH}/CMake/FindArmadillo.cmake) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - tools BUILD_CLI_EXECUTABLES + FEATURES + tools BUILD_CLI_EXECUTABLES + openmp USE_OPENMP ) vcpkg_configure_cmake( diff --git a/ports/mlpack/vcpkg.json b/ports/mlpack/vcpkg.json index 62317fa71..2998ba1f5 100644 --- a/ports/mlpack/vcpkg.json +++ b/ports/mlpack/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mlpack", "version": "3.4.1", - "port-version": 1, + "port-version": 2, "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.", "homepage": "https://github.com/mlpack/mlpack", "supports": "uwp", @@ -17,6 +17,9 @@ "stb" ], "features": { + "openmp": { + "description": "use OpenMP for parallelization." + }, "tools": { "description": "Build command-line executables." } diff --git a/versions/baseline.json b/versions/baseline.json index 84820cd75..88a4bcd85 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4082,7 +4082,7 @@ }, "mlpack": { "baseline": "3.4.1", - "port-version": 1 + "port-version": 2 }, "mman": { "baseline": "git-f5ff813-3", diff --git a/versions/m-/mlpack.json b/versions/m-/mlpack.json index 585e56e27..cb0e68931 100644 --- a/versions/m-/mlpack.json +++ b/versions/m-/mlpack.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "587ee2575ef7543ff9a0ed30e645154db26f0001", + "version": "3.4.1", + "port-version": 2 + }, + { "git-tree": "4793fb5802e10e645d5d33e0ec2baf6f1a0a337b", "version": "3.4.1", "port-version": 1 |