Skip to content
This repository was archived by the owner on Aug 16, 2023. It is now read-only.

Commit 98fa420

Browse files
Temporarily remove OMP as issue #15585 hotfix (Mac Only) and upgrade knowhere to v1.0.1. (#66)
1 parent cad3310 commit 98fa420

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ get_build_type( TARGET BUILD_TYPE
3939
message( STATUS "Build type = ${BUILD_TYPE}" )
4040

4141
get_knowhere_version( TARGET KNOWHERE_VERSION
42-
DEFAULT "1.0.0" )
42+
DEFAULT "1.0.1" )
4343
message( STATUS "Build version = ${KNOWHERE_VERSION}" )
4444

4545
get_last_commit_id( LAST_COMMIT_ID )

knowhere/knowhere/index/vector_index/impl/bruteforce/BruteForce.cpp

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
// See the License for the specific language governing permissions and
1515
// limitations under the License.
1616

17-
#include <omp.h>
17+
// TODO: Add back the omp include when issue #15585 is resolved.
18+
// https://github.com/milvus-io/milvus/issues/15585
19+
//#include <omp.h>
1820
#include "knowhere/index/vector_index/impl/bruteforce/BruteForce.h"
1921

2022
namespace knowhere {
@@ -30,7 +32,9 @@ void knn_L2sqr_sse(
3032
float *value = res->val;
3133
int64_t *labels = res->ids;
3234

33-
#pragma omp parallel for
35+
// TODO: Re-enable parallel run when issue #15585 is resolved.
36+
// https://github.com/milvus-io/milvus/issues/15585
37+
//#pragma omp parallel for
3438
for (size_t i = 0; i < nx; i++) {
3539
const float *x_i = x + i * d;
3640
const float *y_j = y;
@@ -66,7 +70,9 @@ void knn_inner_product_sse(const float * x,
6670
float * value = res->val;
6771
int64_t * labels = res->ids;
6872

69-
#pragma omp parallel for
73+
// TODO: Re-enable parallel run when issue #15585 is resolved.
74+
// https://github.com/milvus-io/milvus/issues/15585
75+
//#pragma omp parallel for
7076
for (size_t i = 0; i < nx; i++) {
7177
const float *x_i = x + i * d;
7278
const float *y_j = y;

0 commit comments

Comments
 (0)