Skip to content

Commit 4cc041a

Browse files
committed
more covering (wip)
1 parent ac6e2fc commit 4cc041a

File tree

3 files changed

+32
-12
lines changed

3 files changed

+32
-12
lines changed

newton-4.00/sdk/dBrain/ndBrainLayerActivationCategoricalSoftmax.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,4 +98,4 @@ void ndBrainLayerActivationCategoricalSoftmax::BackPropagate(const ndBrainLayerB
9898
inputDerivative.Set(output);
9999
inputDerivative.Sub(outputDerivative);
100100
inputDerivative.FlushToZero();
101-
}
101+
}

newton-4.00/sdk/dBrain/ndBrainLayerActivationSoftmax.cpp

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "gpu/ndBrainGpuContext.h"
2626
#include "ndBrainTrainerCpuInference.h"
2727
#include "ndBrainLayerActivationSoftmax.h"
28+
#include "gpu/ndBrainTrainerGpuInference.h"
2829

2930
ndBrainLayerActivationSoftmax::ndBrainLayerActivationSoftmax(ndInt32 neurons)
3031
:ndBrainLayerActivation(neurons)
@@ -142,16 +143,6 @@ ndBrainLayerBackPropagateCpuCommand* ndBrainLayerActivationSoftmax::GetLayerCpuB
142143
return command;
143144
}
144145

145-
//ndBrainLayer::ndLayerUniformDataGpu ndBrainLayerActivationSoftmax::GetLayerUniformDataGpu(const ndBrainGpuContext* const context) const
146-
//{
147-
// ndLayerUniformDataGpu data;
148-
// data.m_shader = context->m_ndBrainLayerSoftmaxActivation;
149-
// data.m_inputSize = GetInputSize();
150-
// data.m_outputSize = GetOutputSize();
151-
//
152-
// return data;
153-
//}
154-
155146
void ndBrainLayerActivationSoftmax::FeedForward(const ndBrainLayerFeedFowardCpuCommand* const command, ndInt32 miniBatchIndex) const
156147
{
157148
const ndCommandShareInfo* const info = &command->m_info;
@@ -189,4 +180,27 @@ void ndBrainLayerActivationSoftmax::FeedForward(const ndBrainLayerFeedFowardCpuC
189180
void ndBrainLayerActivationSoftmax::BackPropagate(const ndBrainLayerBackPropagateCpuCommand* const, ndInt32) const
190181
{
191182
ndAssert(0);
192-
}
183+
}
184+
185+
//ndBrainLayer::ndLayerUniformDataGpu ndBrainLayerActivationSoftmax::GetLayerUniformDataGpu(const ndBrainGpuContext* const context) const
186+
//{
187+
// ndLayerUniformDataGpu data;
188+
// data.m_shader = context->m_ndBrainLayerSoftmaxActivation;
189+
// data.m_inputSize = GetInputSize();
190+
// data.m_outputSize = GetOutputSize();
191+
//
192+
// return data;
193+
//}
194+
195+
ndBrainTrainerGpuCommand* ndBrainLayerActivationSoftmax::CreateGpuFeedForwardCommand(
196+
ndBrainTrainerGpuInference* const owner,
197+
const ndBrainLayer::ndCommandShareInfo& info,
198+
ndBrainGpuContext* const context, ndInt32 miniBatchSize,
199+
const ndSharedPtr<ndBrainGpuBuffer>& uniformBuffer,
200+
ndBrainGpuBuffer* const buffer1,
201+
ndBrainGpuBuffer* const buffer2) const
202+
{
203+
ndBrainTrainerGpuCommand* const command = new ndBrainTrainerGpuCommand(owner,
204+
info, size_t(this), context, context->m_ndBrainLayerSoftmaxActivation, miniBatchSize, uniformBuffer, buffer1, buffer2);
205+
return command;
206+
}

newton-4.00/sdk/dBrain/ndBrainLayerActivationSoftmax.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@ class ndBrainLayerActivationSoftmax : public ndBrainLayerActivation
4646

4747
virtual bool HasGpuSupport() const override;
4848
//virtual ndLayerUniformDataGpu GetLayerUniformDataGpu(const ndBrainGpuContext* const context) const override;
49+
virtual ndBrainTrainerGpuCommand* CreateGpuFeedForwardCommand(ndBrainTrainerGpuInference* const owner,
50+
const ndBrainLayer::ndCommandShareInfo& info,
51+
ndBrainGpuContext* const context, ndInt32 miniBatchSize,
52+
const ndSharedPtr<ndBrainGpuBuffer>& uniformBuffer,
53+
ndBrainGpuBuffer* const buffer1,
54+
ndBrainGpuBuffer* const buffer2) const override;
4955
};
5056

5157
#endif

0 commit comments

Comments
 (0)