From 034ae8fea4160bc2e14cd87aa832d4a7f7fd14c3 Mon Sep 17 00:00:00 2001 From: npapernot Date: Mon, 29 Jul 2019 21:29:03 +0000 Subject: [PATCH] conflicts in models test --- privacy/bolton/models_test.py | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/privacy/bolton/models_test.py b/privacy/bolton/models_test.py index 3e3f2db..4f1b3ab 100644 --- a/privacy/bolton/models_test.py +++ b/privacy/bolton/models_test.py @@ -206,13 +206,8 @@ class InitTests(keras_parameterized.TestCase): Args: n_outputs: number of output neurons loss: instantiated TestLoss instance -<<<<<<< HEAD - optimizer: instanced TestOptimizer instance - """ -======= optimizer: instantiated TestOptimizer instance - """ ->>>>>>> 71c4a11eb9ad66a78fb13428987366887ea20beb + """ # test compilaton of invalid tf.optimizer and non instantiated loss. with self.cached_session(): with self.assertRaises((ValueError, AttributeError)): @@ -517,17 +512,6 @@ class FitTests(keras_parameterized.TestCase): num_classes, err_msg): """Tests the BOltonModel calculate_class_weights method. -<<<<<<< HEAD - - This test passes invalid params which should raise the expected errors. - - Args: - class_weights: the class_weights to use - class_counts: count of number of samples for each class - num_classes: number of outputs neurons - err_msg: - """ -======= This test passes invalid params which should raise the expected errors. @@ -536,8 +520,7 @@ class FitTests(keras_parameterized.TestCase): class_counts: count of number of samples for each class. num_classes: number of outputs neurons. err_msg: The expected error message. - """ ->>>>>>> 71c4a11eb9ad66a78fb13428987366887ea20beb + """ clf = models.BoltonModel(1, 1) with self.assertRaisesRegexp(ValueError, err_msg): # pylint: disable=deprecated-method clf.calculate_class_weights(class_weights,