2018-02-27 23:05:18 +08:00
|
|
|
diff --git a/similarity_search/src/method/hnsw.cc b/similarity_search/src/method/hnsw.cc
|
2020-10-09 13:59:51 +08:00
|
|
|
index 2741701..7587f7f 100644
|
2018-02-27 23:05:18 +08:00
|
|
|
--- 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
|
2020-10-09 13:59:51 +08:00
|
|
|
index 4c691bd..6f1a9e6 100644
|
2018-02-27 23:05:18 +08:00
|
|
|
--- 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
|
2020-10-09 13:59:51 +08:00
|
|
|
index c6113c7..a7d818b 100644
|
2018-02-27 23:05:18 +08:00
|
|
|
--- 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
|
2020-10-09 13:59:51 +08:00
|
|
|
index e67ea97..92fe70a 100644
|
2018-02-27 23:05:18 +08:00
|
|
|
--- a/similarity_search/src/method/small_world_rand.cc
|
|
|
|
|
+++ b/similarity_search/src/method/small_world_rand.cc
|
2020-10-09 13:59:51 +08:00
|
|
|
@@ -17,7 +17,7 @@
|
2018-02-27 23:05:18 +08:00
|
|
|
#include <iostream>
|
2020-10-09 13:59:51 +08:00
|
|
|
#include <cstddef>
|
2018-02-27 23:05:18 +08:00
|
|
|
// This is only for _mm_prefetch
|
|
|
|
|
-#include <mmintrin.h>
|
|
|
|
|
+#include <xmmintrin.h>
|
|
|
|
|
|
[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
2019-06-11 08:01:54 +08:00
|
|
|
#if defined(_WIN32) || defined(WIN32)
|
|
|
|
|
#include <intrin.h>
|
2018-02-27 23:05:18 +08:00
|
|
|
diff --git a/similarity_search/src/method/vptree.cc b/similarity_search/src/method/vptree.cc
|
2020-10-09 13:59:51 +08:00
|
|
|
index 4da3b5f..d77e419 100644
|
2018-02-27 23:05:18 +08:00
|
|
|
--- 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>
|
[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
2019-06-11 08:01:54 +08:00
|
|
|
#if defined(_WIN32) || defined(WIN32)
|
|
|
|
|
#include <intrin.h>
|
|
|
|
|
#endif
|
2018-02-27 23:05:18 +08:00
|
|
|
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>
|