Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
f97d5a7d
M
milvus
项目概览
milvus
/
milvus
9 个月 前同步成功
通知
260
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
f97d5a7d
编写于
8月 03, 2023
作者:
E
Enwei Jiao
提交者:
GitHub
8月 03, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix compile failed with llvm16 (#26112)
Signed-off-by:
N
Enwei Jiao
<
enwei.jiao@zilliz.com
>
上级
518b6310
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
6 addition
and
11 deletion
+6
-11
internal/core/conanfile.py
internal/core/conanfile.py
+1
-8
internal/core/src/common/Types.h
internal/core/src/common/Types.h
+3
-1
scripts/setenv.sh
scripts/setenv.sh
+2
-2
未找到文件。
internal/core/conanfile.py
浏览文件 @
f97d5a7d
...
@@ -5,7 +5,7 @@ class MilvusConan(ConanFile):
...
@@ -5,7 +5,7 @@ class MilvusConan(ConanFile):
settings
=
"os"
,
"compiler"
,
"build_type"
,
"arch"
settings
=
"os"
,
"compiler"
,
"build_type"
,
"arch"
requires
=
(
requires
=
(
"rocksdb/6.29.5"
,
"rocksdb/6.29.5"
,
"boost/1.
79
.0"
,
"boost/1.
82
.0"
,
"onetbb/2021.7.0"
,
"onetbb/2021.7.0"
,
"nlohmann_json/3.11.2"
,
"nlohmann_json/3.11.2"
,
"zstd/1.5.4"
,
"zstd/1.5.4"
,
...
@@ -81,13 +81,6 @@ class MilvusConan(ConanFile):
...
@@ -81,13 +81,6 @@ class MilvusConan(ConanFile):
del
self
.
options
[
"folly"
].
use_sse4_2
del
self
.
options
[
"folly"
].
use_sse4_2
self
.
options
[
"arrow"
].
with_jemalloc
=
False
self
.
options
[
"arrow"
].
with_jemalloc
=
False
self
.
options
[
"boost"
].
without_fiber
=
True
self
.
options
[
"boost"
].
without_json
=
True
self
.
options
[
"boost"
].
without_wave
=
True
self
.
options
[
"boost"
].
without_math
=
True
self
.
options
[
"boost"
].
without_graph
=
True
self
.
options
[
"boost"
].
without_graph_parallel
=
True
self
.
options
[
"boost"
].
without_nowide
=
True
def
imports
(
self
):
def
imports
(
self
):
self
.
copy
(
"*.dylib"
,
"../lib"
,
"lib"
)
self
.
copy
(
"*.dylib"
,
"../lib"
,
"lib"
)
...
...
internal/core/src/common/Types.h
浏览文件 @
f97d5a7d
...
@@ -23,6 +23,7 @@
...
@@ -23,6 +23,7 @@
#include <boost/align/aligned_allocator.hpp>
#include <boost/align/aligned_allocator.hpp>
#include <boost/container/vector.hpp>
#include <boost/container/vector.hpp>
#include <boost/dynamic_bitset.hpp>
#include <boost/dynamic_bitset.hpp>
#include <folly/FBVector.h>
#include <limits>
#include <limits>
#include <memory>
#include <memory>
...
@@ -123,7 +124,8 @@ using BitsetTypePtr = std::shared_ptr<boost::dynamic_bitset<>>;
...
@@ -123,7 +124,8 @@ using BitsetTypePtr = std::shared_ptr<boost::dynamic_bitset<>>;
using
BitsetTypeOpt
=
std
::
optional
<
BitsetType
>
;
using
BitsetTypeOpt
=
std
::
optional
<
BitsetType
>
;
template
<
typename
Type
>
template
<
typename
Type
>
using
FixedVector
=
boost
::
container
::
vector
<
Type
>
;
using
FixedVector
=
folly
::
fbvector
<
Type
>
;
// boost::container::vector has memory leak when version > 1.79, so use folly::fbvector instead
using
Config
=
nlohmann
::
json
;
using
Config
=
nlohmann
::
json
;
using
TargetBitmap
=
FixedVector
<
bool
>
;
using
TargetBitmap
=
FixedVector
<
bool
>
;
...
...
scripts/setenv.sh
浏览文件 @
f97d5a7d
...
@@ -47,13 +47,13 @@ case "${unameOut}" in
...
@@ -47,13 +47,13 @@ case "${unameOut}" in
export
RPATH
=
$LD_LIBRARY_PATH
;;
export
RPATH
=
$LD_LIBRARY_PATH
;;
Darwin
*
)
Darwin
*
)
# detect llvm version by valid list
# detect llvm version by valid list
for
llvm_version
in
15 14 NOT_FOUND
;
do
for
llvm_version
in
1
6 1
5 14 NOT_FOUND
;
do
if
brew
ls
--versions
llvm@
${
llvm_version
}
>
/dev/null
;
then
if
brew
ls
--versions
llvm@
${
llvm_version
}
>
/dev/null
;
then
break
break
fi
fi
done
done
if
[
"
${
llvm_version
}
"
=
"NOT_FOUND"
]
;
then
if
[
"
${
llvm_version
}
"
=
"NOT_FOUND"
]
;
then
echo
"valid llvm(
14 or 15
) not installed"
echo
"valid llvm(
>=14
) not installed"
exit
1
exit
1
fi
fi
llvm_prefix
=
"
$(
brew
--prefix
llvm@
${
llvm_version
}
)
"
llvm_prefix
=
"
$(
brew
--prefix
llvm@
${
llvm_version
}
)
"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录