remove 1 out of 3 of the unit tests for convolutional query

dethnass · Jul 31, 2020 · 26ae86c · 26ae86c
1 parent 045f3d3
commit 26ae86c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/libra/query/feedforward_nn.py b/libra/query/feedforward_nn.py
@@ -649,27 +649,23 @@ def convolutional(instruction=None,
         model.add(MaxPooling2D(pool_size=(2, 2), strides=(2, 2)))
 
         model.add(Conv2D(256, (3, 3), activation='relu', padding='SAME'))
-        model.add(Conv2D(256, (3, 3), activation='relu', padding='SAME'))
-
-
         model.add(Conv2D(256, (3, 3), activation='relu', padding='SAME'))
         model.add(Conv2D(256, (3, 3), activation='relu', padding='SAME'))
         model.add(MaxPooling2D(pool_size=(2, 2), strides=(2, 2)))
 
         model.add(Conv2D(512, (3, 3), activation='relu', padding='SAME'))
         model.add(Conv2D(512, (3, 3), activation='relu', padding='SAME'))
         model.add(Conv2D(512, (3, 3), activation='relu', padding='SAME'))
-        model.add(Conv2D(512, (3, 3), activation='relu', padding='SAME'))
         model.add(MaxPooling2D(pool_size=(2, 2), strides=(2, 2)))
 
         model.add(Conv2D(512, (3, 3), activation='relu', padding='SAME'))
         model.add(Conv2D(512, (3, 3), activation='relu', padding='SAME'))
         model.add(Conv2D(512, (3, 3), activation='relu', padding='SAME'))
-        model.add(Conv2D(512, (3, 3), activation='relu', padding='SAME'))
         model.add(MaxPooling2D(pool_size=(2, 2), strides=(2, 2)))
 
         model.add(Flatten())
-        model.add(Dense(256, activation='relu'))
+        model.add(Dense(4096, activation='relu'))
+        model.add(Dense(4096, activation='relu'))
         model.add(Dense(num_classes, activation=output_layer_activation))
 
     model.compile(

diff --git a/tests/tests.py b/tests/tests.py
@@ -26,7 +26,7 @@ class TestQueries(unittest.TestCase):
     Tests some queries in queries.py
     """
 
-    '''
+
     # Tests whether regression_ann_query works without errors, and creates a key in models dictionary
     @ordered
     def test_regression_ann(self):
@@ -75,7 +75,7 @@ def test_convolutional_query_pretrained(self):
         client_image.convolutional_query(
             "predict character",
             pretrained={
-                'arch': 'vggnet16',
+                'arch': 'vggnet19',
                 'weights': 'imagenet'
                 },
             epochs=2)