facebookresearch/faiss
1
0
Fork 0
mirror of https://github.com/facebookresearch/faiss.git synced 2026-10-12 02:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing FAISS_PRAGMA_IMPRECISE_* for clang arm and gcc (#2721)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebookresearch/faiss/pull/2721

FAISS_PRAGMA_IMPRECISE_* macros were modified:

* Disabled ones on clang on arm, because it does not support `_Pragma("float_control(precise, off)")`

* Added missing pragma for the GCC compiler.

Reviewed By: alexanderguzhva

Differential Revision: D43437450

fbshipit-source-id: cec8042c3c8c7147ae7e2ffa1ac9e2232c8f1a92
This commit is contained in:
Denis Yaroshevskiy
2023-02-21 07:26:40 -08:00
committed by Facebook GitHub Bot
parent 6edd23d1b4
commit cf40d3a73d
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
faiss/impl/platform_macros.h
+9 -4
View File
@@ -105,17 +105,22 @@ inline int __builtin_clzll(uint64_t x) {
// Localized enablement of imprecise floating point operations
// You need to use all 3 macros to cover all compilers.
#if defined(_MSC_VER)
#define FAISS_PRAGMA_IMPRECISE_OP
#define FAISS_PRAGMA_IMPRECISE_LOOP
#define FAISS_PRAGMA_IMPRECISE_FUNCTION_BEGIN \
__pragma(float_control(precise, off, push))
#define FAISS_PRAGMA_IMPRECISE_FUNCTION_END __pragma(float_control(pop))
#elif defined(_GCC_)
#define FAISS_PRAGMA_IMPRECISE_OP
#define FAISS_PRAGMA_IMPRECISE_LOOP
#define FAISS_PRAGMA_IMPRECISE_FUNCTION_BEGIN \
GCC optimize("-funroll-loops -fassociative-math -fno-signed-zeros")
_Pragma(" GCC optimize (\"unroll-loops,associative-math,no-signed-zeros\")")
#define FAISS_PRAGMA_IMPRECISE_FUNCTION_END
#elif defined(__clang__)
#define FAISS_PRAGMA_IMPRECISE_LOOP \
_Pragma("clang loop vectorize(enable) interleave(enable)")
#define FAISS_PRAGMA_IMPRECISE_FUNCTION_BEGIN
#define FAISS_PRAGMA_IMPRECISE_FUNCTION_END
#else
#define FAISS_PRAGMA_IMPRECISE_OP _Pragma("float_control(precise, off)")
#define FAISS_PRAGMA_IMPRECISE_LOOP
#define FAISS_PRAGMA_IMPRECISE_FUNCTION_BEGIN
#define FAISS_PRAGMA_IMPRECISE_FUNCTION_END
#endif
faiss/utils/distances_simd.cpp
+2 -2
View File
@@ -214,8 +214,8 @@ void fvec_inner_products_ny_ref(
FAISS_PRAGMA_IMPRECISE_FUNCTION_BEGIN
float fvec_inner_product(const float* x, const float* y, size_t d) {
float res = 0.F;
FAISS_PRAGMA_IMPRECISE_LOOP
for (size_t i = 0; i != d; ++i) {
FAISS_PRAGMA_IMPRECISE_OP
res += x[i] * y[i];
}
return res;
@@ -227,8 +227,8 @@ float fvec_norm_L2sqr(const float* x, size_t d) {
// the double in the _ref is suspected to be a typo. Some of the manual
// implementations this replaces used float.
float res = 0;
FAISS_PRAGMA_IMPRECISE_LOOP
for (size_t i = 0; i != d; ++i) {
FAISS_PRAGMA_IMPRECISE_OP
res += x[i] * x[i];
}
tests/test_fast_scan.py
+1 -1
View File
@@ -82,7 +82,7 @@ class TestSearch(unittest.TestCase):
t1 = time.time()
pqfs_t = t1 - t0
print('PQ16x4fs search time:', pqfs_t)
self.assertLess(pqfs_t * 5, pq_t)
self.assertLess(pqfs_t * 4, pq_t)
class TestRounding(unittest.TestCase):