Skip to content

Commit

Permalink
Merge pull request #8306 from madhavajay/madhava/bump_deps
Browse files Browse the repository at this point in the history
Bumping dependencies and removing gipc
  • Loading branch information
rasswanth-s authored Dec 5, 2023
2 parents 0c29042 + dfe64e4 commit d307f68
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 31 deletions.
2 changes: 1 addition & 1 deletion packages/grid/backend/backend.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ COPY --chown=$USER_GRP \

# Install all dependencies together here to avoid any version conflicts across pkgs
RUN --mount=type=cache,id=pip-$UID,target=$HOME/.cache/pip,uid=$UID,gid=$UID,sharing=locked \
pip install --user torch==2.1.0 -f https://download.pytorch.org/whl/cpu/torch_stable.html && \
pip install --user torch==2.1.1 -f https://download.pytorch.org/whl/cpu/torch_stable.html && \
pip install --user pip-autoremove jupyterlab==4.0.7 -e ./syft[data_science] && \
pip-autoremove ansible ansible-core -y

Expand Down
4 changes: 1 addition & 3 deletions packages/hagrid/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,12 @@
"virtualenv",
"PyYAML",
"tqdm",
"gevent>=22.10.2",
"gevent>=22.10.2,<=23.9.1",
]

if platform.system().lower() != "windows":
packages.extend(["ansible", "ansible-core"])

# Pillow binary wheels for Apple Silicon on Python 3.8 don't seem to work well
# try using Python 3.9+ for HAGrid on Apple Silicon
setup(
name="hagrid",
description="Happy Automation for Grid",
Expand Down
30 changes: 13 additions & 17 deletions packages/syft/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -29,41 +29,40 @@ syft =
bcrypt==4.0.1
boto3==1.28.65
forbiddenfruit==0.1.4
gevent==22.10.2
gipc==1.5.0
gevent==23.9.1
loguru==0.7.2
networkx==2.8
packaging>=23.0
pyarrow==14.0.1
pycapnp==1.3.0
pydantic[email]==1.10.13
pymongo==4.5.0
pymongo==4.6.1
pynacl==1.5.0
pyzmq>=23.2.1,<=25.1.1
redis==4.6.0
requests==2.31.0
RestrictedPython==6.2
RestrictedPython==7.0
result==0.10.0
tqdm==4.66.1
typeguard==2.13.3
typing_extensions==4.8.0
sherlock[redis,filelock]==0.4.1
uvicorn[standard]==0.23.2
uvicorn[standard]==0.24.0.post1
fastapi==0.103.2
psutil==5.9.6
hagrid>=0.3
itables==1.6.2
safetensors==0.4.0
safetensors==0.4.1
argon2-cffi==23.1.0
matplotlib==3.8.0
# jaxlib is a DL library but we are needing it for serialization
jaxlib==0.4.18
jax==0.4.18
jaxlib==0.4.20
jax==0.4.20
# numpy and pandas are ML packages but are needed in many places througout the codebase
numpy>=1.23.5,<=1.24.4
pandas==1.5.3
docker==6.1.3
PyYAML>=6.0,<7
PyYAML==6.0.1


install_requires =
Expand All @@ -81,23 +80,23 @@ exclude =

[options.extras_require]
data_science =
transformers==4.34.0
transformers==4.35.2
opendp==0.8.0
evaluate==0.4.1
recordlinkage==0.16
dm-haiku==0.0.10
torch[cpu]==2.1.0
torch[cpu]==2.1.1

dev =
%(test_plugins)s
%(telemetry)s
bandit==1.7.5
ruff==0.1.0
ruff==0.1.6
importlib-metadata==6.8.0
isort==5.12.0
mypy==1.6.0
mypy==1.7.1
pre-commit==3.5.0
safety>=2.4.0b1
safety>=2.4.0b2

telemetry =
opentelemetry-api==1.14.0
Expand All @@ -124,9 +123,6 @@ test_plugins =
faker
lxml

oblv =
oblv-ctl==0.3.1

[options.entry_points]
console_scripts =
syft=syft.node.run:run
Expand Down
10 changes: 0 additions & 10 deletions packages/syft/src/syft/node/node.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@
from ..external import OBLV
from ..protocol.data_protocol import PROTOCOL_TYPE
from ..protocol.data_protocol import get_data_protocol
from ..serde.deserialize import _deserialize
from ..serde.serialize import _serialize
from ..service.action.action_object import Action
from ..service.action.action_object import ActionObject
from ..service.action.action_service import ActionService
Expand Down Expand Up @@ -124,14 +122,6 @@
CODE_RELOADER: Dict[int, Callable] = {}


def gipc_encoder(obj):
return _serialize(obj, to_bytes=True)


def gipc_decoder(obj_bytes):
return _deserialize(obj_bytes, from_bytes=True)


NODE_PRIVATE_KEY = "NODE_PRIVATE_KEY"
NODE_UID = "NODE_UID"
NODE_TYPE = "NODE_TYPE"
Expand Down

0 comments on commit d307f68

Please sign in to comment.