mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-28 00:59:05 +08:00
[nmslib] Update to 2.1.1 (#20638)
* Update nmslib to 2.1.1 * Update CI baseline Co-authored-by: chausner <chausner@users.noreply.github.com>
This commit is contained in:
chausner
GitHub
parent
63118c20cb
commit
516920d30d
@ -1,77 +0,0 @@
|
||||
diff --git a/similarity_search/src/method/hnsw.cc b/similarity_search/src/method/hnsw.cc
|
||||
index 2741701..7587f7f 100644
|
||||
--- a/similarity_search/src/method/hnsw.cc
|
||||
+++ b/similarity_search/src/method/hnsw.cc
|
||||
@@ -27,7 +27,7 @@
|
||||
#include <iostream>
|
||||
#include <memory>
|
||||
// This is only for _mm_prefetch
|
||||
-#include <mmintrin.h>
|
||||
+#include <xmmintrin.h>
|
||||
|
||||
#include "portable_simd.h"
|
||||
#include "knnquery.h"
|
||||
diff --git a/similarity_search/src/method/hnsw_distfunc_opt.cc b/similarity_search/src/method/hnsw_distfunc_opt.cc
|
||||
index 4c691bd..6f1a9e6 100644
|
||||
--- a/similarity_search/src/method/hnsw_distfunc_opt.cc
|
||||
+++ b/similarity_search/src/method/hnsw_distfunc_opt.cc
|
||||
@@ -30,7 +30,7 @@
|
||||
#include "rangequery.h"
|
||||
#include "portable_intrinsics.h"
|
||||
// This is only for _mm_prefetch
|
||||
-#include <mmintrin.h>
|
||||
+#include <xmmintrin.h>
|
||||
#include "space.h"
|
||||
|
||||
#include "sort_arr_bi.h"
|
||||
diff --git a/similarity_search/src/method/pivot_neighb_invindx.cc b/similarity_search/src/method/pivot_neighb_invindx.cc
|
||||
index c6113c7..a7d818b 100644
|
||||
--- a/similarity_search/src/method/pivot_neighb_invindx.cc
|
||||
+++ b/similarity_search/src/method/pivot_neighb_invindx.cc
|
||||
@@ -21,7 +21,7 @@
|
||||
#include <unordered_map>
|
||||
|
||||
// This is only for _mm_prefetch
|
||||
-#include <mmintrin.h>
|
||||
+#include <xmmintrin.h>
|
||||
|
||||
#include "portable_simd.h"
|
||||
#include "space.h"
|
||||
diff --git a/similarity_search/src/method/small_world_rand.cc b/similarity_search/src/method/small_world_rand.cc
|
||||
index e67ea97..92fe70a 100644
|
||||
--- a/similarity_search/src/method/small_world_rand.cc
|
||||
+++ b/similarity_search/src/method/small_world_rand.cc
|
||||
@@ -17,7 +17,7 @@
|
||||
#include <iostream>
|
||||
#include <cstddef>
|
||||
// This is only for _mm_prefetch
|
||||
-#include <mmintrin.h>
|
||||
+#include <xmmintrin.h>
|
||||
|
||||
#if defined(_WIN32) || defined(WIN32)
|
||||
#include <intrin.h>
|
||||
diff --git a/similarity_search/src/method/vptree.cc b/similarity_search/src/method/vptree.cc
|
||||
index 4da3b5f..d77e419 100644
|
||||
--- a/similarity_search/src/method/vptree.cc
|
||||
+++ b/similarity_search/src/method/vptree.cc
|
||||
@@ -20,7 +20,7 @@
|
||||
#include <cmath>
|
||||
|
||||
// This is only for _mm_prefetch
|
||||
-#include <mmintrin.h>
|
||||
+#include <xmmintrin.h>
|
||||
#if defined(_WIN32) || defined(WIN32)
|
||||
#include <intrin.h>
|
||||
#endif
|
||||
diff --git a/similarity_search/test/test_overlap.cc b/similarity_search/test/test_overlap.cc
|
||||
index 326b26b..413d66d 100644
|
||||
--- a/similarity_search/test/test_overlap.cc
|
||||
+++ b/similarity_search/test/test_overlap.cc
|
||||
@@ -12,7 +12,6 @@
|
||||
* Apache License Version 2.0 http://www.apache.org/licenses/.
|
||||
*
|
||||
*/
|
||||
-#include <sys/time.h>
|
||||
|
||||
#include <logging.h>
|
||||
#include <idtype.h>
|
||||
@ -5,41 +5,37 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO nmslib/nmslib
|
||||
REF 5482e077d1c8637499f86231bcd3979cb7fa6aef # v2.0.6
|
||||
SHA512 e529c8d1d97e972f8314be9837e10f4ebab57d4a5f19a66341bb8e163dfe53d1d640a3909a708b021a52d0e6c2537954d749cb80e71757469700a3e9e173ceca
|
||||
REF v2.1.1
|
||||
SHA512 62BBB965EA4BF1D416ED78231B1BA4B41C0F46327D7BE16D1F98095DB63EF0E0D893B70040009711BC9C68555B1B8C4038F5032ABD66B759E955E2CBB0553EC3
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix-headers.patch
|
||||
)
|
||||
|
||||
# TODO: check SSE and AVX avability and set corresponding tags
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}/similarity_search
|
||||
PREFER_NINJA
|
||||
# TODO: check SSE and AVX availability and set corresponding tags
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}/similarity_search"
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
# Move headers into separate folder
|
||||
set(SUBFOLDERS factory method space)
|
||||
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include/nmslib)
|
||||
foreach(SUBFOLER ${SUBFOLDERS})
|
||||
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include/nmslib/${SUBFOLER})
|
||||
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include/nmslib")
|
||||
foreach(SUBFOLDER ${SUBFOLDERS})
|
||||
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include/nmslib/${SUBFOLDER}")
|
||||
endforeach()
|
||||
|
||||
file(GLOB HEADERS ${CURRENT_PACKAGES_DIR}/include/*.h ${CURRENT_PACKAGES_DIR}/include/*/*.h)
|
||||
file(GLOB HEADERS "${CURRENT_PACKAGES_DIR}/include/*.h" "${CURRENT_PACKAGES_DIR}/include/*/*.h")
|
||||
foreach(HEADER ${HEADERS})
|
||||
string(REPLACE "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/include/nmslib"
|
||||
MOVED_HEADER ${HEADER})
|
||||
file(RENAME ${HEADER} ${MOVED_HEADER})
|
||||
string(REPLACE "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/include/nmslib" MOVED_HEADER "${HEADER}")
|
||||
file(RENAME "${HEADER}" "${MOVED_HEADER}")
|
||||
endforeach(HEADER ${HEADERS})
|
||||
|
||||
foreach(SUBFOLER ${SUBFOLDERS})
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/${SUBFOLER}/)
|
||||
foreach(SUBFOLDER ${SUBFOLDERS})
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/${SUBFOLDER}/")
|
||||
endforeach()
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
|
||||
# Put the license file where vcpkg expects it
|
||||
file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
|
||||
@ -1,8 +1,13 @@
|
||||
{
|
||||
"name": "nmslib",
|
||||
"version-string": "2.0.6",
|
||||
"port-version": 1,
|
||||
"version": "2.1.1",
|
||||
"description": "Non-Metric Space Library (NMSLIB) is an efficient similarity search library and a toolkit for evaluation of k-NN methods for generic non-metric spaces.",
|
||||
"homepage": "https://github.com/searchivarius/nmslib",
|
||||
"supports": "!(arm | uwp)"
|
||||
"supports": "!(arm | uwp)",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@ -4605,8 +4605,8 @@
|
||||
"port-version": 5
|
||||
},
|
||||
"nmslib": {
|
||||
"baseline": "2.0.6",
|
||||
"port-version": 1
|
||||
"baseline": "2.1.1",
|
||||
"port-version": 0
|
||||
},
|
||||
"nng": {
|
||||
"baseline": "1.5.1",
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "b0256cb272ca0fe86ee427cdd64ad08f41c656b8",
|
||||
"version": "2.1.1",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "cc690326d2976978fc71bb8c0e5a631e6cec0064",
|
||||
"version-string": "2.0.6",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user