Skip to content

Commit

Permalink
merge dev
Browse files Browse the repository at this point in the history
  • Loading branch information
PeterChung241 committed Feb 8, 2022
1 parent 81b4ea2 commit 8d8b1a9
Show file tree
Hide file tree
Showing 39 changed files with 690 additions and 243 deletions.
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ docker
packages/syft/src/target
packages/grid/apps/domain/src/nodedatabase.db
packages/grid/apps/network/src/nodedatabase.db
packages/grid/apps/worker/src/nodedatabase.db
packages/grid/apps/worker/src/nodedatabase.db
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ helm-charts/**/*.lock
.helm/**

# docker cache
.docker-cache/
.docker-cache/
2 changes: 1 addition & 1 deletion notebooks/course3/L5_End_Assessment.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ Active Learning/Multiple Choice:

- True or False: each dataset on a node has a unique ID.

- True or False: data scientists who do NOT own the domain have access to each dataset's metadata (unique ID, asset listing, etc.).
- True or False: data scientists who do NOT own the domain have access to each dataset's metadata (unique ID, asset listing, etc.).
2 changes: 1 addition & 1 deletion notebooks/trade_demo/wip/Trask Testing 2.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -1190,4 +1190,4 @@
},
"nbformat": 4,
"nbformat_minor": 4
}
}
2 changes: 1 addition & 1 deletion packages/grid/docker-compose.tls.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ services:
# Enable the access log, with HTTP requests
- "--accesslog"
# Enable the Traefik log, for configurations and errors
- "--log"
- "--log"
2 changes: 1 addition & 1 deletion packages/syft/docs/_static/custom.css
Original file line number Diff line number Diff line change
Expand Up @@ -725,4 +725,4 @@
/* div.related {*/
/* display: none;*/
/* }*/
/*}*/
/*}*/
2 changes: 1 addition & 1 deletion packages/syft/proto/core/auth/signed_message.proto
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ message SignedMessage {
}

message VerifyKey { bytes verify_key = 1; }
message VerifyAll { google.protobuf.Empty all = 1; }
message VerifyAll { google.protobuf.Empty all = 1; }
2 changes: 1 addition & 1 deletion packages/syft/proto/core/io/address.proto
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ message Address {

bool has_vm = 9;
syft.core.io.SpecificLocation vm = 10;
}
}
2 changes: 1 addition & 1 deletion packages/syft/proto/core/io/location.proto
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ import "proto/core/common/common_object.proto";
message SpecificLocation {
syft.core.common.UID id = 1;
string name = 2;
}
}
2 changes: 1 addition & 1 deletion packages/syft/proto/core/io/route.proto
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ message SoloRoute {
syft.core.io.VirtualClientConnection virtual_connection = 3;
syft.grid.connections.GridHTTPConnection grid_connection = 4;
}
}
}
2 changes: 1 addition & 1 deletion packages/syft/proto/core/node/common/action/action.proto
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ message Action {
syft.core.node.common.action.SaveObjectAction save_object_action = 10;
syft.core.node.common.action.ActionSequence action_sequence = 11;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ import "proto/core/io/address.proto";
message ActionSequence {
repeated syft.core.node.common.action.SaveObjectAction obj = 1;
syft.core.io.Address address = 2;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ message BeaverAction {
syft.core.tensor.ShareTensor delta = 3;
syft.core.common.UID delta_id = 4;
syft.core.io.Address address = 5;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ message GetEnumAttributeAction {
syft.core.io.Address address = 3;
syft.core.common.UID msg_id = 4;
int32 value_index = 5;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ message GetObjectResponseMessage {
syft.core.common.UID msg_id = 1;
syft.core.store.StorableObject obj = 2;
syft.core.io.Address address = 3;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ message GetOrSetPropertyAction {
syft.core.common.UID msg_id = 8;
int32 action = 9;
bool map_to_dyn = 10;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ message GetSetStaticAttributeAction {
syft.core.io.Address address = 4;
syft.core.common.UID msg_id = 5;
int32 action = 6;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ message RunFunctionOrConstructorAction {
syft.core.io.Address address = 5;
syft.core.common.UID msg_id = 6;
bool is_static = 7;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ import "proto/core/io/address.proto";
message SaveObjectAction {
syft.core.store.StorableObject obj = 1;
syft.core.io.Address address = 2;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ message GetReprReplyMessage {
syft.core.common.UID msg_id = 1;
syft.core.io.Address address = 2;
string repr = 3;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ message HeritageUpdateMessage {
syft.core.common.UID msg_id = 1;
syft.core.io.Address address = 2;
syft.core.io.Address new_ancestry_address = 3;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ import "proto/core/io/address.proto";
message ReprMessage {
syft.core.common.UID msg_id = 1;
syft.core.io.Address address = 2;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ message ResolvePointerTypeAnswerMessage {
string type_path = 1;
syft.core.io.Address address = 2;
syft.core.common.UID msg_id = 3;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ message SimpleReplyMessage {
syft.core.common.UID msg_id = 1;
syft.core.io.Address address = 2;
bytes payload = 3;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ message GetRemainingBudgetReplyMessage {
double budget = 1;
syft.core.common.UID msg_id = 2;
syft.core.io.Address address = 3;
}
}
2 changes: 1 addition & 1 deletion packages/syft/proto/core/pointer/pointer.proto
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ message Pointer {
string object_type = 7;
string attribute_name = 8;
optional bytes public_shape = 9;
}
}
2 changes: 1 addition & 1 deletion packages/syft/proto/core/store/store_object.proto
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ message DictContainer {

message SqlContainer {}

message GridContainer {}
message GridContainer {}
2 changes: 1 addition & 1 deletion packages/syft/proto/lib/numpy/array.proto
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ message NumpyProto {
}

string dtype = 3;
}
}
2 changes: 1 addition & 1 deletion packages/syft/proto/lib/numpy/tensor.proto
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ message TensorProto {
repeated double double_data = 7;
// For int64
repeated int64 int64_data = 8;
}
}
2 changes: 1 addition & 1 deletion packages/syft/proto/lib/python/bool.proto
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ import "proto/core/common/common_object.proto";
message Bool {
bool data = 1;
syft.core.common.UID id = 2;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ message OrderedDict {
repeated bytes keys = 1;
repeated bytes values = 2;
syft.core.common.UID id = 3;
}
}
2 changes: 1 addition & 1 deletion packages/syft/proto/lib/python/complex.proto
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ message Complex {
double real = 1;
double imag = 2;
syft.core.common.UID id = 3;
}
}
2 changes: 1 addition & 1 deletion packages/syft/proto/lib/python/list.proto
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ message List {
repeated bytes data = 1;
syft.core.common.UID id = 2;
bool temporary_box = 3;
}
}
2 changes: 1 addition & 1 deletion packages/syft/proto/lib/python/none.proto
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ import "proto/core/common/common_object.proto";
message SyNone {
syft.core.common.UID id = 1;
bool temporary_box = 2;
}
}
2 changes: 1 addition & 1 deletion packages/syft/proto/lib/python/string.proto
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ message String {
string data = 1;
syft.core.common.UID id = 2;
bool temporary_box = 3;
}
}
2 changes: 1 addition & 1 deletion packages/syft/proto/lib/python/tuple.proto
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ import "proto/core/common/common_object.proto";
message Tuple {
repeated bytes data = 1;
syft.core.common.UID id = 2;
}
}
2 changes: 1 addition & 1 deletion packages/syft/proto/lib/torch/device.proto
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ package syft.lib.torch;
message Device {
string type = 1;
int32 index = 2;
}
}
2 changes: 1 addition & 1 deletion packages/syft/proto/lib/torch/module.proto
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ message Module {
syft.lib.python.collections.OrderedDict state_dict = 8;
syft.lib.python.collections.OrderedDict parameters = 9;
optional syft.lib.python.collections.OrderedDict _uid2attr = 11;
}
}
Loading

0 comments on commit 8d8b1a9

Please sign in to comment.