Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
milvus
提交
bfba536e
milvus
项目概览
BaiXuePrincess
/
milvus
与 Fork 源项目一致
从无法访问的项目Fork
通知
7
Star
4
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
milvus
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
bfba536e
编写于
10月 10, 2019
作者:
Y
Yu Kun
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0-yk
Former-commit-id: b54e721af4274eb52d48fab5aaa734bbd5d26458
上级
a85c79d7
076d2e9b
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
12 addition
and
10 deletion
+12
-10
ci/jenkinsfile/milvus_build.groovy
ci/jenkinsfile/milvus_build.groovy
+1
-0
ci/jenkinsfile/milvus_build_no_ut.groovy
ci/jenkinsfile/milvus_build_no_ut.groovy
+1
-0
ci/main_jenkinsfile
ci/main_jenkinsfile
+1
-1
ci/main_jenkinsfile_no_ut
ci/main_jenkinsfile_no_ut
+1
-1
ci/nightly_main_jenkinsfile
ci/nightly_main_jenkinsfile
+1
-1
cpp/src/metrics/SystemInfo.cpp
cpp/src/metrics/SystemInfo.cpp
+7
-7
未找到文件。
ci/jenkinsfile/milvus_build.groovy
浏览文件 @
bfba536e
...
@@ -9,6 +9,7 @@ container('milvus-build-env') {
...
@@ -9,6 +9,7 @@ container('milvus-build-env') {
sh
"git config --global user.email \"test@zilliz.com\""
sh
"git config --global user.email \"test@zilliz.com\""
sh
"git config --global user.name \"test\""
sh
"git config --global user.name \"test\""
withCredentials
([
usernamePassword
(
credentialsId:
"${params.JFROG_USER}"
,
usernameVariable:
'USERNAME'
,
passwordVariable:
'PASSWORD'
)])
{
withCredentials
([
usernamePassword
(
credentialsId:
"${params.JFROG_USER}"
,
usernameVariable:
'USERNAME'
,
passwordVariable:
'PASSWORD'
)])
{
sh
"./build.sh -l"
sh
"export JFROG_ARTFACTORY_URL='${params.JFROG_ARTFACTORY_URL}' && export JFROG_USER_NAME='${USERNAME}' && export JFROG_PASSWORD='${PASSWORD}' && ./build.sh -t ${params.BUILD_TYPE} -j -u -c"
sh
"export JFROG_ARTFACTORY_URL='${params.JFROG_ARTFACTORY_URL}' && export JFROG_USER_NAME='${USERNAME}' && export JFROG_PASSWORD='${PASSWORD}' && ./build.sh -t ${params.BUILD_TYPE} -j -u -c"
}
}
}
}
...
...
ci/jenkinsfile/milvus_build_no_ut.groovy
浏览文件 @
bfba536e
...
@@ -9,6 +9,7 @@ container('milvus-build-env') {
...
@@ -9,6 +9,7 @@ container('milvus-build-env') {
sh
"git config --global user.email \"test@zilliz.com\""
sh
"git config --global user.email \"test@zilliz.com\""
sh
"git config --global user.name \"test\""
sh
"git config --global user.name \"test\""
withCredentials
([
usernamePassword
(
credentialsId:
"${params.JFROG_USER}"
,
usernameVariable:
'USERNAME'
,
passwordVariable:
'PASSWORD'
)])
{
withCredentials
([
usernamePassword
(
credentialsId:
"${params.JFROG_USER}"
,
usernameVariable:
'USERNAME'
,
passwordVariable:
'PASSWORD'
)])
{
sh
"./build.sh -l"
sh
"export JFROG_ARTFACTORY_URL='${params.JFROG_ARTFACTORY_URL}' && export JFROG_USER_NAME='${USERNAME}' && export JFROG_PASSWORD='${PASSWORD}' && ./build.sh -t ${params.BUILD_TYPE} -j"
sh
"export JFROG_ARTFACTORY_URL='${params.JFROG_ARTFACTORY_URL}' && export JFROG_USER_NAME='${USERNAME}' && export JFROG_PASSWORD='${PASSWORD}' && ./build.sh -t ${params.BUILD_TYPE} -j"
}
}
}
}
...
...
ci/main_jenkinsfile
浏览文件 @
bfba536e
...
@@ -44,7 +44,7 @@ metadata:
...
@@ -44,7 +44,7 @@ metadata:
spec:
spec:
containers:
containers:
- name: milvus-build-env
- name: milvus-build-env
image: registry.zilliz.com/milvus/milvus-build-env:v0.1
2
image: registry.zilliz.com/milvus/milvus-build-env:v0.1
3
command:
command:
- cat
- cat
tty: true
tty: true
...
...
ci/main_jenkinsfile_no_ut
浏览文件 @
bfba536e
...
@@ -44,7 +44,7 @@ metadata:
...
@@ -44,7 +44,7 @@ metadata:
spec:
spec:
containers:
containers:
- name: milvus-build-env
- name: milvus-build-env
image: registry.zilliz.com/milvus/milvus-build-env:v0.1
2
image: registry.zilliz.com/milvus/milvus-build-env:v0.1
3
command:
command:
- cat
- cat
tty: true
tty: true
...
...
ci/nightly_main_jenkinsfile
浏览文件 @
bfba536e
...
@@ -44,7 +44,7 @@ metadata:
...
@@ -44,7 +44,7 @@ metadata:
spec:
spec:
containers:
containers:
- name: milvus-build-env
- name: milvus-build-env
image: registry.zilliz.com/milvus/milvus-build-env:v0.1
2
image: registry.zilliz.com/milvus/milvus-build-env:v0.1
3
command:
command:
- cat
- cat
tty: true
tty: true
...
...
cpp/src/metrics/SystemInfo.cpp
浏览文件 @
bfba536e
...
@@ -18,16 +18,16 @@
...
@@ -18,16 +18,16 @@
#include "metrics/SystemInfo.h"
#include "metrics/SystemInfo.h"
#include "utils/Log.h"
#include "utils/Log.h"
#include <dirent.h>
#include <nvml.h>
#include <nvml.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/types.h>
#include <unistd.h>
#include <unistd.h>
#include <fstream>
#include <fstream>
#include <iostream>
#include <iostream>
#include <string>
#include <string>
#include <utility>
#include <utility>
#include<stdlib.h>
#include<dirent.h>
#include<stdio.h>
namespace
milvus
{
namespace
milvus
{
namespace
server
{
namespace
server
{
...
@@ -64,7 +64,7 @@ SystemInfo::Init() {
...
@@ -64,7 +64,7 @@ SystemInfo::Init() {
nvmlReturn_t
nvmlresult
;
nvmlReturn_t
nvmlresult
;
nvmlresult
=
nvmlInit
();
nvmlresult
=
nvmlInit
();
if
(
NVML_SUCCESS
!=
nvmlresult
)
{
if
(
NVML_SUCCESS
!=
nvmlresult
)
{
SERVER_LOG_ERROR
<<
"System information initilization failed"
;
SERVER_LOG_ERROR
<<
"System information initilization failed"
;
return
;
return
;
}
}
nvmlresult
=
nvmlDeviceGetCount
(
&
num_device_
);
nvmlresult
=
nvmlDeviceGetCount
(
&
num_device_
);
...
@@ -243,14 +243,14 @@ SystemInfo::CPUTemperature() {
...
@@ -243,14 +243,14 @@ SystemInfo::CPUTemperature() {
std
::
vector
<
float
>
result
;
std
::
vector
<
float
>
result
;
std
::
string
path
=
"/sys/class/hwmon/"
;
std
::
string
path
=
"/sys/class/hwmon/"
;
DIR
*
dir
=
NULL
;
DIR
*
dir
=
NULL
;
dir
=
opendir
(
path
.
c_str
());
dir
=
opendir
(
path
.
c_str
());
if
(
!
dir
)
{
if
(
!
dir
)
{
SERVER_LOG_ERROR
<<
"Could not open hwmon directory"
;
SERVER_LOG_ERROR
<<
"Could not open hwmon directory"
;
return
result
;
return
result
;
}
}
struct
dirent
*
ptr
=
NULL
;
struct
dirent
*
ptr
=
NULL
;
while
((
ptr
=
readdir
(
dir
))
!=
NULL
)
{
while
((
ptr
=
readdir
(
dir
))
!=
NULL
)
{
std
::
string
filename
(
path
);
std
::
string
filename
(
path
);
filename
.
append
(
ptr
->
d_name
);
filename
.
append
(
ptr
->
d_name
);
...
@@ -261,7 +261,7 @@ SystemInfo::CPUTemperature() {
...
@@ -261,7 +261,7 @@ SystemInfo::CPUTemperature() {
if
(
m
.
find
(
"coretemp"
)
!=
std
::
string
::
npos
)
{
if
(
m
.
find
(
"coretemp"
)
!=
std
::
string
::
npos
)
{
std
::
string
object
=
filename
;
std
::
string
object
=
filename
;
object
+=
"/temp1_input"
;
object
+=
"/temp1_input"
;
FILE
*
file
=
fopen
(
object
.
c_str
(),
"r"
);
FILE
*
file
=
fopen
(
object
.
c_str
(),
"r"
);
if
(
file
==
nullptr
)
{
if
(
file
==
nullptr
)
{
SERVER_LOG_ERROR
<<
"Could not open temperature file"
;
SERVER_LOG_ERROR
<<
"Could not open temperature file"
;
return
result
;
return
result
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录