Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make variable filter test insensitive to order. #1132

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions tests/test_variable_filter.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ def test_variable_filter():

# Testing filtering by role
role_filter = VariableFilter(roles=[PARAMETER])
assert parameters == role_filter(cg.variables)
assert set(parameters) == set(role_filter(cg.variables))
role_filter = VariableFilter(roles=[FILTER])
assert [] == role_filter(cg.variables)

# Testing filtering by role using each_role flag
role_filter = VariableFilter(roles=[PARAMETER, BIAS])
assert parameters == role_filter(cg.variables)
assert set(parameters) == set(role_filter(cg.variables))
role_filter = VariableFilter(roles=[PARAMETER, BIAS], each_role=True)
assert not parameters == role_filter(cg.variables)
assert bias == role_filter(cg.variables)
assert not set(parameters) == set(role_filter(cg.variables))
assert set(bias) == set(role_filter(cg.variables))

# Testing filtering by bricks classes
brick_filter = VariableFilter(roles=[BIAS], bricks=[Linear])
Expand All @@ -61,20 +61,24 @@ def test_variable_filter():

# Testing filtering by theano name
theano_name_filter = VariableFilter(theano_name='h2act')
assert [cg.variables[11]] == theano_name_filter(cg.variables)
assert 1 == len(theano_name_filter(cg.variables))
assert theano_name_filter(cg.variables)[0].name == 'h2act'

# Testing filtering by theano name regex
theano_name_filter_regex = VariableFilter(theano_name_regex='h2a.?t')
assert [cg.variables[11]] == theano_name_filter_regex(cg.variables)
assert 1 == len(theano_name_filter_regex(cg.variables))
assert theano_name_filter_regex(cg.variables)[0].name == 'h2act'

# Testing filtering by application
appli_filter = VariableFilter(applications=[brick1.apply])
variables = [cg.variables[1], cg.variables[8]]
assert variables == appli_filter(cg.variables)
names = ['linear1_apply_input_', 'linear1_apply_output']
assert set(names) == set([v.name for v in appli_filter(cg.variables)])

# Testing filtering by application
appli_filter_list = VariableFilter(applications=[brick1.apply])
assert variables == appli_filter_list(cg.variables)
appli_filter_list = VariableFilter(
applications=[brick1.apply, activation.apply])
names.extend(['h2act', 'sigm_apply_input_'])
assert set(names) == set([v.name for v in appli_filter_list(cg.variables)])

input1 = tensor.matrix('input1')
input2 = tensor.matrix('input2')
Expand Down