Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
otbtf
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Lozac'h Loic
otbtf
Commits
db9711e4
Commit
db9711e4
authored
Sep 20, 2018
by
remi cresson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
FIX: validation step not performed if not user parameters are set
parent
d9f71201
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
21 deletions
+21
-21
app/otbTensorflowModelTrain.cxx
app/otbTensorflowModelTrain.cxx
+21
-21
No files found.
app/otbTensorflowModelTrain.cxx
View file @
db9711e4
...
...
@@ -468,32 +468,32 @@ public:
AddProcess
(
m_TrainModelFilter
,
"Training epoch #"
+
std
::
to_string
(
epoch
));
m_TrainModelFilter
->
Update
();
if
(
do_validation
)
// Validate the model
if
(
epoch
%
GetParameterInt
(
"validation.step"
)
==
0
)
{
// Validate the model
if
(
epoch
%
GetParameterInt
(
"validation.step"
)
==
0
)
{
// 1. Evaluate the metrics against the learning data
// 1. Evaluate the metrics against the learning data
for
(
unsigned
int
i
=
0
;
i
<
m_InputSourcesForEvaluationAgainstLearningData
.
size
()
;
i
++
)
{
m_ValidateModelFilter
->
SetInput
(
i
,
m_InputSourcesForEvaluationAgainstLearningData
[
i
]);
}
m_ValidateModelFilter
->
SetInputReferences
(
m_InputTargetsForEvaluationAgainstLearningData
);
for
(
unsigned
int
i
=
0
;
i
<
m_InputSourcesForEvaluationAgainstLearningData
.
size
()
;
i
++
)
{
m_ValidateModelFilter
->
SetInput
(
i
,
m_InputSourcesForEvaluationAgainstLearningData
[
i
]);
}
m_ValidateModelFilter
->
SetInputReferences
(
m_InputTargetsForEvaluationAgainstLearningData
);
// As we use the learning data here, it's rational to use the same option as streaming during training
m_ValidateModelFilter
->
SetUseStreaming
(
GetParameterInt
(
"training.usestreaming"
));
// As we use the learning data here, it's rational to use the same option as streaming during training
m_ValidateModelFilter
->
SetUseStreaming
(
GetParameterInt
(
"training.usestreaming"
));
// Update
AddProcess
(
m_ValidateModelFilter
,
"Evaluate model (Learning data)"
);
m_ValidateModelFilter
->
Update
();
// Update
AddProcess
(
m_ValidateModelFilter
,
"Evaluate model (Learning data)"
);
m_ValidateModelFilter
->
Update
();
for
(
unsigned
int
i
=
0
;
i
<
m_TargetTensorsNames
.
size
()
;
i
++
)
{
otbAppLogINFO
(
"Metrics for target
\"
"
<<
m_TargetTensorsNames
[
i
]
<<
"
\"
:"
);
PrintClassificationMetrics
(
m_ValidateModelFilter
->
GetConfusionMatrix
(
i
),
m_ValidateModelFilter
->
GetMapOfClasses
(
i
));
}
for
(
unsigned
int
i
=
0
;
i
<
m_TargetTensorsNames
.
size
()
;
i
++
)
{
otbAppLogINFO
(
"Metrics for target
\"
"
<<
m_TargetTensorsNames
[
i
]
<<
"
\"
:"
);
PrintClassificationMetrics
(
m_ValidateModelFilter
->
GetConfusionMatrix
(
i
),
m_ValidateModelFilter
->
GetMapOfClasses
(
i
));
}
if
(
do_validation
)
{
// 2. Evaluate the metrics against the validation data
// Here we just change the input sources and references
...
...
@@ -514,7 +514,7 @@ public:
PrintClassificationMetrics
(
m_ValidateModelFilter
->
GetConfusionMatrix
(
i
),
m_ValidateModelFilter
->
GetMapOfClasses
(
i
));
}
}
// Step is OK to perform validation
}
}
// Do the validation against the validation data
}
// Next epoch
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment