Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge from orign #1

Merged
merged 851 commits into from
Mar 23, 2019
Merged
Changes from 1 commit
Commits
Show all changes
851 commits
Select commit Hold shift + click to select a range
990427a
merge
iamtrask Feb 14, 2019
bd88035
Merge branch 'dev' into ryffel_fix_precision_improved
iamtrask Feb 14, 2019
d01fcad
updated notebooks (bugfix)
iamtrask Feb 15, 2019
5bce015
Merge pull request #1911 from OpenMined/trask_1
LaRiffle Feb 15, 2019
80cd3dc
Merge branch 'master' into dev
iamtrask Feb 16, 2019
6c180ff
Merge pull request #1913 from OpenMined/dev
robert-wagner Feb 16, 2019
7cb72e5
Add serialization of torch.device to support hook of .to(device)
LaRiffle Feb 17, 2019
2d077e0
Add a way to rewrite command on un-wrapped arguments:
LaRiffle Feb 18, 2019
84bc66a
removed .coverage and updated requirements
robert-wagner Feb 18, 2019
6545b2d
added intial functionality for matrix multiplication
robert-wagner Feb 5, 2019
67765dd
added failing tests for mpc mul
robert-wagner Feb 6, 2019
effe044
added hooking for functional and fixed bugs with locations
robert-wagner Feb 8, 2019
125dcad
temporary print statements
robert-wagner Feb 16, 2019
31e1d7f
mul working without truncation
robert-wagner Feb 18, 2019
ebf24b1
removed old notebooks
robert-wagner Feb 18, 2019
ac3b94d
Add test for .to('cpu') on remote pointer
LaRiffle Feb 19, 2019
1a1d6f2
Add docstring to hooked fixed precision functions
LaRiffle Feb 19, 2019
07bf62b
Improve tests and tensors comparison for fixed precision
LaRiffle Feb 19, 2019
100e0ba
Merge branch 'dev' into ryffel_fix_precision_improved
LaRiffle Feb 19, 2019
cfa1f24
Merge pull request #1917 from OpenMined/remove_old_experimental_noteb…
LaRiffle Feb 19, 2019
fc95933
Merge branch 'dev' into add_torch_vision_to_requirements
LaRiffle Feb 19, 2019
1404d54
Merge pull request #1915 from OpenMined/add_torch_vision_to_requirements
LaRiffle Feb 19, 2019
6841e04
Merge branch 'dev' into ryffel_mnist_tuto_improvement
LaRiffle Feb 19, 2019
427ddaf
Merge branch 'dev' into ryffel_fix_precision_improved
LaRiffle Feb 19, 2019
1e532ab
Merge pull request #1914 from OpenMined/ryffel_mnist_tuto_improvement
robert-wagner Feb 19, 2019
a465b09
Change is_parameter to private
LaRiffle Feb 19, 2019
ec40625
Merge branch 'dev' into ryffel_fix_precision_improved
LaRiffle Feb 19, 2019
a6aef8c
updated version to 0.1.3a1
robert-wagner Feb 19, 2019
34022ea
Merge pull request #1897 from OpenMined/ryffel_fix_precision_improved
robert-wagner Feb 19, 2019
925703e
Merge branch 'dev' into update_dev_version
robert-wagner Feb 19, 2019
2f65b05
removed tf from .travis.yml
robert-wagner Feb 19, 2019
1108f4d
Merge pull request #1921 from OpenMined/update_dev_version
robert-wagner Feb 19, 2019
24048bf
Merge branch 'dev' into remove_tf_from_travis
LaRiffle Feb 19, 2019
260d97d
Merge pull request #1925 from OpenMined/dev
robert-wagner Feb 19, 2019
e112e1d
Merge pull request #1923 from OpenMined/remove_tf_from_travis
robert-wagner Feb 19, 2019
a68e5b4
switch conda to venv
robert-wagner Feb 19, 2019
6180d78
removed unnecessary venv command and switched to pip3
robert-wagner Feb 19, 2019
ac9aef8
DP tensor experiment v4 - debugging
iamtrask Feb 19, 2019
566209b
Merge pull request #1934 from OpenMined/trask_1
iamtrask Feb 19, 2019
732f80f
changed virtualenv folder to virtualenv
robert-wagner Feb 20, 2019
fb19931
vectorize PrivateTensor
iamtrask Feb 20, 2019
80fe420
Merge branch 'dev' into trask_1
iamtrask Feb 20, 2019
402a630
Merge branch 'dev' into switch_travis_to_venv
robert-wagner Feb 20, 2019
fc79026
Merge pull request #1935 from OpenMined/trask_1
iamtrask Feb 20, 2019
27db1a3
Merge branch 'dev' into switch_travis_to_venv
iamtrask Feb 20, 2019
c611953
Merge pull request #1926 from OpenMined/switch_travis_to_venv
robert-wagner Feb 20, 2019
814b4ac
Begin add data workers on signup
kamathhrishi Feb 20, 2019
6c2b8cf
Some corrections
kamathhrishi Feb 20, 2019
9b878ab
Correction
kamathhrishi Feb 20, 2019
b8f9a5d
Upgrade FederatedDataset to match the PyTorch api:
LaRiffle Feb 20, 2019
4140ca0
Update FederatedDataLoader and fix len()
LaRiffle Feb 20, 2019
941bf29
Add tests for Federated Data, Dataset, and DataLoader
LaRiffle Feb 20, 2019
1006945
Added test case and documentation
kamathhrishi Feb 21, 2019
cdbb0fe
Style formatting
kamathhrishi Feb 21, 2019
b74e2cd
Merge branch 'dev' into data_on_signup
kamathhrishi Feb 21, 2019
117e119
Merge pull request #1936 from kamathhrishi/data_on_signup
robert-wagner Feb 21, 2019
82aea02
Fix __len__ for abstract tensor
LaRiffle Feb 21, 2019
91a65d1
Change logic for FederatedDataset: is a dict of "normal" datasets
LaRiffle Feb 21, 2019
6ee7789
Add draft version of a plan - tests fail
LaRiffle Feb 22, 2019
1a33942
fixed tests
iamtrask Feb 22, 2019
f5dd59e
removed extraneous comments
iamtrask Feb 22, 2019
b0e1bc5
Move Plan worker to its own file and add easy import
LaRiffle Feb 23, 2019
a098721
Add some tests on Plan Worker
LaRiffle Feb 23, 2019
60361d0
Add tests for the new Federated Dataset structure
LaRiffle Feb 23, 2019
871533e
Fix flake8 error
LaRiffle Feb 23, 2019
0902097
Merge branch 'dev' into ryffel_federated_dataset_improvement
LaRiffle Feb 23, 2019
ec7ea57
Merge branch 'ryffel_id_gen_and_plan' of github.com:OpenMined/PySyft …
iamtrask Feb 23, 2019
141a17e
moved plan execution to its own method
iamtrask Feb 23, 2019
7c95bbb
organized serde
iamtrask Feb 23, 2019
5aac2ee
Add docstring and fix imports
LaRiffle Feb 23, 2019
bbe3a4f
Update tutorial 8 toward more compactness of code
LaRiffle Feb 23, 2019
7822bad
precommit
iamtrask Feb 23, 2019
1c8dedc
black (!)
LaRiffle Feb 23, 2019
3a1080c
CIFAR 10 Example Draft
kamathhrishi Feb 24, 2019
efc0efa
Merge pull request #1937 from OpenMined/ryffel_federated_dataset_impr…
LaRiffle Feb 25, 2019
2079af1
Change the way the shape is requested for a pointer
LaRiffle Feb 25, 2019
f075db8
Add plan_worker to pytest conftest and add test for shape
LaRiffle Feb 25, 2019
49960d4
Merge branch 'dev' into cifar10_exp
kamathhrishi Feb 25, 2019
1cfcef6
Updated CIFAR10 Example
kamathhrishi Feb 26, 2019
2d69717
updated version to 0.1.4a1
robert-wagner Feb 26, 2019
b4d586c
Merge pull request #1946 from OpenMined/update_dev_version_to_014a1
LaRiffle Feb 26, 2019
8565abf
Merge pull request #1949 from OpenMined/dev
robert-wagner Feb 26, 2019
5a30dd9
Fix the hook args issue #1948
LaRiffle Feb 26, 2019
ce5715e
Add support of passive kwargs hook: they are forwarded as is
LaRiffle Feb 26, 2019
61dd984
Merge pull request #1950 from OpenMined/ryffel_fix_hook_args_1948
robert-wagner Feb 26, 2019
cbbf3f1
Merge branch 'dev' into ryffel_add_passive_hook_kwargs
robert-wagner Feb 26, 2019
950a976
Merge pull request #1951 from OpenMined/ryffel_add_passive_hook_kwargs
robert-wagner Feb 26, 2019
5c8e5fd
Merge branch 'dev' into mpc_multiplication
iamtrask Feb 27, 2019
68dd31a
Add content_type in setup.py for pipy download page display
LaRiffle Mar 1, 2019
b1d72c3
Merge pull request #1954 from OpenMined/ryffel-fix-setup
LaRiffle Mar 1, 2019
0b30ba4
Updated CIFAR 10 Example
kamathhrishi Mar 1, 2019
acc99b7
Add a TroubleShooting section in the Readme
LaRiffle Mar 1, 2019
c242e3f
updated version to 0.1.4a2
robert-wagner Mar 1, 2019
a85312c
Merge pull request #1956 from OpenMined/pypi_display_testing
jlebensold Mar 1, 2019
7850ba8
added on_worker to plan worker
iamtrask Mar 1, 2019
f5d55da
Merge pull request #1957 from OpenMined/dev
iamtrask Mar 1, 2019
73add38
Add test for plan
LaRiffle Mar 1, 2019
f9bfae5
Add colab link to the setup example
LaRiffle Mar 1, 2019
e5ce063
Updated CIFAR 10
kamathhrishi Mar 1, 2019
5b7bb25
Merge branch 'dev' into cifar10_exp
kamathhrishi Mar 1, 2019
2ec1cde
Merge branch 'dev' into ryffel_update_readme
robert-wagner Mar 1, 2019
909ddf3
Merge pull request #1955 from OpenMined/ryffel_update_readme
iamtrask Mar 1, 2019
6cf656c
changed make test to work
tqhdesilva Mar 1, 2019
eabc3e8
Merge branch 'dev' into make-test-fix
tqhdesilva Mar 1, 2019
4ca1ca4
Merge pull request #1959 from tqhdesilva/make-test-fix
iamtrask Mar 2, 2019
fcdcd13
Merge branch 'dev' into cifar10_exp
iamtrask Mar 2, 2019
5db0883
added PlanPointer and removed extraneous register parameter from Poin…
iamtrask Mar 2, 2019
7fbe3e9
Merge pull request #1944 from kamathhrishi/cifar10_exp
LaRiffle Mar 2, 2019
5872313
Add a decorator to build plans and send them to remote workers
LaRiffle Mar 2, 2019
ea0f326
added pate files
iamtrask Mar 2, 2019
25f2f44
added comments
iamtrask Mar 3, 2019
4678c23
added pate test
iamtrask Mar 3, 2019
ef57e15
added one passing and one failing test for issue #1939
tqhdesilva Mar 3, 2019
712e302
passed failing test for issue #1939
tqhdesilva Mar 3, 2019
0a93c8c
Merge branch 'dev' into detail-id-int-fix
tqhdesilva Mar 3, 2019
1331fc3
type annotation of syft/workers/virtual.py
AlanAboudib Mar 3, 2019
d567a0a
added return type to _recv_msg() in syft/workers/virutal.py
AlanAboudib Mar 3, 2019
bcb1654
Merge pull request #1961 from tqhdesilva/detail-id-int-fix
LaRiffle Mar 3, 2019
a6de330
removed comments
iamtrask Mar 3, 2019
97afe08
removed six and xrange->range
iamtrask Mar 3, 2019
feeaa08
moved import
iamtrask Mar 3, 2019
768ba5f
Merge branch 'dev' into trask_pate
iamtrask Mar 3, 2019
e6becaa
Delete PATE Analysis.ipynb
iamtrask Mar 3, 2019
29433d5
Delete PointersAhead.ipynb
iamtrask Mar 3, 2019
5af6ac9
Merge pull request #1960 from OpenMined/trask_pate
iamtrask Mar 3, 2019
067dc0a
Merge branch 'dev' into type_annotation
AlanAboudib Mar 3, 2019
274a0ae
Fix error in tutorial 2
tyrinwu Mar 3, 2019
a1638bb
Merge pull request #1964 from tyrinwu/patch-1
LaRiffle Mar 3, 2019
78e41de
checkpoint
iamtrask Mar 4, 2019
aad2297
Merge pull request #1962 from alaaboudib/type_annotation
iamtrask Mar 4, 2019
7f23acf
resize readme img
robert-wagner Mar 4, 2019
02f6315
Merge branch 'dev' into clean_up_readme_img
robert-wagner Mar 4, 2019
429367a
automatically register workers with each other on creation
robert-wagner Mar 4, 2019
ef4d9b8
Merge pull request #1969 from OpenMined/automatically_add_workers
robert-wagner Mar 4, 2019
676d877
Update proportions for logo
LaRiffle Mar 4, 2019
5a20944
Merge branch 'dev' into clean_up_readme_img
robert-wagner Mar 4, 2019
f472bc5
Merge pull request #1968 from OpenMined/clean_up_readme_img
robert-wagner Mar 4, 2019
23231b0
initial draft for websocket worker
robert-wagner Mar 4, 2019
5907e4f
basic plan sending and execution seem to be working
iamtrask Mar 5, 2019
e3518fd
just cleaning up spare code
iamtrask Mar 5, 2019
bf2d1de
checkpoint
iamtrask Mar 5, 2019
d99e6c1
merge
iamtrask Mar 5, 2019
9fed153
merge
iamtrask Mar 5, 2019
c2c74c1
decorator and method both seem to work now
iamtrask Mar 5, 2019
95d71b0
Merge pull request #1971 from OpenMined/trask_plan
iamtrask Mar 5, 2019
f089936
fixed bug where we couldn't have multiple plans on the same worker
iamtrask Mar 5, 2019
eaf4c38
fixed bug where we couldn't have multiple plans on the same worker
iamtrask Mar 5, 2019
c2768a5
Merge pull request #1972 from OpenMined/trask_plan
iamtrask Mar 5, 2019
cc1ef4c
removed print statement
iamtrask Mar 5, 2019
6ecaa57
Merge pull request #1973 from OpenMined/trask_plan
iamtrask Mar 5, 2019
141a0e2
update version to 0.1.5a1
robert-wagner Mar 5, 2019
fdaff3e
Merge pull request #1974 from OpenMined/update_version_to_0.1.5a1
robert-wagner Mar 5, 2019
019f2ec
toy client / server implementation
jlebensold Mar 5, 2019
3a0de19
socket testcase
jlebensold Mar 5, 2019
c0baf24
Merge pull request #1976 from OpenMined/dev
iamtrask Mar 5, 2019
6ebc755
Added some more type annotations
AlanAboudib Mar 6, 2019
3e1c792
Merge branch 'type_annotation' of https://github.com/alaaboudib/PySyf…
AlanAboudib Mar 6, 2019
552e49b
Fixed annotation types for current class type and syft tensors
AlanAboudib Mar 6, 2019
5121422
add torch import necessary for type annotation as torch.Tensor
AlanAboudib Mar 6, 2019
e770a61
Merge branch 'dev' into type_annotation
AlanAboudib Mar 6, 2019
b73bbed
Merge branch 'type_annotation' of https://github.com/alaaboudib/PySyf…
AlanAboudib Mar 6, 2019
c32696b
commit for syncronization
robert-wagner Mar 6, 2019
0ec601c
removed return types annotations from abstract methods
AlanAboudib Mar 6, 2019
6917846
fixed bugs to websocket client/server; added unit test, typing, and c…
iamtrask Mar 6, 2019
980e0ad
Merge branch 'dev' into websocket_worker
robert-wagner Mar 6, 2019
91d5450
added useful runtime exception
iamtrask Mar 6, 2019
dc373c8
Merge branch 'websocket_worker' of github.com:OpenMined/PySyft into w…
iamtrask Mar 6, 2019
647e31a
update dev version to 016a1
robert-wagner Mar 6, 2019
eaa92b5
travis fix
iamtrask Mar 6, 2019
5944d80
changed order in server
iamtrask Mar 6, 2019
103799a
Merge pull request #1980 from OpenMined/update_dev_version_to_016a1
iamtrask Mar 6, 2019
9e00067
Merge branch 'dev' into type_annotation
AlanAboudib Mar 6, 2019
8121a6f
Merge branch 'type_annotation' of https://github.com/alaaboudib/PySyf…
AlanAboudib Mar 6, 2019
e998652
Merge pull request #1977 from alaaboudib/type_annotation
iamtrask Mar 8, 2019
96f6a2f
Fix FederatedDataLoader to support kwargs
LaRiffle Mar 8, 2019
dff301d
Update tutorial Part 8
LaRiffle Mar 8, 2019
7c8e317
Add virtual send, build_plan, for plan workers
LaRiffle Mar 8, 2019
fe85f8b
Add a __str__ method and ability to build local / remote plans
LaRiffle Mar 8, 2019
0670cab
Merge pull request #1982 from OpenMined/ryffel_add_kwargs_to_dataloader
iamtrask Mar 8, 2019
9481490
Reduce PlanPointer and add send / get ability for Plan
LaRiffle Mar 8, 2019
9189e89
Add comments and small fixes
LaRiffle Mar 8, 2019
689ebb3
Merge branch 'dev' into mpc_multiplication
LaRiffle Mar 9, 2019
421bb78
Fix MPC mul and matmul, clean tests
LaRiffle Mar 9, 2019
e683d26
Add random ids on manually created tensors in tests to avoid conflicts
LaRiffle Mar 9, 2019
bd95bc7
Add a method to handle registration and sending back resp to client
LaRiffle Mar 9, 2019
ec9ad86
Add test of sending back response with multiple tensors
LaRiffle Mar 9, 2019
29006b7
fix tutorial links
stefandeml Mar 11, 2019
70d6990
Merge pull request #1984 from stefandeml/fix-tutorial
robert-wagner Mar 11, 2019
1d561cf
Merge branch 'dev' into mpc_multiplication
robert-wagner Mar 11, 2019
a3749cf
excluded tests from coverage
robert-wagner Mar 11, 2019
0493524
Merge branch 'dev' into websocket_worker
robert-wagner Mar 11, 2019
088335d
Merge branch 'dev' into ryffel_remote_command_with_complex_response
LaRiffle Mar 11, 2019
b69d931
adjusted coverage excludes
robert-wagner Mar 11, 2019
83d8b20
refactored tests and fixed coverage omit
robert-wagner Mar 11, 2019
3859e99
Merge pull request #1970 from OpenMined/websocket_worker
robert-wagner Mar 11, 2019
06f54fe
Remove tests with plan testing behaviour ~ worker
LaRiffle Mar 11, 2019
678ddb9
Fix test on grid search
LaRiffle Mar 11, 2019
1c4599f
Merge branch 'dev' into mpc_multiplication
robert-wagner Mar 12, 2019
5a475e7
increases coverage of tests to 100
robert-wagner Mar 12, 2019
10ec787
update dev version to 017a1
robert-wagner Mar 12, 2019
fccdeb1
Add type annotation and update comments
LaRiffle Mar 12, 2019
0450c7e
Merge branch 'dev' into ryffel_remote_command_with_complex_response
LaRiffle Mar 12, 2019
cdd2f36
Fix typo import
LaRiffle Mar 12, 2019
561aab5
Merge pull request #1985 from OpenMined/increase_test_coverage
robert-wagner Mar 12, 2019
66fbc36
Merge branch 'dev' into mpc_multiplication
robert-wagner Mar 12, 2019
d1b40c2
Merge pull request #1916 from OpenMined/mpc_multiplication
robert-wagner Mar 12, 2019
5540214
Merge branch 'dev' into ryffel_remote_command_with_complex_response
robert-wagner Mar 12, 2019
f2ff9b6
Fix type annotation and docstring
LaRiffle Mar 12, 2019
380597e
Merge pull request #1983 from OpenMined/ryffel_remote_command_with_co…
iamtrask Mar 12, 2019
c23d170
Merge pull request #1986 from OpenMined/dev
robert-wagner Mar 12, 2019
5656a26
Merge branch 'dev' into update_dev_version_to_017a1
robert-wagner Mar 12, 2019
f879e7d
Fix tutorial Part 7
LaRiffle Mar 13, 2019
7c0b7a5
Merge pull request #1991 from OpenMined/ryffel_fix_Part_7
iamtrask Mar 13, 2019
584ed87
Merge branch 'dev' into update_dev_version_to_017a1
robert-wagner Mar 14, 2019
083d0d8
Merge pull request #1987 from OpenMined/update_dev_version_to_017a1
LaRiffle Mar 14, 2019
0ed81fa
1) Adds type annotations to a few methods. Not 100% sure that the sel…
antonrd Mar 14, 2019
61b652a
Merge branch 'dev' into issue-1456-add-type-annotations-pylint-old
antonrd Mar 14, 2019
64e76eb
Reverting a change that was accidentally added due to a master vs dev…
antonrd Mar 14, 2019
93a7405
Formatting changes after running black.
antonrd Mar 14, 2019
d20c5c2
More reformatting.
antonrd Mar 14, 2019
f5843b6
Removes some imports that were breaking the build.
antonrd Mar 14, 2019
a36fa93
Add tests for Plan
LaRiffle Mar 14, 2019
91bf2bb
Merge branch 'dev' into ryffel_id_gen_and_plan
LaRiffle Mar 15, 2019
7904249
moved logic to crypto folder and cleaned up code
robert-wagner Mar 15, 2019
eeac3dc
Merge plan functionalities with response hook registration
LaRiffle Mar 16, 2019
f42b79d
Add a synchronous Exception mechanism to handle multi output
LaRiffle Mar 16, 2019
1cf7d23
Feed the id_generator with the preset ids for output overflow handling
LaRiffle Mar 16, 2019
fee474d
Improve the worker cross-registration to remove warnings
LaRiffle Mar 16, 2019
b667b0f
Add tests for coverage
LaRiffle Mar 16, 2019
42f886e
black
LaRiffle Mar 16, 2019
cf8950f
Add location, shape props and input share option for additive shared t
LaRiffle Mar 16, 2019
0ff9863
added init file for crypto folder
robert-wagner Mar 18, 2019
3a7b2ba
Merge branch 'create_helper_file_for_mpc' of github.com:OpenMined/PyS…
robert-wagner Mar 18, 2019
761a91a
changed fixed precision tensor to use mod as well as correct field
robert-wagner Mar 18, 2019
5cf6bfe
Merge pull request #1994 from antonrd/issue-1456-add-type-annotations…
robert-wagner Mar 18, 2019
fbf5084
Add ability to choose different strategies to serde Torch tensors
mccorby Mar 16, 2019
2a5bfe4
Detach tensor if gradient is required
mccorby Mar 17, 2019
4dcf228
Make serialize_private and deserialize_tensor private. Addressed othe…
mccorby Mar 18, 2019
263cab7
Merge branch 'dev' into fix_fixed_precision
LaRiffle Mar 18, 2019
b7731f3
Merge pull request #1999 from OpenMined/fix_fixed_precision
LaRiffle Mar 18, 2019
2456c63
Merge branch 'dev' into create_helper_file_for_mpc
robert-wagner Mar 18, 2019
24ff99e
Merge branch 'dev' into feature/serialization
mccorby Mar 19, 2019
d66c11b
Conform to review, add docstring, absolute imports, etc
LaRiffle Mar 19, 2019
7dd56a5
Merge branch 'dev' into ryffel_id_gen_and_plan
LaRiffle Mar 19, 2019
0391661
Merge pull request #1998 from mccorby/feature/serialization
robert-wagner Mar 19, 2019
5e93fa5
Merge branch 'dev' into create_helper_file_for_mpc
LaRiffle Mar 19, 2019
fd3ec18
Merge pull request #1996 from OpenMined/create_helper_file_for_mpc
LaRiffle Mar 19, 2019
7870106
Merge branch 'dev' into ryffel_id_gen_and_plan
LaRiffle Mar 19, 2019
1456f18
Merge pull request #1938 from OpenMined/ryffel_id_gen_and_plan
LaRiffle Mar 19, 2019
7da1293
Merge pull request #2001 from OpenMined/dev
LaRiffle Mar 19, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Some corrections
  • Loading branch information
kamathhrishi committed Feb 20, 2019
commit 6c2b8cfe30402ea0f55f61cf47c7f64494d3526d
32 changes: 18 additions & 14 deletions syft/workers/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,18 @@ class BaseWorker(AbstractWorker):
"""

def __init__(
self, hook, id=0, known_workers={},Data={},is_client_worker=False, log_msgs=False, verbose=False
self,
hook,
id=0,
known_workers={},
data={},
is_client_worker=False,
log_msgs=False,
verbose=False,
):
"""Initializes a BaseWorker."""
self.Load_Data(Data)

self.load_data(data)
self.hook = hook
self.torch = None if hook is None else hook.torch
self.id = id
Expand All @@ -78,8 +85,6 @@ def __init__(
MSGTYPE.OBJ_DEL: self.rm_obj,
MSGTYPE.IS_NONE: self.is_tensor_none,
}



# SECTION: Methods which MUST be overridden by subclasses
@abstractmethod
Expand Down Expand Up @@ -122,15 +127,14 @@ def _recv_msg(self, message):

"""
raise NotImplementedError # pragma: no cover

def Load_Data(self,Data):

Data={}

for i in Data:

ptr=self.send(Data)
Data[ptr]=Data

def load_data(self, Data):

Data = {}

for tensor in Data:

self.register_obj(tensor)

def send_msg(self, msg_type, message, location):
"""Implements the logic to send messages.
Expand Down