Skip to content

Skip last 1by1 layer and residual connection #25

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
fps wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Skip last 1by1 layer and residual connection #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 20 additions & 4 deletions NeuralAudio/WaveNet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ namespace NeuralAudio
DenseLayerT<ConditionSize, Channels, false> inputMixin;
DenseLayerT<Channels, Channels, true> oneByOne;
Eigen::Matrix<float, Channels, WAVENET_MAX_NUM_FRAMES> state;
bool isLast;

public:
static constexpr auto ReceptiveFieldSize = (KernelSize - 1) * Dilation;
Expand All @@ -136,11 +137,17 @@ namespace NeuralAudio
//Eigen::Matrix<float, Channels, -1> layerBuffer;
size_t bufferStart;

WaveNetLayerT()
WaveNetLayerT() :
isLast(false)
{
state.setZero();
}

void SetLast()
{
isLast = true;
}

void AllocBuffer(int allocNum)
{
long size = BufferSize;
Expand Down Expand Up @@ -225,9 +232,12 @@ namespace NeuralAudio

const_cast<Eigen::MatrixBase<Derived2>&>(headInput).noalias() += block.topRows(Channels);

oneByOne.Process(block.topRows(Channels), const_cast<Eigen::MatrixBase<Derived3>&>(output).middleCols(outputStart, numFrames));
if (!isLast)
{
oneByOne.Process(block.topRows(Channels), const_cast<Eigen::MatrixBase<Derived3>&>(output).middleCols(outputStart, numFrames));

const_cast<Eigen::MatrixBase<Derived3>&>(output).middleCols(outputStart, numFrames).noalias() += layerBuffer.middleCols(bufferStart, numFrames);
const_cast<Eigen::MatrixBase<Derived3>&>(output).middleCols(outputStart, numFrames).noalias() += layerBuffer.middleCols(bufferStart, numFrames);
}
}
};

Expand Down Expand Up @@ -280,6 +290,11 @@ namespace NeuralAudio
return allocNum;
}

void SetLast()
{
std::get<lastLayer>(layers).SetLast();
}

void SetWeights(std::vector<float>::iterator& weights)
{
rechannel.SetWeights(weights);
Expand Down Expand Up @@ -350,6 +365,7 @@ namespace NeuralAudio
allocNum = std::get<layerIndex>(layerArrays).AllocBuffers(allocNum);
});

std::get<sizeof...(LayerArrays)-1>(layerArrays).SetLast();
}

void SetWeights(std::vector<float> weights)
Expand Down Expand Up @@ -431,4 +447,4 @@ namespace NeuralAudio
Eigen::Matrix<float, headLayerChannels, WAVENET_MAX_NUM_FRAMES> headArray;
float headScale;
};
}
}