Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
99249a02
M
milvus
项目概览
milvus
/
milvus
11 个月 前同步成功
通知
261
Star
22476
Fork
2472
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
milvus
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
99249a02
编写于
7月 20, 2021
作者:
D
dragondriver
提交者:
GitHub
7月 20, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix bug: override the compare function of SearchResultPair (#6628)
Signed-off-by:
N
dragondriver
<
jiquan.long@zilliz.com
>
上级
ab5a7cbf
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
149 addition
and
26 deletion
+149
-26
internal/core/src/segcore/ReduceStructure.h
internal/core/src/segcore/ReduceStructure.h
+40
-0
internal/core/src/segcore/reduce_c.cpp
internal/core/src/segcore/reduce_c.cpp
+1
-26
internal/core/unittest/CMakeLists.txt
internal/core/unittest/CMakeLists.txt
+1
-0
internal/core/unittest/test_reduce_c.cpp
internal/core/unittest/test_reduce_c.cpp
+107
-0
未找到文件。
internal/core/src/segcore/ReduceStructure.h
0 → 100644
浏览文件 @
99249a02
// Copyright (C) 2019-2020 Zilliz. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software distributed under the License
// is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
// or implied. See the License for the specific language governing permissions and limitations under the License
#include <cmath> // std::isnan
#include <common/Types.h>
#include "segcore/Reduce.h"
struct
SearchResultPair
{
float
distance_
;
milvus
::
SearchResult
*
search_result_
;
int64_t
offset_
;
int64_t
index_
;
SearchResultPair
(
float
distance
,
milvus
::
SearchResult
*
search_result
,
int64_t
offset
,
int64_t
index
)
:
distance_
(
distance
),
search_result_
(
search_result
),
offset_
(
offset
),
index_
(
index
)
{
}
bool
operator
<
(
const
SearchResultPair
&
pair
)
const
{
return
std
::
isnan
(
pair
.
distance_
)
||
(
!
std
::
isnan
(
distance_
)
&&
(
distance_
<
pair
.
distance_
));
}
bool
operator
>
(
const
SearchResultPair
&
pair
)
const
{
return
std
::
isnan
(
pair
.
distance_
)
||
(
!
std
::
isnan
(
distance_
)
&&
(
distance_
>
pair
.
distance_
));
}
void
reset_distance
()
{
distance_
=
search_result_
->
result_distances_
[
offset_
];
}
};
internal/core/src/segcore/reduce_c.cpp
浏览文件 @
99249a02
...
...
@@ -14,6 +14,7 @@
#include "segcore/reduce_c.h"
#include "segcore/Reduce.h"
#include "segcore/ReduceStructure.h"
#include "common/Types.h"
#include "pb/milvus.pb.h"
...
...
@@ -49,32 +50,6 @@ DeleteMarshaledHits(CMarshaledHits c_marshaled_hits) {
delete
hits
;
}
struct
SearchResultPair
{
float
distance_
;
SearchResult
*
search_result_
;
int64_t
offset_
;
int64_t
index_
;
SearchResultPair
(
float
distance
,
SearchResult
*
search_result
,
int64_t
offset
,
int64_t
index
)
:
distance_
(
distance
),
search_result_
(
search_result
),
offset_
(
offset
),
index_
(
index
)
{
}
bool
operator
<
(
const
SearchResultPair
&
pair
)
const
{
return
(
distance_
<
pair
.
distance_
);
}
bool
operator
>
(
const
SearchResultPair
&
pair
)
const
{
return
(
distance_
>
pair
.
distance_
);
}
void
reset_distance
()
{
distance_
=
search_result_
->
result_distances_
[
offset_
];
}
};
void
GetResultData
(
std
::
vector
<
std
::
vector
<
int64_t
>>&
search_records
,
std
::
vector
<
SearchResult
*>&
search_results
,
...
...
internal/core/unittest/CMakeLists.txt
浏览文件 @
99249a02
...
...
@@ -37,6 +37,7 @@ set(MILVUS_TEST_FILES
test_segcore.cpp
test_span.cpp
test_timestamp_index.cpp
test_reduce_c.cpp
)
add_executable
(
all_tests
...
...
internal/core/unittest/test_reduce_c.cpp
0 → 100644
浏览文件 @
99249a02
// Copyright (C) 2019-2020 Zilliz. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software distributed under the License
// is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
// or implied. See the License for the specific language governing permissions and limitations under the License
#include <gtest/gtest.h>
#include "segcore/ReduceStructure.h"
TEST
(
SearchResultPair
,
Less
)
{
auto
pair1
=
SearchResultPair
(
1.0
,
nullptr
,
0
,
0
);
auto
pair2
=
SearchResultPair
(
1.0
,
nullptr
,
0
,
0
);
ASSERT_EQ
(
pair1
<
pair2
,
false
);
ASSERT_EQ
(
pair1
.
operator
<
(
pair2
),
false
);
pair1
.
distance_
=
1.0
;
pair2
.
distance_
=
2.0
;
ASSERT_EQ
(
pair1
<
pair2
,
true
);
ASSERT_EQ
(
pair1
.
operator
<
(
pair2
),
true
);
pair1
.
distance_
=
1.0
;
pair2
.
distance_
=
NAN
;
ASSERT_EQ
(
pair1
<
pair2
,
true
);
ASSERT_EQ
(
pair1
.
operator
<
(
pair2
),
true
);
pair1
.
distance_
=
2.0
;
pair2
.
distance_
=
1.0
;
ASSERT_EQ
(
pair1
<
pair2
,
false
);
ASSERT_EQ
(
pair1
.
operator
<
(
pair2
),
false
);
pair1
.
distance_
=
2.0
;
pair2
.
distance_
=
2.0
;
ASSERT_EQ
(
pair1
<
pair2
,
false
);
ASSERT_EQ
(
pair1
.
operator
<
(
pair2
),
false
);
pair1
.
distance_
=
2.0
;
pair2
.
distance_
=
NAN
;
ASSERT_EQ
(
pair1
<
pair2
,
true
);
ASSERT_EQ
(
pair1
.
operator
<
(
pair2
),
true
);
pair1
.
distance_
=
NAN
;
pair2
.
distance_
=
1.0
;
ASSERT_EQ
(
pair1
<
pair2
,
false
);
ASSERT_EQ
(
pair1
.
operator
<
(
pair2
),
false
);
pair1
.
distance_
=
NAN
;
pair2
.
distance_
=
2.0
;
ASSERT_EQ
(
pair1
<
pair2
,
false
);
ASSERT_EQ
(
pair1
.
operator
<
(
pair2
),
false
);
pair1
.
distance_
=
NAN
;
pair2
.
distance_
=
NAN
;
ASSERT_EQ
(
pair1
<
pair2
,
true
);
ASSERT_EQ
(
pair1
.
operator
<
(
pair2
),
true
);
}
TEST
(
SearchResultPair
,
Greater
)
{
auto
pair1
=
SearchResultPair
(
1.0
,
nullptr
,
0
,
0
);
auto
pair2
=
SearchResultPair
(
1.0
,
nullptr
,
0
,
0
);
ASSERT_EQ
(
pair1
>
pair2
,
false
);
ASSERT_EQ
(
pair1
.
operator
>
(
pair2
),
false
);
pair1
.
distance_
=
1.0
;
pair2
.
distance_
=
2.0
;
ASSERT_EQ
(
pair1
>
pair2
,
false
);
ASSERT_EQ
(
pair1
.
operator
>
(
pair2
),
false
);
pair1
.
distance_
=
1.0
;
pair2
.
distance_
=
NAN
;
ASSERT_EQ
(
pair1
>
pair2
,
true
);
ASSERT_EQ
(
pair1
.
operator
>
(
pair2
),
true
);
pair1
.
distance_
=
2.0
;
pair2
.
distance_
=
1.0
;
ASSERT_EQ
(
pair1
>
pair2
,
true
);
ASSERT_EQ
(
pair1
.
operator
>
(
pair2
),
true
);
pair1
.
distance_
=
2.0
;
pair2
.
distance_
=
2.0
;
ASSERT_EQ
(
pair1
>
pair2
,
false
);
ASSERT_EQ
(
pair1
.
operator
>
(
pair2
),
false
);
pair1
.
distance_
=
2.0
;
pair2
.
distance_
=
NAN
;
ASSERT_EQ
(
pair1
>
pair2
,
true
);
ASSERT_EQ
(
pair1
.
operator
>
(
pair2
),
true
);
pair1
.
distance_
=
NAN
;
pair2
.
distance_
=
1.0
;
ASSERT_EQ
(
pair1
>
pair2
,
false
);
ASSERT_EQ
(
pair1
.
operator
>
(
pair2
),
false
);
pair1
.
distance_
=
NAN
;
pair2
.
distance_
=
2.0
;
ASSERT_EQ
(
pair1
>
pair2
,
false
);
ASSERT_EQ
(
pair1
.
operator
>
(
pair2
),
false
);
pair1
.
distance_
=
NAN
;
pair2
.
distance_
=
NAN
;
ASSERT_EQ
(
pair1
>
pair2
,
true
);
ASSERT_EQ
(
pair1
.
operator
>
(
pair2
),
true
);
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录