Skip to content

Commit

Permalink
applied formatting (cisco-open#341)
Browse files Browse the repository at this point in the history
  • Loading branch information
@lkurija1 @myungjin
lkurija1 authored and myungjin committed Mar 3, 2023
1 parent 6570ea8 commit 9cee14c
Show file tree
Hide file tree
Showing 19 changed files with 363 additions and 237 deletions.
32 changes: 20 additions & 12 deletions lib/python/flame/examples/adult/aggregator/config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,15 @@
"trainer",
"aggregator"
],
"funcTags": {
"aggregator": ["distribute", "aggregate"],
"trainer": ["fetch", "upload"]
"funcTags": {
"aggregator": [
"distribute",
"aggregate"
],
"trainer": [
"fetch",
"upload"
]
}
}
],
Expand All @@ -33,20 +39,22 @@
"rounds": 5
},
"baseModel": {
"name": "",
"version": 1
"name": "",
"version": 1
},
"job" : {
"id": "622a358619ab59012eabeefb",
"name": "adult"
"job": {
"id": "622a358619ab59012eabeefb",
"name": "adult"
},
"registry": {
"sort": "mlflow",
"uri": "http://flame-mlflow:5000"
"sort": "mlflow",
"uri": "http://flame-mlflow:5000"
},
"selector": {
"sort": "random",
"kwargs": {"k": 1}
"sort": "random",
"kwargs": {
"k": 1
}
},
"maxRunTime": 300,
"realm": "",
Expand Down
32 changes: 20 additions & 12 deletions lib/python/flame/examples/adult/trainer/config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,15 @@
"trainer",
"aggregator"
],
"funcTags": {
"aggregator": ["distribute", "aggregate"],
"trainer": ["fetch", "upload"]
"funcTags": {
"aggregator": [
"distribute",
"aggregate"
],
"trainer": [
"fetch",
"upload"
]
}
}
],
Expand All @@ -37,20 +43,22 @@
"rounds": 5
},
"baseModel": {
"name": "",
"version": 1
"name": "",
"version": 1
},
"job" : {
"id": "622a358619ab59012eabeefb",
"name": "adult"
"job": {
"id": "622a358619ab59012eabeefb",
"name": "adult"
},
"registry": {
"sort": "mlflow",
"uri": "http://flame-mlflow:5000"
"sort": "mlflow",
"uri": "http://flame-mlflow:5000"
},
"selector": {
"sort": "random",
"kwargs": {"k": 1}
"sort": "random",
"kwargs": {
"k": 1
}
},
"maxRunTime": 300,
"realm": "default/us/west",
Expand Down
20 changes: 11 additions & 9 deletions lib/python/flame/examples/dist_mnist/trainer/config1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@
"trainer",
"trainer"
],
"funcTags": {
"trainer": ["ring_allreduce"]
"funcTags": {
"trainer": [
"ring_allreduce"
]
}
}
],
Expand All @@ -41,20 +43,20 @@
"rounds": 10
},
"baseModel": {
"name": "",
"version": 1
"name": "",
"version": 1
},
"job" : {
"id": "622a358619ab59012eabeefb",
"name": "dist_mnist"
"job": {
"id": "622a358619ab59012eabeefb",
"name": "dist_mnist"
},
"registry": {
"sort": "dummy",
"uri": ""
},
"selector": {
"sort": "default",
"kwargs": {}
"sort": "default",
"kwargs": {}
},
"optimizer": {
"sort": "fedavg",
Expand Down
20 changes: 11 additions & 9 deletions lib/python/flame/examples/dist_mnist/trainer/config2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@
"trainer",
"trainer"
],
"funcTags": {
"trainer": ["ring_allreduce"]
"funcTags": {
"trainer": [
"ring_allreduce"
]
}
}
],
Expand All @@ -40,20 +42,20 @@
"rounds": 10
},
"baseModel": {
"name": "",
"version": 1
"name": "",
"version": 1
},
"job" : {
"id": "622a358619ab59012eabeefb",
"name": "dist_mnist"
"job": {
"id": "622a358619ab59012eabeefb",
"name": "dist_mnist"
},
"registry": {
"sort": "dummy",
"uri": ""
},
"selector": {
"sort": "default",
"kwargs": {}
"sort": "default",
"kwargs": {}
},
"optimizer": {
"sort": "fedavg",
Expand Down
20 changes: 11 additions & 9 deletions lib/python/flame/examples/dist_mnist/trainer/config3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@
"trainer",
"trainer"
],
"funcTags": {
"trainer": ["ring_allreduce"]
"funcTags": {
"trainer": [
"ring_allreduce"
]
}
}
],
Expand All @@ -40,20 +42,20 @@
"rounds": 10
},
"baseModel": {
"name": "",
"version": 1
"name": "",
"version": 1
},
"job" : {
"id": "622a358619ab59012eabeefb",
"name": "dist_mnist"
"job": {
"id": "622a358619ab59012eabeefb",
"name": "dist_mnist"
},
"registry": {
"sort": "dummy",
"uri": ""
},
"selector": {
"sort": "default",
"kwargs": {}
"sort": "default",
"kwargs": {}
},
"optimizer": {
"sort": "fedavg",
Expand Down
42 changes: 27 additions & 15 deletions lib/python/flame/examples/hier_mnist/middle_aggregator/config_uk.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,28 +25,40 @@
"top-aggregator",
"middle-aggregator"
],
"funcTags": {
"top-aggregator": ["distribute", "aggregate"],
"middle-aggregator": ["fetch", "upload"]
"funcTags": {
"top-aggregator": [
"distribute",
"aggregate"
],
"middle-aggregator": [
"fetch",
"upload"
]
}
},
{
{
"description": "Model update is sent from mid aggregator to trainer and vice-versa",
"groupBy": {
"type": "tag",
"value": [
"default/us/west/org1",
"default/uk/london/org2"
]
"default/us/west/org1",
"default/uk/london/org2"
]
},
"name": "param-channel",
"pair": [
"middle-aggregator",
"trainer"
],
"funcTags": {
"middle-aggregator": ["distribute", "aggregate"],
"trainer": ["fetch", "upload"]
"funcTags": {
"middle-aggregator": [
"distribute",
"aggregate"
],
"trainer": [
"fetch",
"upload"
]
}
}
],
Expand All @@ -60,12 +72,12 @@
"rounds": 5
},
"baseModel": {
"name": "",
"version": 1
"name": "",
"version": 1
},
"job" : {
"id": "622a358619ab59012eabeefb",
"name": "mnist"
"job": {
"id": "622a358619ab59012eabeefb",
"name": "mnist"
},
"registry": {
"sort": "dummy",
Expand Down
42 changes: 27 additions & 15 deletions lib/python/flame/examples/hier_mnist/middle_aggregator/config_us.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,28 +25,40 @@
"top-aggregator",
"middle-aggregator"
],
"funcTags": {
"top-aggregator": ["distribute", "aggregate"],
"middle-aggregator": ["fetch", "upload"]
"funcTags": {
"top-aggregator": [
"distribute",
"aggregate"
],
"middle-aggregator": [
"fetch",
"upload"
]
}
},
{
{
"description": "Model update is sent from mid aggregator to trainer and vice-versa",
"groupBy": {
"type": "tag",
"value": [
"default/us/west/org1",
"default/uk/london/org2"
]
"default/us/west/org1",
"default/uk/london/org2"
]
},
"name": "param-channel",
"pair": [
"middle-aggregator",
"trainer"
],
"funcTags": {
"middle-aggregator": ["distribute", "aggregate"],
"trainer": ["fetch", "upload"]
"funcTags": {
"middle-aggregator": [
"distribute",
"aggregate"
],
"trainer": [
"fetch",
"upload"
]
}
}
],
Expand All @@ -60,12 +72,12 @@
"rounds": 5
},
"baseModel": {
"name": "",
"version": 1
"name": "",
"version": 1
},
"job" : {
"id": "622a358619ab59012eabeefb",
"name": "mnist"
"job": {
"id": "622a358619ab59012eabeefb",
"name": "mnist"
},
"registry": {
"sort": "dummy",
Expand Down
Loading

0 comments on commit 9cee14c

Please sign in to comment.