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.

Sign up for GitHub

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

Jump to bottom

Fix pooling when the operator is None and the input is 1d #343

Merged
merged 3 commits into from
Jun 17, 2024
Merged

Fix pooling when the operator is None and the input is 1d #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d27904
fixes pooling when the operator is None, the input is 1d
Jun 12, 2024
8329127
Spelling fix
Jun 12, 2024
cf62088
simplification of the condition for 1d pooling
Jun 14, 2024
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
2 changes: 1 addition & 1 deletion izer/assets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ class MakefileMapping(MutableMapping):
'SRCS +=', etc. is done "on the fly" through this mapping object.

The key:value rules are as follows:
* The key is lowercase, and any '.' is replaced is '_'. (revelant for JSON parsing)
* The key is lowercase, and any '.' is replaced is '_'. (relevant for JSON parsing)

* The value is a tuple with 2 items:
* index 0: The template string
Expand Down
6 changes: 4 additions & 2 deletions izer/izer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,8 @@ def main():
f'{pixelcount}) does not match the '
f'sum of all pixels ({pixels}) in the layer\'s `in_sequences`.')
input_dim[ll] = conf_input_dim[ll]
if operator[ll] != op.CONV1D:

if operator[ll] != op.CONV1D and (operator[ll] != op.NONE or input_dim[ll][1] != 1):
if pool_stride[ll][0] != pool_stride[ll][1]:
eprint(f'{layer_pfx(ll)}{op.string(operator[ll])} does not support '
f'non-square pooling stride (currently set to '
Expand All @@ -512,6 +513,7 @@ def main():
(input_dim[ll][1] + pool_stride[ll][1] - pool[ll][1]
- pool_dilation[ll][1] + 1) // pool_stride[ll][1]]
else:
pool[ll][1] = 1
pooled_size = [(input_dim[ll][0] + pool_stride[ll][0] - pool[ll][0]
- pool_dilation[ll][0] + 1) // pool_stride[ll][0],
1]
Expand All @@ -521,7 +523,7 @@ def main():
eprint(f'{layer_pfx(ll)}Pooling or zero-padding results in a zero data '
f'dimension (input {input_dim[ll]}, result {pooled_dim[ll]}).')

if operator[ll] != op.CONV1D:
if operator[ll] != op.CONV1D and (operator[ll] != op.NONE or input_dim[ll][1] != 1):
if stride[ll][0] != stride[ll][1]:
eprint(f'{layer_pfx(ll)}{op.string(operator[ll])} does not support '
f'non-square stride (currently set to {stride[ll][0]}x{stride[ll][1]}).')
Expand Down