Skip to content

Commit 557e402

Browse files
JulioJerezJulioJerez
committed
more refactoring (wip)
1 parent d89641e commit 557e402

15 files changed

+31
-32
lines changed

‎newton-4.00/sdk/dBrain/ndBrainAgentDiscretePolicyGradient_Trainer.cpp

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -469,20 +469,21 @@ ndBrainAgentDiscretePolicyGradient_TrainerMaster::ndBrainAgentDiscretePolicyGrad
469469

470470
ndBrainAgentDiscretePolicyGradient_TrainerMaster::~ndBrainAgentDiscretePolicyGradient_TrainerMaster()
471471
{
472-
for (ndInt32 i = 0; i < m_policyTrainers.GetCount(); ++i)
473-
{
474-
delete m_policyTrainers[i];
475-
delete m_policyAuxiliaryTrainers[i];
476-
}
477-
delete m_policyOptimizer;
478-
479-
for (ndInt32 i = 0; i < m_criticTrainers.GetCount(); ++i)
480-
{
481-
delete m_criticTrainers[i];
482-
}
483-
484-
delete m_criticOptimizer;
485-
delete[] m_randomGenerator;
472+
ndAssert(0);
473+
//for (ndInt32 i = 0; i < m_policyTrainers.GetCount(); ++i)
474+
//{
475+
// delete m_policyTrainers[i];
476+
// delete m_policyAuxiliaryTrainers[i];
477+
//}
478+
//delete m_policyOptimizer;
479+
//
480+
//for (ndInt32 i = 0; i < m_criticTrainers.GetCount(); ++i)
481+
//{
482+
// delete m_criticTrainers[i];
483+
//}
484+
//
485+
//delete m_criticOptimizer;
486+
//delete[] m_randomGenerator;
486487
}
487488

488489
//void ndBrainAgentDiscretePolicyGradient_TrainerMaster::Normalize(ndBrain& actor)

‎newton-4.00/sdk/dBrain/ndBrainLayer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ void ndBrainLayer::FeedForward(const ndBrainLayerFeedFowardCpuCommand* const, nd
7171
ndAssert(0);
7272
}
7373

74-
void ndBrainLayer::BackPropagated(const ndBrainLayerBackPropagateCpuCommand* const, ndInt32) const
74+
void ndBrainLayer::BackPropagate(const ndBrainLayerBackPropagateCpuCommand* const, ndInt32) const
7575
{
7676
ndAssert(0);
7777
}

‎newton-4.00/sdk/dBrain/ndBrainLayer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class ndBrainLayer : public ndClassAlloc
8787

8888
virtual void Execute(ndInt32 miniBatchIndex)
8989
{
90-
m_layer->BackPropagated(this, miniBatchIndex);
90+
m_layer->BackPropagate(this, miniBatchIndex);
9191
}
9292

9393
const ndBrainLayer* m_layer;
@@ -166,7 +166,7 @@ class ndBrainLayer : public ndClassAlloc
166166
virtual ndBrainLayerFeedFowardCpuCommand* GetLayerCpuFeedForwardCommand() const;
167167
virtual ndBrainLayerBackPropagateCpuCommand* GetLayerCpuBackPropagateCommand() const;
168168
virtual void FeedForward(const ndBrainLayerFeedFowardCpuCommand* const info, ndInt32 miniBatchIndex) const;
169-
virtual void BackPropagated(const ndBrainLayerBackPropagateCpuCommand* const info, ndInt32 miniBatchIndex) const;
169+
virtual void BackPropagate(const ndBrainLayerBackPropagateCpuCommand* const info, ndInt32 miniBatchIndex) const;
170170

171171
virtual bool HasGpuSupport() const;
172172
virtual ndLayerUniformDataGpu GetLayerUniformDataGpu(const ndBrainGpuContext* const context) const;

‎newton-4.00/sdk/dBrain/ndBrainLayerActivationCategoricalSoftmax.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ void ndBrainLayerActivationCategoricalSoftmax::InputDerivative(const ndBrainVect
8080
inputDerivative.FlushToZero();
8181
}
8282

83-
void ndBrainLayerActivationCategoricalSoftmax::BackPropagated(const ndBrainLayerBackPropagateCpuCommand* const info, ndInt32 miniBatchIndex) const
83+
void ndBrainLayerActivationCategoricalSoftmax::BackPropagate(const ndBrainLayerBackPropagateCpuCommand* const info, ndInt32 miniBatchIndex) const
8484
{
8585
ndInt32 inputSize = info->m_inputSize;
8686
ndInt32 outputSize = info->m_outputSize;

‎newton-4.00/sdk/dBrain/ndBrainLayerActivationCategoricalSoftmax.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class ndBrainLayerActivationCategoricalSoftmax : public ndBrainLayerActivationSo
4545
const char* GetLabelId() const;
4646
void InputDerivative(const ndBrainVector& input, const ndBrainVector& output, const ndBrainVector& outputDerivative, ndBrainVector& inputDerivative) const;
4747

48-
virtual void BackPropagated(const ndBrainLayerBackPropagateCpuCommand* const info, ndInt32 miniBatchIndex) const override;
48+
virtual void BackPropagate(const ndBrainLayerBackPropagateCpuCommand* const info, ndInt32 miniBatchIndex) const override;
4949
};
5050

5151
#endif

‎newton-4.00/sdk/dBrain/ndBrainLayerActivationRelu.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ void ndBrainLayerActivationRelu::FeedForward(const ndBrainLayerFeedFowardCpuComm
160160
}
161161
}
162162

163-
void ndBrainLayerActivationRelu::BackPropagated(const ndBrainLayerBackPropagateCpuCommand* const info, ndInt32 miniBatchIndex) const
163+
void ndBrainLayerActivationRelu::BackPropagate(const ndBrainLayerBackPropagateCpuCommand* const info, ndInt32 miniBatchIndex) const
164164
{
165165
ndInt32 inputSize = info->m_inputSize;
166166
ndInt32 outputSize = info->m_outputSize;

‎newton-4.00/sdk/dBrain/ndBrainLayerActivationRelu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class ndBrainLayerActivationRelu : public ndBrainLayerActivation
4242
virtual ndBrainLayerFeedFowardCpuCommand* GetLayerCpuFeedForwardCommand() const override;
4343
virtual ndBrainLayerBackPropagateCpuCommand* GetLayerCpuBackPropagateCommand() const override;
4444
virtual void FeedForward(const ndBrainLayerFeedFowardCpuCommand* const info, ndInt32 miniBatchIndex) const override;
45-
virtual void BackPropagated(const ndBrainLayerBackPropagateCpuCommand* const info, ndInt32 miniBatchIndex) const override;
45+
virtual void BackPropagate(const ndBrainLayerBackPropagateCpuCommand* const info, ndInt32 miniBatchIndex) const override;
4646

4747
virtual bool HasGpuSupport() const override;
4848
virtual ndLayerUniformDataGpu GetLayerUniformDataGpu(const ndBrainGpuContext* const context) const override;

‎newton-4.00/sdk/dBrain/ndBrainLayerActivationSoftmax.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,8 @@ void ndBrainLayerActivationSoftmax::FeedForward(const ndBrainLayerFeedFowardCpuC
178178
output.FlushToZero();
179179
}
180180

181-
//void ndBrainLayerActivationSoftmax::BackPropagated(const ndBrainLayerBackPropagateCpuCommand* const info, ndInt32 miniBatchIndex) const
182-
void ndBrainLayerActivationSoftmax::BackPropagated(const ndBrainLayerBackPropagateCpuCommand* const, ndInt32) const
181+
//void ndBrainLayerActivationSoftmax::BackPropagate(const ndBrainLayerBackPropagateCpuCommand* const info, ndInt32 miniBatchIndex) const
182+
void ndBrainLayerActivationSoftmax::BackPropagate(const ndBrainLayerBackPropagateCpuCommand* const, ndInt32) const
183183
{
184184
ndAssert(0);
185185
}

‎newton-4.00/sdk/dBrain/ndBrainLayerActivationSoftmax.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class ndBrainLayerActivationSoftmax : public ndBrainLayerActivation
4040
virtual ndBrainLayerFeedFowardCpuCommand* GetLayerCpuFeedForwardCommand() const override;
4141
virtual ndBrainLayerBackPropagateCpuCommand* GetLayerCpuBackPropagateCommand() const override;
4242
virtual void FeedForward(const ndBrainLayerFeedFowardCpuCommand* const info, ndInt32 miniBatchIndex) const override;
43-
virtual void BackPropagated(const ndBrainLayerBackPropagateCpuCommand* const info, ndInt32 miniBatchIndex) const override;
43+
virtual void BackPropagate(const ndBrainLayerBackPropagateCpuCommand* const info, ndInt32 miniBatchIndex) const override;
4444

4545
virtual bool HasGpuSupport() const override;
4646
virtual ndLayerUniformDataGpu GetLayerUniformDataGpu(const ndBrainGpuContext* const context) const override;

‎newton-4.00/sdk/dBrain/ndBrainLayerActivationTanh.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ void ndBrainLayerActivationTanh::FeedForward(const ndBrainLayerFeedFowardCpuComm
153153
output.FlushToZero();
154154
}
155155

156-
void ndBrainLayerActivationTanh::BackPropagated(const ndBrainLayerBackPropagateCpuCommand* const info, ndInt32 miniBatchIndex) const
156+
void ndBrainLayerActivationTanh::BackPropagate(const ndBrainLayerBackPropagateCpuCommand* const info, ndInt32 miniBatchIndex) const
157157
{
158158
ndInt32 inputSize = info->m_inputSize;
159159
ndInt32 outputSize = info->m_outputSize;

‎newton-4.00/sdk/dBrain/ndBrainLayerActivationTanh.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class ndBrainLayerActivationTanh : public ndBrainLayerActivation
4444
virtual ndBrainLayerFeedFowardCpuCommand* GetLayerCpuFeedForwardCommand() const override;
4545
virtual ndBrainLayerBackPropagateCpuCommand* GetLayerCpuBackPropagateCommand() const override;
4646
virtual void FeedForward(const ndBrainLayerFeedFowardCpuCommand* const info, ndInt32 miniBatchIndex) const override;
47-
virtual void BackPropagated(const ndBrainLayerBackPropagateCpuCommand* const info, ndInt32 miniBatchIndex) const override;
47+
virtual void BackPropagate(const ndBrainLayerBackPropagateCpuCommand* const info, ndInt32 miniBatchIndex) const override;
4848

4949
virtual bool HasGpuSupport() const override;
5050
virtual ndLayerUniformDataGpu GetLayerUniformDataGpu(const ndBrainGpuContext* const context) const override;

‎newton-4.00/sdk/dBrain/ndBrainLayerLinear.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ void ndBrainLayerLinear::FeedForward(const ndBrainLayerFeedFowardCpuCommand* con
395395
output.Add(bias);
396396
}
397397

398-
void ndBrainLayerLinear::BackPropagated(const ndBrainLayerBackPropagateCpuCommand* const info, ndInt32 miniBatchIndex) const
398+
void ndBrainLayerLinear::BackPropagate(const ndBrainLayerBackPropagateCpuCommand* const info, ndInt32 miniBatchIndex) const
399399
{
400400
ndInt32 inputSize = info->m_inputSize;
401401
ndInt32 outputSize = info->m_outputSize;

‎newton-4.00/sdk/dBrain/ndBrainLayerLinear.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class ndBrainLayerLinear : public ndBrainLayer
7878
virtual ndBrainLayerFeedFowardCpuCommand* GetLayerCpuFeedForwardCommand() const override;
7979
virtual ndBrainLayerBackPropagateCpuCommand* GetLayerCpuBackPropagateCommand() const override;
8080
virtual void FeedForward(const ndBrainLayerFeedFowardCpuCommand* const info, ndInt32 miniBatchIndex) const override;
81-
virtual void BackPropagated(const ndBrainLayerBackPropagateCpuCommand* const info, ndInt32 miniBatchIndex) const override;
81+
virtual void BackPropagate(const ndBrainLayerBackPropagateCpuCommand* const info, ndInt32 miniBatchIndex) const override;
8282

8383
virtual bool HasGpuSupport() const override;
8484
virtual ndLayerUniformDataGpu GetLayerUniformDataGpu(const ndBrainGpuContext* const context) const override;
@@ -87,7 +87,5 @@ class ndBrainLayerLinear : public ndBrainLayer
8787
ndBrainMatrix m_weights;
8888
};
8989

90-
91-
9290
#endif
9391

‎newton-4.00/sdk/dBrain/ndBrainLayerLinearWithDropOut.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ void ndBrainLayerLinearWithDropOut::FeedForward(const ndBrainLayerFeedFowardCpuC
226226
output.Mul(m_dropOut);
227227
}
228228

229-
void ndBrainLayerLinearWithDropOut::BackPropagated(const ndBrainLayerBackPropagateCpuCommand* const info, ndInt32 miniBatchIndex) const
229+
void ndBrainLayerLinearWithDropOut::BackPropagate(const ndBrainLayerBackPropagateCpuCommand* const info, ndInt32 miniBatchIndex) const
230230
{
231231
ndInt32 inputSize = info->m_inputSize;
232232
ndInt32 outputSize = info->m_outputSize;

‎newton-4.00/sdk/dBrain/ndBrainLayerLinearWithDropOut.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class ndBrainLayerLinearWithDropOut : public ndBrainLayerActivation
4747
virtual ndBrainLayerFeedFowardCpuCommand* GetLayerCpuFeedForwardCommand() const override;
4848
virtual ndBrainLayerBackPropagateCpuCommand* GetLayerCpuBackPropagateCommand() const override;
4949
virtual void FeedForward(const ndBrainLayerFeedFowardCpuCommand* const info, ndInt32 miniBatchIndex) const override;
50-
virtual void BackPropagated(const ndBrainLayerBackPropagateCpuCommand* const info, ndInt32 miniBatchIndex) const override;
50+
virtual void BackPropagate(const ndBrainLayerBackPropagateCpuCommand* const info, ndInt32 miniBatchIndex) const override;
5151

5252
virtual bool HasGpuSupport() const override;
5353
virtual ndLayerUniformDataGpu GetLayerUniformDataGpu(const ndBrainGpuContext* const context) const override;

0 commit comments

Comments
 (0)