diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2019-06-10 17:01:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-10 17:01:54 -0700 |
| commit | 3fadaffacee6de7c6ddaf9a3c15e4b8996b5b1c0 (patch) | |
| tree | 05cb5e1338150601bfba7446839dc02863c96add /ports/nmslib | |
| parent | d962dc7d651b563bed089f4bf9056003ebb7fe1c (diff) | |
| download | vcpkg-3fadaffacee6de7c6ddaf9a3c15e4b8996b5b1c0.tar.gz vcpkg-3fadaffacee6de7c6ddaf9a3c15e4b8996b5b1c0.zip | |
[many ports] Updates 2019.05.24 (#6618)
* [many ports] Updates 2019.05.24
* Update SHA512 and resolve conflict for ebml and matroska
* [avro-c]Fix build error caused by jansson upgrades.
* [xxhash]Update to the next version to fix build error.(xxhash issue:#179)
* Fix failures and undo asio
* [libyaml, grpc, miniz, paho-mqtt, sqlitecpp] Update patches
* Update REF
* Undo nvtt flann itk libtins aws-sdk-cpp openvdb vlpp xmsh changes
* [flann, fastcdr] Fix old patches and build error.
* [flann, fastcdr] Fix build error.
* Fix ensmallen uvatlas cppcms libplist failures and undo aws-c-common libopusenc arb taglib changes
* [dcmtk, draco, flatbuffers, forge, ftgl, mosquitto,nmslib, ogre] Update old patches and fix build error.
* fix libusbmuxd failures and undo xxhash paho-mqtt mongo-c-driver flann libffi
* fix libimobiledevice and undo qhull harfbuzz lcm libbson draco flatbuffers
* undo libmupdf forge kd-soap qca
* [mosquitto] Fix installation of import libs
* [arb][asio][aws-c-common][collada-dom][concurrentqueue][cryptopp][ebml] Revert trivial/undesired changes
* [fastcdr] Minimize patch
* [many ports] Revert trivial changes
* [libyaml] Switch to non-dist tag
* [sqlite-modern-cpp] Track master due to infrequent release
* [nano-signal-slot] Revert downgrade
* [openvpn3] Bump control version to account for portfile change
* [sqlite-modern-cpp] Fixup wrong hash
* [mosquitto] Commit missing patch
Diffstat (limited to 'ports/nmslib')
| -rw-r--r-- | ports/nmslib/CONTROL | 2 | ||||
| -rw-r--r-- | ports/nmslib/fix-headers.patch | 16 | ||||
| -rw-r--r-- | ports/nmslib/portfile.cmake | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/ports/nmslib/CONTROL b/ports/nmslib/CONTROL index 7b65617c3..111bcc858 100644 --- a/ports/nmslib/CONTROL +++ b/ports/nmslib/CONTROL @@ -1,5 +1,5 @@ Source: nmslib
-Version: 1.7.2-1
+Version: 1.7.3.6 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.
#
# ## Extras are currently unsupported for Windows, waiting for fixes.
diff --git a/ports/nmslib/fix-headers.patch b/ports/nmslib/fix-headers.patch index 92a8d6c36..ee6db36df 100644 --- a/ports/nmslib/fix-headers.patch +++ b/ports/nmslib/fix-headers.patch @@ -1,5 +1,5 @@ diff --git a/similarity_search/src/method/hnsw.cc b/similarity_search/src/method/hnsw.cc -index 30a7c8a..5ca07c5 100644 +index f5c7fca..4780746 100644 --- a/similarity_search/src/method/hnsw.cc +++ b/similarity_search/src/method/hnsw.cc @@ -27,7 +27,7 @@ @@ -38,7 +38,7 @@ index b6473bd..6dcb00f 100644 #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 59e13f7..0f3e0b9 100644 +index e8280cb..6bdb0f7 100644 --- a/similarity_search/src/method/small_world_rand.cc +++ b/similarity_search/src/method/small_world_rand.cc @@ -16,7 +16,7 @@ @@ -48,10 +48,10 @@ index 59e13f7..0f3e0b9 100644 -#include <mmintrin.h> +#include <xmmintrin.h> - #include "portable_simd.h" - #include "space.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 d0262ad..0e5befc 100644 +index 04f481e..c71eed5 100644 --- a/similarity_search/src/method/vptree.cc +++ b/similarity_search/src/method/vptree.cc @@ -20,7 +20,7 @@ @@ -60,9 +60,9 @@ index d0262ad..0e5befc 100644 // This is only for _mm_prefetch -#include <mmintrin.h> +#include <xmmintrin.h> - - #include "portable_simd.h" - #include "space.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 diff --git a/ports/nmslib/portfile.cmake b/ports/nmslib/portfile.cmake index 49a194ba1..ffea74d75 100644 --- a/ports/nmslib/portfile.cmake +++ b/ports/nmslib/portfile.cmake @@ -4,9 +4,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO searchivarius/nmslib - REF v1.7.2 - SHA512 2f910f752bfb1146aa8d1765fd5faf64d718a92ab7edf9d8ac0a2d9c4359d42b07b3cd553e2aff93da8b009add52ab9cce6b841f5175f57163f73f643ff62c19 + REPO nmslib/nmslib + REF 1eda05dccd5ed34df50a243dfc64c5e9187388f8 + SHA512 e4518c8dd84867bd0ac5dbc5d3b57d8053d1f73588fc0cf1d7c91cc4819f22dc7888d6be587691ebc1fd12b67de16de63b5e0a24847b6f7b49b57d1e6b457ebd HEAD_REF master ) |