From 85b923799b0ffe6ed19320ef2862e96fd86bae23 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 9 May 2024 02:09:40 +0800 Subject: [PATCH] Auto-update dlib to v19.24.4 (#3814) * Update dlib to v19.24.4 * improve deps * fix windows shared * fix cmake config * fix windows arm --------- Co-authored-by: star9029 --- packages/d/dlib/xmake.lua | 92 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 87 insertions(+), 5 deletions(-) diff --git a/packages/d/dlib/xmake.lua b/packages/d/dlib/xmake.lua index c27e6b60c..19cb17b06 100644 --- a/packages/d/dlib/xmake.lua +++ b/packages/d/dlib/xmake.lua @@ -1,20 +1,102 @@ package("dlib") - - set_kind("library", {headeronly = true}) set_homepage("https://dlib.net") set_description("A toolkit for making real world machine learning and data analysis applications in C++") set_license("Boost") add_urls("https://github.com/davisking/dlib/archive/refs/tags/$(version).tar.gz", "https://github.com/davisking/dlib.git") + + add_versions("v19.24.4", "d881911d68972d11563bb9db692b8fcea0ac1b3fd2e3f03fa0b94fde6c739e43") add_versions("v19.22", "5f44b67f762691b92f3e41dcf9c95dd0f4525b59cacb478094e511fdacb5c096") + add_configs("png", {description = "Enable png", default = false, type = "boolean"}) + add_configs("jpg", {description = "Enable jpg", default = false, type = "boolean"}) + add_configs("gif", {description = "Enable gif", default = false, type = "boolean"}) + add_configs("sqlite3", {description = "Enable sqlite3", default = false, type = "boolean"}) + add_configs("blas", {description = "Enable blas", default = false, type = "boolean"}) + add_configs("mkl", {description = "Enable mkl", default = false, type = "boolean"}) + add_configs("jxl", {description = "Enable jpeg xl", default = false, type = "boolean"}) + add_configs("ffmpeg", {description = "Enable ffmpeg", default = false, type = "boolean"}) + add_configs("webp", {description = "Enable webp", default = false, type = "boolean"}) + + add_configs("simd", {description = "SIMD acceleration architecture.", type = "string", values = {"sse2", "sse4", "avx", "neon"}}) + + if is_plat("linux", "bsd") then + add_syslinks("pthread") + end + add_deps("cmake") - on_install("windows", "linux", "macosx", function (package) - import("package.tools.cmake").install(package) + + on_load(function (package) + if package:config("png") then + package:add("deps", "libpng") + end + if package:config("png") then + package:add("deps", "libjpeg") + end + if package:config("gif") then + package:add("deps", "giflib") + end + if package:config("sqlite3") then + package:add("deps", "sqlite3") + end + if package:config("blas") then + package:add("deps", "openblas") + end + if package:config("mkl") then + package:add("deps", "mkl") + end + if package:config("jxl") then + package:add("deps", "libjxl") + end + if package:config("ffmpeg") then + package:add("deps", "ffmpeg") + end + if package:version():ge("19.24") and package:config("webp") then + package:add("deps", "libwebp") + end + end) + + on_install(function (package) + local configs = { + "-DDLIB_IN_PROJECT_BUILD=OFF", + "-DDLIB_ISO_CPP_ONLY=OFF", + "-DDLIB_NO_GUI_SUPPORT=ON" + } + if package:is_plat("windows") then + if package:is_debug() then + table.insert(configs, "-DCMAKE_COMPILE_PDB_OUTPUT_DIRECTORY=''") + end + if package:config("shared") then + table.insert(configs, "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON") + io.replace("dlib/CMakeLists.txt", [[message(FATAL_ERROR "Building dlib as a standalone dll is not supported when using Visual Studio. You are highly encouraged to use static linking instead. See https://github.com/davisking/dlib/issues/1483 for a discussion.")]], "", {plain = true}) + end + end + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + + table.insert(configs, "-DDLIB_PNG_SUPPORT=" .. (package:config("png") and "ON" or "OFF")) + table.insert(configs, "-DDLIB_JPEG_SUPPORT=" .. (package:config("jpg") and "ON" or "OFF")) + table.insert(configs, "-DDLIB_GIF_SUPPORT=" .. (package:config("jpg") and "ON" or "OFF")) + table.insert(configs, "-DDLIB_LINK_WITH_SQLITE3=" .. (package:config("sqlite3") and "ON" or "OFF")) + table.insert(configs, "-DDLIB_USE_BLAS=" .. (package:config("blas") and "ON" or "OFF")) + table.insert(configs, "-DDLIB_USE_MKL_FFT=" .. (package:config("mkl") and "ON" or "OFF")) + table.insert(configs, "-DDLIB_JXL_SUPPORT=" .. (package:config("jxl") and "ON" or "OFF")) + table.insert(configs, "-DDLIB_USE_FFMPEG=" .. (package:config("ffmpeg") and "ON" or "OFF")) + table.insert(configs, "-DDLIB_WEBP_SUPPORT=" .. (package:config("webp") and "ON" or "OFF")) + + local simd = package:config("simd") + table.insert(configs, "-DUSE_NEON_INSTRUCTIONS=" .. ((simd == "neon") and "ON" or "OFF")) + table.insert(configs, "-DUSE_SSE2_INSTRUCTIONS=" .. ((simd == "sse2") and "ON" or "OFF")) + table.insert(configs, "-DUSE_SSE4_INSTRUCTIONS=" .. ((simd == "sse4") and "ON" or "OFF")) + table.insert(configs, "-DUSE_AVX_INSTRUCTIONS=" .. ((simd == "avx") and "ON" or "OFF")) + if simd == "sse4" then + package:add("defines", "DLIB_HAVE_SSE2", "DLIB_HAVE_SSE3", "DLIB_HAVE_SSE41") + end + import("package.tools.cmake").install(package, configs) end) on_test(function (package) assert(package:has_cxxtypes("dlib::command_line_parser", { - includes = "dlib/cmd_line_parser.h", configs = {languages = "c++11"}})) + includes = "dlib/cmd_line_parser.h", configs = {languages = "c++14"}})) end)