add and bumps requirements versions

Signed-off-by: sagewe <wbwmat@gmail.com>
FederatedAI · Dec 15, 2023 · 591507e · 591507e
1 parent 26ed5ba
commit 591507e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/python/fate/arch/launchers/multiprocess_launcher.py b/python/fate/arch/launchers/multiprocess_launcher.py
@@ -165,7 +165,10 @@ def _run_process(
                 exc_traceback = rich.traceback.Traceback.from_exception(
                     type(e), e, traceback=e.__traceback__, width=width, show_locals=True
                 )
-                output_or_exception_q.put((args.rank, e, exc_traceback))
+                try:
+                    output_or_exception_q.put((args.rank, e, exc_traceback))
+                except Exception as e:
+                    logger.exception(f"failed to put exception to queue: {e}")
             finally:
                 try:
                     ctx.destroy()

diff --git a/python/requirements-eggroll.txt b/python/requirements-eggroll.txt
@@ -1,5 +1,7 @@
-grpcio==1.46.3
-grpcio-tools==1.46.3
-protobuf==3.19.6
+opentelemetry-api
+opentelemetry-sdk
+protobuf==4.24.4
+grpcio==1.59.3
+grpcio-tools==1.59.3
 cloudpickle==2.1.0
 psutil>=5.7.0
diff --git a/python/requirements-fate.txt b/python/requirements-fate.txt
@@ -13,12 +13,12 @@ transformers==4.30.2
 accelerate==0.20.2
 beautifultable
 requests<2.26.0
-grpcio==1.46.3
-protobuf==3.19.6
 scikit-learn
 omegaconf
 rich
 opentelemetry-api
 opentelemetry-sdk
 opentelemetry-exporter-otlp-proto-grpc
 mmh3==3.0.0
+protobuf==4.24.4
+grpcio==1.59.3
diff --git a/python/setup.py b/python/setup.py
@@ -22,8 +22,11 @@
     "requests",
     "grpcio",
     "protobuf",
+    "rich",
+    "omegaconf",
     "opentelemetry-api",
     "opentelemetry-sdk",
+    "mmh3==3.0.0",
 ]
 
 # Extra requirements
@@ -32,17 +35,12 @@
     "pulsar": [
         "pulsar-client==2.10.2; sys_platform != 'darwin'",
         "pulsar-client==2.10.1; sys_platform == 'darwin'",
-        "urllib3==1.26.5"
+        "urllib3==1.26.5",
     ],
     "spark": ["pyspark"],
     "eggroll": [
-        "grpcio==1.46.3",
-        "grpcio-tools==1.46.3",
-        "numba==0.56.4",
-        "protobuf==3.19.6",
-        "mmh3==3.0.0",
+        "grpcio-tools",
         "cachetools>=3.0.0",
-        "cloudpickle==2.1.0",
         "psutil>=5.7.0",
     ],
     "all": ["pyfate[rabbitmq,pulsar,spark,eggroll]"],