dev merge sdk to deepspeed

Signed-off-by: chengtcc <864261919@qq.com>
FederatedAI · Dec 13, 2023 · f30303d · f30303d
1 parent d5577b0
commit f30303d
Show file tree

Hide file tree

Showing 24 changed files with 35 additions and 727 deletions.
diff --git a/python/eggroll/client/cli/__init__.py → python/eggroll/cli/__init__.py b/python/eggroll/client/cli/__init__.py → python/eggroll/cli/__init__.py
diff --git a/...n/eggroll/client/cli/commands/__init__.py → python/eggroll/cli/commands/__init__.py b/...n/eggroll/client/cli/commands/__init__.py → python/eggroll/cli/commands/__init__.py
diff --git a/python/eggroll/client/cli/commands/task.py → python/eggroll/cli/commands/task.py b/python/eggroll/client/cli/commands/task.py → python/eggroll/cli/commands/task.py
diff --git a/python/eggroll/client/cli/eggroll.py → python/eggroll/cli/eggroll.py b/python/eggroll/client/cli/eggroll.py → python/eggroll/cli/eggroll.py
@@ -17,9 +17,8 @@
 
 import click
 from ruamel import yaml
-
-from eggroll.client.cli.commands import task
-from eggroll.client.sdk import EggrollClient
+from eggroll.cli.commands import task
+from eggroll.deepspeed._client import EggrollClient
 from eggroll.config import Config
 
 CONTEXT_SETTINGS = dict(help_option_names=["-h", "--help"])
@@ -55,7 +54,7 @@ def eggroll_cli(ctx, eggroll_properties):
             config.load_properties(eggroll_properties)
         config.load_env()
         ctx.obj["client"] = EggrollClient(
-            config=config, ip=cli_config.get("ip"), port=cli_config.get("port")
+            config=config, host=cli_config.get("ip"), port=cli_config.get("port")
         )
 
 

diff --git a/python/eggroll/cli/settings.yaml b/python/eggroll/cli/settings.yaml
@@ -0,0 +1,2 @@
+ip: 127.0.0.1
+port: 4670
diff --git a/python/eggroll/client/cli/utils/__init__.py → python/eggroll/cli/utils/__init__.py b/python/eggroll/client/cli/utils/__init__.py → python/eggroll/cli/utils/__init__.py
diff --git a/python/eggroll/client/cli/utils/cli_args.py → python/eggroll/cli/utils/cli_args.py b/python/eggroll/client/cli/utils/cli_args.py → python/eggroll/cli/utils/cli_args.py
diff --git a/python/eggroll/client/cli/utils/cli_utils.py → python/eggroll/cli/utils/cli_utils.py b/python/eggroll/client/cli/utils/cli_utils.py → python/eggroll/cli/utils/cli_utils.py
diff --git a/python/eggroll/client/__init__.py b/python/eggroll/client/__init__.py
diff --git a/python/eggroll/client/sdk/__init__.py b/python/eggroll/client/sdk/__init__.py
diff --git a/python/eggroll/client/sdk/_client.py b/python/eggroll/client/sdk/_client.py
diff --git a/python/eggroll/client/sdk/api/__init__.py b/python/eggroll/client/sdk/api/__init__.py