Merge branch 'main' into FLEX-aniadir-licencia-apache2

FLEXible-FL · Mar 7, 2024 · 1fe22e9 · 1fe22e9
2 parents 85e516b + 787b9e1
commit 1fe22e9
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 1 deletion.
diff --git a/flex/actors/actors.py b/flex/actors/actors.py
@@ -15,7 +15,6 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 from collections import OrderedDict
->>>>>>> 603436d (replace UserDict with OrderedDict)
 from typing import Hashable
 
 from flex.actors import FlexRole, FlexRoleManager

diff --git a/flex/pool/primitives_pt.py b/flex/pool/primitives_pt.py
@@ -14,6 +14,7 @@
     You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
+
 """File that contains the primitive functions to build an easy training loop of the federated learning model.
 
 In this file we specify some functions for each framework, i.e., TensorFlow (tf), PyTorch (pt), among others, but

diff --git a/flex/pool/primitives_tf.py b/flex/pool/primitives_tf.py
@@ -14,6 +14,7 @@
     You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
+
 """File that contains the primitive functions to build an easy training loop of the federated learning model.
 
 In this file we specify some functions for each framework, i.e., TensorFlow (tf), PyTorch (pt), among others, but