Skip to content

Commit

Permalink
Merge pull request #5198 from FederatedAI/feature-2.0.0-beta-update_s…
Browse files Browse the repository at this point in the history
…ubmodule

Feature 2.0.0 beta update submodule
  • Loading branch information
mgqa34 authored Sep 18, 2023
2 parents 7f60f76 + c2b1cce commit 148f50e
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 6 deletions.
10 changes: 7 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
[submodule "eggroll"]
path = eggroll
url = https://github.com/WeBankFinTech/eggroll
branch = v2.5.0-alpha
branch = v3.0.0-beta
[submodule "fate_client"]
path = fate_client
url = https://github.com/FederatedAI/FATE-Client
branch = v2.0.0-alpha
branch = v2.0.0-beta
[submodule "fate_flow"]
path = fate_flow
url = https://github.com/FederatedAI/FATE-Flow
branch = v2.0.0-alpha
branch = v2.0.0-beta
[submodule "fate_test"]
path = fate_test
url = https://github.com/FederatedAI/FATE-Test.git
branch = v2.0.0-beta
2 changes: 1 addition & 1 deletion eggroll
2 changes: 1 addition & 1 deletion fate_flow
Submodule fate_flow updated 86 files
+3 −1 .github/workflows/doc.yml
+0 −2 README.md
+1 −2 README.zh.md
+11 −0 RELEASE.md
+2 −1 bin/init_env.sh
+0 −83 doc/2.0.0-alpha.md
+38 −0 doc/build/build.py
+166 −0 doc/build/build_swagger_server.py
+0 −49 doc/container.md
+110 −0 doc/fate_flow.md
+110 −0 doc/fate_flow.zh.md
+ doc/images/fate_arch.png
+ doc/images/fate_deploy_directory.png
+ doc/images/fate_flow_arch.png
+ doc/images/fate_flow_authorization.png
+ doc/images/fate_flow_component_dsl.png
+ doc/images/fate_flow_component_registry.png
+ doc/images/fate_flow_dag.png
+ doc/images/fate_flow_detector.png
+ doc/images/fate_flow_dsl.png
+ doc/images/fate_flow_inputoutput.png
+ doc/images/fate_flow_logical_arch.png
+ doc/images/fate_flow_major_feature.png
+ doc/images/fate_flow_model_storage.png
+ doc/images/fate_flow_pipelined_model.png
+ doc/images/fate_flow_resource_process.png
+ doc/images/fate_flow_scheduling_arch.png
+ doc/images/federated_learning_pipeline.png
+4 −0 doc/index.md
+4 −0 doc/index.zh.md
+79 −0 doc/mkdocs/README.md
+1 −0 doc/mkdocs/assets/animations/ml.json
+39 −0 doc/mkdocs/css/custom.css
+34 −0 doc/mkdocs/css/extra.css
+144 −0 doc/mkdocs/css/landing.css
+110 −0 doc/mkdocs/css/termynal.css
+31 −0 doc/mkdocs/docker/Dockerfile
+25 −0 doc/mkdocs/docker/README.md
+106 −0 doc/mkdocs/js/custom.js
+181 −0 doc/mkdocs/js/lottie-player.js
+265 −0 doc/mkdocs/js/termynal.js
+7 −0 doc/mkdocs/requirements.txt
+1 −0 doc/mkdocs/theme/README.md
+92 −0 doc/mkdocs/theme/overrides/home.html
+90 −0 doc/mkdocs/theme/overrides/home.zh.html
+138 −353 doc/quick_start.md
+562 −0 doc/quick_start.zh.md
+3 −0 doc/swagger/index.md
+1,999 −0 doc/swagger/swagger.yaml
+70 −75 doc/system_conf.md
+221 −0 doc/system_conf.zh.md
+92 −18 examples/lr/predict_lr.yaml
+34 −22 examples/lr/train_lr.yaml
+7 −0 examples/model/export.json
+5 −0 examples/model/import.json
+7 −0 examples/permission/delete.json
+7 −0 examples/permission/grant.json
+9 −0 examples/provider/register.json
+9 −19 mkdocs.yml
+2 −2 python/fate_flow/apps/client/client_app.py
+8 −3 python/fate_flow/apps/client/data_app.py
+2 −2 python/fate_flow/apps/client/log_app.py
+1 −0 python/fate_flow/apps/desc.py
+21 −5 python/fate_flow/commands/server_cli.py
+170 −0 python/fate_flow/commands/service.py
+0 −4 python/fate_flow/components/components/upload.py
+24 −2 python/fate_flow/controller/job_controller.py
+1 −0 python/fate_flow/db/db_models.py
+4 −4 python/fate_flow/engine/backend/_base.py
+7 −3 python/fate_flow/engine/backend/_eggroll.py
+4 −8 python/fate_flow/engine/backend/_spark.py
+1 −1 python/fate_flow/engine/storage/standalone/_standalone.py
+2 −1 python/fate_flow/fate_flow_server.py
+8 −1 python/fate_flow/hub/scheduler/fate/_scheduler.py
+2 −2 python/fate_flow/manager/components/component_manager.py
+4 −4 python/fate_flow/manager/service/provider_manager.py
+41 −13 python/fate_flow/manager/service/resource_manager.py
+1 −3 python/fate_flow/manager/service/worker_manager.py
+2 −3 python/fate_flow/runtime/system_settings.py
+14 −1 python/fate_flow/utils/file_utils.py
+2 −1 python/fate_flow/utils/process_utils.py
+0 −17 python/requirements-fate.txt
+2 −3 python/requirements-flow.txt
+1 −1 python/requirements-pulsar.txt
+0 −3 python/requirements.txt
+45 −4 python/setup.py
1 change: 1 addition & 0 deletions fate_test
Submodule fate_test added at 80e737

0 comments on commit 148f50e

Please sign in to comment.