early-access version 2853

This commit is contained in:
pineappleEA
2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions

46
externals/vcpkg/ports/mlpack/cmakelists.patch vendored Executable file
View File

@@ -0,0 +1,46 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6fe6d81..b59555c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -291,7 +291,7 @@ endif()
# ENSMALLEN_INCLUDE_DIR - include directory for ensmallen
# STB_IMAGE_INCLUDE_DIR - include directory for STB image library
# MATHJAX_ROOT - root of MathJax installation
-find_package(Armadillo "${ARMADILLO_VERSION}" REQUIRED)
+find_package(Armadillo CONFIG "${ARMADILLO_VERSION}" REQUIRED)
# Include directories for the previous dependencies.
set(MLPACK_INCLUDE_DIRS ${MLPACK_INCLUDE_DIRS} ${ARMADILLO_INCLUDE_DIRS})
@@ -388,8 +388,8 @@ if (NOT ENSMALLEN_FOUND)
"Successfully downloaded ensmallen into ${CMAKE_BINARY_DIR}/deps/${ENSMALLEN_INCLUDE_DIR}/")
# Now we have to also ensure these header files get installed.
- install(DIRECTORY "${CMAKE_BINARY_DIR}/deps/${ENSMALLEN_INCLUDE_DIR}/include/ensmallen_bits/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/ensmallen_bits")
- install(FILES "${CMAKE_BINARY_DIR}/deps/${ENSMALLEN_INCLUDE_DIR}/include/ensmallen.hpp" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+ #install(DIRECTORY "${CMAKE_BINARY_DIR}/deps/${ENSMALLEN_INCLUDE_DIR}/include/ensmallen_bits/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/ensmallen_bits")
+ #install(FILES "${CMAKE_BINARY_DIR}/deps/${ENSMALLEN_INCLUDE_DIR}/include/ensmallen.hpp" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
else ()
message(FATAL_ERROR "Problem unpacking ensmallen! Expected only one directory ensmallen-x.y.z/; found ${ENS_DIRECTORIES}. Try removing the directory ${CMAKE_BINARY_DIR}/deps and reconfiguring.")
endif ()
@@ -446,6 +446,7 @@ find_package(Boost "${BOOST_VERSION}"
REQUIRED
)
+if(0)
link_directories(${Boost_LIBRARY_DIRS})
# In Visual Studio, automatic linking is performed, so we don't need to worry
@@ -457,10 +458,12 @@ if (MSVC)
message("boost lib dirs ${Boost_LIBRARY_DIRS}")
set(Boost_LIBRARIES "")
endif ()
+endif()
+link_directories(${Boost_LIBRARIES})
set(MLPACK_INCLUDE_DIRS ${MLPACK_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
set(MLPACK_LIBRARIES ${MLPACK_LIBRARIES} ${Boost_LIBRARIES})
-set(MLPACK_LIBRARY_DIRS ${MLPACK_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS})
+set(MLPACK_LIBRARY_DIRS ${MLPACK_LIBRARY_DIRS} ${Boost_LIBRARIES})
# For Boost testing framework (will have no effect on non-testing executables).
# This specifies to Boost that we are dynamically linking to the Boost test

View File

@@ -0,0 +1,15 @@
diff --git a/CMake/go/AppendModel.cmake b/CMake/go/AppendModel.cmake
index eeb28f7..ec50f15 100644
--- a/CMake/go/AppendModel.cmake
+++ b/CMake/go/AppendModel.cmake
@@ -44,8 +44,8 @@ function(append_model SERIALIZATION_FILE PROGRAM_MAIN_FILE)
else ()
string(APPEND GOMODEL_SAFE_TYPE ${MODEL_CHAR})
endif()
- endif()
- endforeach()
+ endforeach()
+ endif()
# See if the model type already exists.
file(READ "${SERIALIZATION_FILE}" SERIALIZATION_FILE_CONTENTS)

View File

@@ -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)

View File

@@ -0,0 +1,24 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b59555c..4dd92f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -441,11 +441,18 @@ set(Boost_ADDITIONAL_VERSIONS
set(Boost_NO_BOOST_CMAKE 1)
find_package(Boost "${BOOST_VERSION}"
COMPONENTS
- unit_test_framework
serialization
REQUIRED
)
+if (BUILD_TESTS)
+ find_package(Boost "${BOOST_VERSION}"
+ COMPONENTS
+ unit_test_framework
+ REQUIRED
+ )
+endif()
+
if(0)
link_directories(${Boost_LIBRARY_DIRS})

106
externals/vcpkg/ports/mlpack/portfile.cmake vendored Executable file
View File

@@ -0,0 +1,106 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mlpack/mlpack
REF 7ae9ddda86c1751b6509ceb48b27d182feaae439 # 3.4.1
SHA512 db68c16b80af7037ac562f93775b6262f1552fbc89daa0c621075e2ff70a8306523da8eb74e33ac15ba34c9ccef8f2746bd1e4efa7c280a5be77b53c69d3f9a1
HEAD_REF master
PATCHES
cmakelists.patch
fix-configure-error.patch
fix-test-dependency.patch
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")
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
tools BUILD_CLI_EXECUTABLES
openmp USE_OPENMP
)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
DISABLE_PARALLEL_CONFIGURE
OPTIONS
-DBUILD_TESTS=OFF
-DDOWNLOAD_STB_IMAGE=OFF
-DDOWNLOAD_ENSMALLEN=OFF
-DBUILD_PYTHON_BINDINGS=OFF
-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
${FEATURE_OPTIONS}
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mlpack)
vcpkg_copy_pdbs()
vcpkg_fixup_pkgconfig()
if("tools" IN_LIST FEATURES)
vcpkg_copy_tools(AUTO_CLEAN TOOL_NAMES
mlpack_adaboost
mlpack_approx_kfn
mlpack_cf
mlpack_dbscan
mlpack_decision_stump
mlpack_decision_tree
mlpack_det
mlpack_emst
mlpack_fastmks
mlpack_gmm_generate
mlpack_gmm_probability
mlpack_gmm_train
mlpack_hmm_generate
mlpack_hmm_loglik
mlpack_hmm_train
mlpack_hmm_viterbi
mlpack_hoeffding_tree
mlpack_kde
mlpack_kernel_pca
mlpack_kfn
mlpack_kmeans
mlpack_knn
mlpack_krann
mlpack_lars
mlpack_linear_regression
mlpack_linear_svm
mlpack_lmnn
mlpack_local_coordinate_coding
mlpack_logistic_regression
mlpack_lsh
mlpack_mean_shift
mlpack_nbc
mlpack_nca
mlpack_nmf
mlpack_pca
mlpack_perceptron
mlpack_preprocess_binarize
mlpack_preprocess_describe
mlpack_preprocess_imputer
mlpack_preprocess_scale
mlpack_preprocess_split
mlpack_radical
mlpack_random_forest
mlpack_range_search
mlpack_softmax_regression
mlpack_sparse_coding
mlpack_image_converter
mlpack_bayesian_linear_regression
mlpack_preprocess_one_hot_encoding
)
endif()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(INSTALL "${SOURCE_PATH}/COPYRIGHT.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

38
externals/vcpkg/ports/mlpack/vcpkg.json vendored Executable file
View File

@@ -0,0 +1,38 @@
{
"name": "mlpack",
"version": "3.4.1",
"port-version": 5,
"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",
"dependencies": [
"armadillo",
"boost-heap",
"boost-math",
"boost-program-options",
"boost-random",
"boost-serialization",
"boost-serialization",
"ensmallen",
"stb",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
],
"features": {
"openmp": {
"description": "use OpenMP for parallelization."
},
"tools": {
"description": "Build command-line executables.",
"dependencies": [
"boost-format"
]
}
}
}