Skip to content

Autograd activations #6

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

Open
twhughes wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Autograd activations #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8e584e4
passes some tests but the shapes are strange on complex gamma
twhughes Dec 20, 2018
bdf4fb1
passes all tests
twhughes Dec 20, 2018
e142782
added autograd to setup.py requirements
twhughes Dec 20, 2018
d9cd6db
Merge branch 'master' into autograd-activations
ianwilliamson Jan 6, 2019
9155b5d
All nonlinearities must inherit from ComplexNonlinearity
ianwilliamson Jan 6, 2019
e5b8243
Removed ComplexNonlinearity
ianwilliamson Jan 6, 2019
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
4 changes: 2 additions & 2 deletions neuroptica/layers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np

from neuroptica.components.component_layers import MZILayer, OpticalMesh, PhaseShifterLayer
from neuroptica.nonlinearities import ComplexNonlinearity
from neuroptica.nonlinearities import Nonlinearity
from neuroptica.settings import NP_COMPLEX


Expand Down Expand Up @@ -63,7 +63,7 @@ class Activation(NetworkLayer):
X is output, input for next linear layer)
'''

def __init__(self, nonlinearity: ComplexNonlinearity):
def __init__(self, nonlinearity: Nonlinearity):
super().__init__(nonlinearity.N, nonlinearity.N)
self.nonlinearity = nonlinearity

Expand Down
Loading