Skip to content

[mlpack] Fix supports #21316

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

Merged
BillyONeal merged 5 commits into from
Dec 10, 2021
Merged

[mlpack] Fix supports #21316

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2dec5b0
[mlpack] fix supports
Nov 11, 2021
c71e277
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
Dec 10, 2021
b8fd7bf
Update ports/mlpack/portfile.cmake
JackBoosY Dec 10, 2021
fe735b2
fix typo
Dec 10, 2021
460a987
version
Dec 10, 2021
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
33 changes: 16 additions & 17 deletions ports/mlpack/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,25 @@ vcpkg_from_github(
fix-dependencies.patch
)

file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindACML.cmake)
file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindACMLMP.cmake)
file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindARPACK.cmake)
file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindBLAS.cmake)
file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindCBLAS.cmake)
file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindCLAPACK.cmake)
file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindLAPACK.cmake)
file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindMKL.cmake)
file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindOpenBLAS.cmake)
file(REMOVE ${SOURCE_PATH}/CMake/FindArmadillo.cmake)
file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindACML.cmake")
file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindACMLMP.cmake")
file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindARPACK.cmake")
file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindBLAS.cmake")
file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindCBLAS.cmake")
file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindCLAPACK.cmake")
file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindLAPACK.cmake")
file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindMKL.cmake")
file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindOpenBLAS.cmake")
file(REMOVE "${SOURCE_PATH}/CMake/FindArmadillo.cmake")

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
tools BUILD_CLI_EXECUTABLES
openmp USE_OPENMP
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
Comment thread
JackBoosY marked this conversation as resolved.
-DBUILD_TESTS=OFF
-DDOWNLOAD_STB_IMAGE=OFF
Expand All @@ -39,9 +38,9 @@ vcpkg_configure_cmake(
-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
${FEATURE_OPTIONS}
)
vcpkg_install_cmake()
vcpkg_cmake_install()

vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/mlpack)
vcpkg_cmake_config__fixup(CONFIG_PATH lib/cmake/mlpack)

vcpkg_copy_pdbs()

Expand Down Expand Up @@ -99,6 +98,6 @@ if("tools" IN_LIST FEATURES)
)
endif()

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

file(INSTALL ${SOURCE_PATH}/COPYRIGHT.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/COPYRIGHT.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
14 changes: 11 additions & 3 deletions ports/mlpack/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "mlpack",
"version": "3.4.1",
"port-version": 2,
"port-version": 3,
"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",
"supports": "!uwp",
"dependencies": [
"armadillo",
"boost-heap",
Expand All @@ -14,7 +14,15 @@
"boost-serialization",
"boost-serialization",
"ensmallen",
"stb"
"stb",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
],
"features": {
"openmp": {
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4386,7 +4386,7 @@
},
"mlpack": {
"baseline": "3.4.1",
"port-version": 2
"port-version": 3
},
"mman": {
"baseline": "git-f5ff813",
Expand Down
5 changes: 5 additions & 0 deletions versions/m-/mlpack.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e0f7e5146cb0e05db15029e44803bac6d3c09a00",
"version": "3.4.1",
"port-version": 3
},
{
"git-tree": "587ee2575ef7543ff9a0ed30e645154db26f0001",
"version": "3.4.1",
Expand Down