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

Commit

Permalink
Temporarily remove OMP as issue #15585 hotfix (Mac Only) and upgrade …
Browse files Browse the repository at this point in the history
…knowhere to v1.0.1. (#66)
  • Loading branch information
soothing-rain authored Feb 16, 2022
1 parent cad3310 commit 98fa420
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ get_build_type( TARGET BUILD_TYPE
message( STATUS "Build type = ${BUILD_TYPE}" )

get_knowhere_version( TARGET KNOWHERE_VERSION
DEFAULT "1.0.0" )
DEFAULT "1.0.1" )
message( STATUS "Build version = ${KNOWHERE_VERSION}" )

get_last_commit_id( LAST_COMMIT_ID )
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

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

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

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

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

0 comments on commit 98fa420

Please sign in to comment.