Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Primihub
PrimiHub
提交
791d5257
P
PrimiHub
项目概览
Primihub
/
PrimiHub
9 个月 前同步成功
通知
21
Star
1
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PrimiHub
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
791d5257
编写于
7月 13, 2023
作者:
F
fuxingbit
提交者:
GitHub
7月 13, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update command link and Makefile (#568)
* update command link * workflow install make on mac amd64
上级
7a48dfa0
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
48 addition
and
75 deletion
+48
-75
.github/workflows/main.yml
.github/workflows/main.yml
+5
-16
.github/workflows/release.yaml
.github/workflows/release.yaml
+16
-30
Dockerfile
Dockerfile
+4
-8
Dockerfile.local
Dockerfile.local
+2
-5
Dockerfile.release
Dockerfile.release
+1
-3
Makefile
Makefile
+17
-6
build_local.sh
build_local.sh
+3
-7
未找到文件。
.github/workflows/main.yml
浏览文件 @
791d5257
...
@@ -45,12 +45,7 @@ jobs:
...
@@ -45,12 +45,7 @@ jobs:
-
name
:
bazel build
-
name
:
bazel build
run
:
|
run
:
|
# cc_binary
# cc_binary
bazel build --config=linux_`arch` //:node \
make
//:py_main \
//:py_main \
//:cli \
//src/primihub/pybind_warpper:opt_paillier_c2py \
//src/primihub/pybind_warpper:linkcontext
build-on-ubuntu-arm64
:
build-on-ubuntu-arm64
:
runs-on
:
[
self-hosted
,
Linux
,
ARM64
]
runs-on
:
[
self-hosted
,
Linux
,
ARM64
]
...
@@ -60,11 +55,7 @@ jobs:
...
@@ -60,11 +55,7 @@ jobs:
run
:
|
run
:
|
# cc_binary
# cc_binary
bash pre_build.sh
bash pre_build.sh
bazel build --config=linux_`arch` //:node \
make
//:py_main \
//:cli \
//src/primihub/pybind_warpper:linkcontext \
//src/primihub/pybind_warpper:opt_paillier_c2py
build-on-mac-amd64
:
build-on-mac-amd64
:
...
@@ -76,6 +67,8 @@ jobs:
...
@@ -76,6 +67,8 @@ jobs:
-
name
:
set PYTHON LINK_OPTS
-
name
:
set PYTHON LINK_OPTS
run
:
./pre_build.sh
run
:
./pre_build.sh
shell
:
bash
shell
:
bash
-
name
:
Install make
run
:
brew install make
-
name
:
bazel test
-
name
:
bazel test
run
:
|
run
:
|
mv -f WORKSPACE_GITHUB WORKSPACE
mv -f WORKSPACE_GITHUB WORKSPACE
...
@@ -95,9 +88,5 @@ jobs:
...
@@ -95,9 +88,5 @@ jobs:
-
name
:
bazel build
-
name
:
bazel build
run
:
|
run
:
|
# cc_binary
# cc_binary
bazel build --config=darwin_x86_64 //:node \
make
//:py_main \
//:cli \
//src/primihub/pybind_warpper:opt_paillier_c2py \
//src/primihub/pybind_warpper:linkcontext
.github/workflows/release.yaml
浏览文件 @
791d5257
...
@@ -17,13 +17,8 @@ jobs:
...
@@ -17,13 +17,8 @@ jobs:
run
:
|
run
:
|
# cc_binary
# cc_binary
bash pre_build.sh
bash pre_build.sh
bazel build --config=linux_`arch` --define enable_mysql_driver=true //:node \
make mysql=y protos=y
//:py_main \
//:cli \
//src/primihub/pybind_warpper:opt_paillier_c2py \
//src/primihub/protos:worker_py_pb2_grpc \
//src/primihub/protos:service_py_pb2_grpc \
//src/primihub/pybind_warpper:linkcontext
#copy generated py pb to python dir
#copy generated py pb to python dir
cp -f bazel-bin/src/primihub/pybind_warpper/linkcontext.so python
cp -f bazel-bin/src/primihub/pybind_warpper/linkcontext.so python
cp -f bazel-bin/src/primihub/pybind_warpper/opt_paillier_c2py.so python
cp -f bazel-bin/src/primihub/pybind_warpper/opt_paillier_c2py.so python
...
@@ -32,6 +27,8 @@ jobs:
...
@@ -32,6 +27,8 @@ jobs:
tar zcf primihub-linux-amd64.tar.gz bazel-bin/cli \
tar zcf primihub-linux-amd64.tar.gz bazel-bin/cli \
bazel-bin/node \
bazel-bin/node \
primihub-cli \
primihub-node \
bazel-bin/py_main \
bazel-bin/py_main \
bazel-bin/src/primihub/pybind_warpper/opt_paillier_c2py.so \
bazel-bin/src/primihub/pybind_warpper/opt_paillier_c2py.so \
bazel-bin/src/primihub/pybind_warpper/linkcontext.so \
bazel-bin/src/primihub/pybind_warpper/linkcontext.so \
...
@@ -64,14 +61,8 @@ jobs:
...
@@ -64,14 +61,8 @@ jobs:
run
:
|
run
:
|
# cc_binary
# cc_binary
bash pre_build.sh
bash pre_build.sh
bazel build --config=linux_`arch` //:node \
make protos=y
//:py_main \
//:cli \
//src/primihub/pybind_warpper:opt_paillier_c2py \
//src/primihub/pybind_warpper:linkcontext \
//src/primihub/protos:worker_py_pb2_grpc \
//src/primihub/protos:service_py_pb2_grpc
cp -f bazel-bin/src/primihub/pybind_warpper/linkcontext.so python
cp -f bazel-bin/src/primihub/pybind_warpper/linkcontext.so python
cp -f bazel-bin/src/primihub/pybind_warpper/opt_paillier_c2py.so python
cp -f bazel-bin/src/primihub/pybind_warpper/opt_paillier_c2py.so python
cp -f bazel-bin/src/primihub/protos/*.py \
cp -f bazel-bin/src/primihub/protos/*.py \
...
@@ -79,6 +70,8 @@ jobs:
...
@@ -79,6 +70,8 @@ jobs:
tar zcf primihub-linux-arm64.tar.gz bazel-bin/cli \
tar zcf primihub-linux-arm64.tar.gz bazel-bin/cli \
bazel-bin/node \
bazel-bin/node \
primihub-cli \
primihub-node \
bazel-bin/py_main \
bazel-bin/py_main \
bazel-bin/src/primihub/pybind_warpper/opt_paillier_c2py.so \
bazel-bin/src/primihub/pybind_warpper/opt_paillier_c2py.so \
bazel-bin/src/primihub/pybind_warpper/linkcontext.so \
bazel-bin/src/primihub/pybind_warpper/linkcontext.so \
...
@@ -109,6 +102,8 @@ jobs:
...
@@ -109,6 +102,8 @@ jobs:
-
uses
:
actions/checkout@v3
-
uses
:
actions/checkout@v3
-
name
:
Setup bazelisk
-
name
:
Setup bazelisk
uses
:
bazelbuild/setup-bazelisk@v2
uses
:
bazelbuild/setup-bazelisk@v2
-
name
:
Install make
run
:
brew install make
-
name
:
set PYTHON LINK_OPTS
-
name
:
set PYTHON LINK_OPTS
run
:
./pre_build.sh
run
:
./pre_build.sh
shell
:
bash
shell
:
bash
...
@@ -116,14 +111,7 @@ jobs:
...
@@ -116,14 +111,7 @@ jobs:
-
name
:
bazel build
-
name
:
bazel build
run
:
|
run
:
|
# cc_binary
# cc_binary
bazel build --config=darwin_x86_64 //:node \
make
//:py_main \
//:cli \
//src/primihub/pybind_warpper:opt_paillier_c2py \
//src/primihub/pybind_warpper:linkcontext
# fix in future
#//src/primihub/protos:worker_py_pb2_grpc \
#//src/primihub/protos:service_py_pb2_grpc
cp -f bazel-bin/src/primihub/pybind_warpper/linkcontext.so python
cp -f bazel-bin/src/primihub/pybind_warpper/linkcontext.so python
cp -f bazel-bin/src/primihub/pybind_warpper/opt_paillier_c2py.so python
cp -f bazel-bin/src/primihub/pybind_warpper/opt_paillier_c2py.so python
...
@@ -132,6 +120,8 @@ jobs:
...
@@ -132,6 +120,8 @@ jobs:
tar zcf primihub-darwin-amd64.tar.gz bazel-bin/cli \
tar zcf primihub-darwin-amd64.tar.gz bazel-bin/cli \
bazel-bin/node \
bazel-bin/node \
primihub-cli \
primihub-node \
bazel-bin/py_main \
bazel-bin/py_main \
bazel-bin/src/primihub/pybind_warpper/opt_paillier_c2py.so \
bazel-bin/src/primihub/pybind_warpper/opt_paillier_c2py.so \
bazel-bin/src/primihub/pybind_warpper/linkcontext.so \
bazel-bin/src/primihub/pybind_warpper/linkcontext.so \
...
@@ -158,13 +148,7 @@ jobs:
...
@@ -158,13 +148,7 @@ jobs:
run
:
|
run
:
|
# cc_binary
# cc_binary
bash pre_build.sh
bash pre_build.sh
bazel build --config=darwin_arm64 //:node \
make protos=y
//:py_main \
//:cli \
//src/primihub/pybind_warpper:opt_paillier_c2py \
//src/primihub/pybind_warpper:linkcontext \
//src/primihub/protos:worker_py_pb2_grpc \
//src/primihub/protos:service_py_pb2_grpc
cp -f bazel-bin/src/primihub/pybind_warpper/linkcontext.so python
cp -f bazel-bin/src/primihub/pybind_warpper/linkcontext.so python
cp -f bazel-bin/src/primihub/pybind_warpper/opt_paillier_c2py.so python
cp -f bazel-bin/src/primihub/pybind_warpper/opt_paillier_c2py.so python
...
@@ -173,6 +157,8 @@ jobs:
...
@@ -173,6 +157,8 @@ jobs:
tar zcf primihub-darwin-arm64.tar.gz bazel-bin/cli \
tar zcf primihub-darwin-arm64.tar.gz bazel-bin/cli \
bazel-bin/node \
bazel-bin/node \
primihub-cli \
primihub-node \
bazel-bin/py_main \
bazel-bin/py_main \
bazel-bin/src/primihub/pybind_warpper/opt_paillier_c2py.so \
bazel-bin/src/primihub/pybind_warpper/opt_paillier_c2py.so \
bazel-bin/src/primihub/pybind_warpper/linkcontext.so \
bazel-bin/src/primihub/pybind_warpper/linkcontext.so \
...
...
Dockerfile
浏览文件 @
791d5257
...
@@ -33,13 +33,11 @@ ADD . /src
...
@@ -33,13 +33,11 @@ ADD . /src
# Bazel build primihub-node & primihub-cli & paillier shared library
# Bazel build primihub-node & primihub-cli & paillier shared library
RUN
bash pre_build.sh
\
RUN
bash pre_build.sh
\
&&
mv
-f
WORKSPACE_GITHUB WORKSPACE
\
&&
mv
-f
WORKSPACE_GITHUB WORKSPACE
\
&&
bazel build
--config
=
linux_
`
arch
`
//:node
\
&&
make
mysql
=
y
\
//:py_main
\
//:cli
\
//src/primihub/pybind_warpper:opt_paillier_c2py
\
//src/primihub/pybind_warpper::linkcontext
\
&&
tar
zcf bazel-bin.tar.gz bazel-bin/cli
\
&&
tar
zcf bazel-bin.tar.gz bazel-bin/cli
\
bazel-bin/node
\
bazel-bin/node
\
primihub-cli
\
primihub-node
\
bazel-bin/py_main
\
bazel-bin/py_main
\
bazel-bin/src/primihub/pybind_warpper/opt_paillier_c2py.so
\
bazel-bin/src/primihub/pybind_warpper/opt_paillier_c2py.so
\
bazel-bin/src/primihub/pybind_warpper/linkcontext.so
\
bazel-bin/src/primihub/pybind_warpper/linkcontext.so
\
...
@@ -64,9 +62,7 @@ WORKDIR /app
...
@@ -64,9 +62,7 @@ WORKDIR /app
# Copy opt_paillier_c2py.so linkcontext.so to /app/python, this enable setup.py find it.
# Copy opt_paillier_c2py.so linkcontext.so to /app/python, this enable setup.py find it.
RUN
tar
zxf /opt/bazel-bin.tar.gz
\
RUN
tar
zxf /opt/bazel-bin.tar.gz
\
&&
mkdir
log
\
&&
mkdir
log
&&
ln
-s
bazel-bin/node primihub-node
\
&&
ln
-s
bazel-bin/cli primihub-cli
WORKDIR
/app/python
WORKDIR
/app/python
...
...
Dockerfile.local
浏览文件 @
791d5257
...
@@ -5,12 +5,9 @@ WORKDIR /app
...
@@ -5,12 +5,9 @@ WORKDIR /app
ADD bazel-bin.tar.gz ./
ADD bazel-bin.tar.gz ./
COPY src/primihub/protos/ src/primihub/protos/
COPY src/primihub/protos/ src/primihub/protos/
# Make symlink to primihub-node & primihub-cli
RUN mkdir log \
&& ln -s bazel-bin/node primihub-node \
&& ln -s bazel-bin/cli primihub-cli
RUN cd python \
RUN mkdir log \
&& cd python \
&& python3 setup.py develop
&& python3 setup.py develop
EXPOSE 50050
EXPOSE 50050
Dockerfile.release
浏览文件 @
791d5257
...
@@ -14,9 +14,7 @@ COPY primihub-linux-amd64.tar.gz primihub-linux-arm64.tar.gz /opt/
...
@@ -14,9 +14,7 @@ COPY primihub-linux-amd64.tar.gz primihub-linux-arm64.tar.gz /opt/
COPY src/primihub/protos/ src/primihub/protos/
COPY src/primihub/protos/ src/primihub/protos/
RUN tar zxf /opt/primihub-linux-$(dpkg --print-architecture).tar.gz \
RUN tar zxf /opt/primihub-linux-$(dpkg --print-architecture).tar.gz \
&& mkdir log \
&& mkdir log
&& ln -s bazel-bin/node primihub-node \
&& ln -s bazel-bin/cli primihub-cli
WORKDIR /app/python
WORKDIR /app/python
...
...
Makefile
浏览文件 @
791d5257
BUILD_FLAG
?=
TARGET
:=
//:node
\
TARGET
:=
//:node
\
//:cli
\
//:cli
\
//src/primihub/cli:reg_cli
\
//src/primihub/cli:reg_cli
\
//src/primihub/pybind_warpper:linkcontext
\
//src/primihub/pybind_warpper:linkcontext
\
//src/primihub/pybind_warpper:opt_paillier_c2py
\
//src/primihub/pybind_warpper:opt_paillier_c2py
\
//:py_main
//:py_main
ifeq
($(mysql), y)
BUILD_FLAG
+=
--define
enable_mysql_driver
=
true
endif
ifeq
($(protos), y)
TARGET
+=
//src/primihub/protos:worker_py_pb2_grpc //src/primihub/protos:service_py_pb2_grpc
endif
release
:
release
:
bazel build
--config
=
PLATFORM_HARDWARE
${TARGET}
bazel build
--config
=
PLATFORM_HARDWARE
$(BUILD_FLAG)
${TARGET}
ln
-s
bazel-bin/cli primihub-cli
ln
-s
bazel-bin/node primihub-node
#linux_x86_64:
#linux_x86_64:
# bazel build --config=linux_x86_64 ${TARGET}
# bazel build --config=linux_x86_64 ${TARGET}
...
...
build_local.sh
浏览文件 @
791d5257
...
@@ -15,13 +15,7 @@ fi
...
@@ -15,13 +15,7 @@ fi
bash pre_build.sh
bash pre_build.sh
ARCH
=
`
arch
`
make
mysql
=
y
bazel build
--config
=
linux_
$ARCH
--define
enable_mysql_driver
=
true
//:node
\
//:py_main
\
//:cli
\
//src/primihub/pybind_warpper:opt_paillier_c2py
\
//src/primihub/pybind_warpper:linkcontext
if
[
$?
-ne
0
]
;
then
if
[
$?
-ne
0
]
;
then
echo
"Build failed!!!"
echo
"Build failed!!!"
...
@@ -33,6 +27,8 @@ git rev-parse HEAD >> commit.txt
...
@@ -33,6 +27,8 @@ git rev-parse HEAD >> commit.txt
tar
zcf bazel-bin.tar.gz bazel-bin/cli
\
tar
zcf bazel-bin.tar.gz bazel-bin/cli
\
bazel-bin/node
\
bazel-bin/node
\
primihub-cli
\
primihub-node
\
bazel-bin/py_main
\
bazel-bin/py_main
\
bazel-bin/src/primihub/pybind_warpper/opt_paillier_c2py.so
\
bazel-bin/src/primihub/pybind_warpper/opt_paillier_c2py.so
\
bazel-bin/src/primihub/pybind_warpper/linkcontext.so
\
bazel-bin/src/primihub/pybind_warpper/linkcontext.so
\
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录