Skip to content

Closes #2412, remove simplification and detailing for plans #2413

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.

Sign up for GitHub

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

Merged
iamtrask merged 6 commits into from
Jul 30, 2019
Merged

Closes #2412, remove simplification and detailing for plans #2413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d27410e
Closes #2412, remove simplification and detailing for plans that alre…
cereallarceny Jul 30, 2019
97ec6ac
Merge branch 'dev' into issue-2412
iamtrask Jul 30, 2019
af0f74d
Reverting example
cereallarceny Jul 30, 2019
8b8e78e
Merge branch 'dev' of https://github.com/openmined/pysyft into issue-…
cereallarceny Jul 30, 2019
e3dbd12
Merge branch 'issue-2412' of https://github.com/openmined/pysyft into…
cereallarceny Jul 30, 2019
e728e6d
Black
cereallarceny Jul 30, 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
2 changes: 1 addition & 1 deletion examples/tutorials/Part 8 - Introduction to Plans.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,4 +819,4 @@
},
"nbformat": 4,
"nbformat_minor": 2
}
}
5 changes: 2 additions & 3 deletions syft/federated/plan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,9 +624,8 @@ def simplify(plan: "Plan") -> tuple:
tuple: a tuple holding the unique attributes of the Plan object

"""
readable_plan = sy.serde._simplify(plan.readable_plan)
return (
readable_plan,
plan.readable_plan, # We're not simplifying because readable_plan is already simplified
sy.serde._simplify(plan.id),
sy.serde._simplify(plan.arg_ids),
sy.serde._simplify(plan.result_ids),
Expand Down Expand Up @@ -656,7 +655,7 @@ def detail(worker: AbstractWorker, plan_tuple: tuple) -> "Plan":
id=id,
arg_ids=arg_ids,
result_ids=result_ids,
readable_plan=sy.serde._detail(worker, readable_plan),
readable_plan=readable_plan, # We're not detailing, see simplify() for details
is_built=is_built,
)

Expand Down