Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
wangsen
paddle_dbnet
Commits
9336e344
"git@developer.sourcefind.cn:wangsen/paddle_dbnet.git" did not exist on "5ffe0988660513f2c35eb39e36fe95568ce70334"
Unverified
Commit
9336e344
authored
Jan 07, 2021
by
littletomatodonkey
Committed by
GitHub
Jan 07, 2021
Browse files
fix cpp infer (#1682)
parent
a27bd4d5
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
9 deletions
+8
-9
deploy/cpp_infer/include/ocr_cls.h
deploy/cpp_infer/include/ocr_cls.h
+1
-1
deploy/cpp_infer/include/ocr_det.h
deploy/cpp_infer/include/ocr_det.h
+2
-3
deploy/cpp_infer/src/main.cpp
deploy/cpp_infer/src/main.cpp
+2
-2
deploy/cpp_infer/src/ocr_cls.cpp
deploy/cpp_infer/src/ocr_cls.cpp
+1
-1
deploy/cpp_infer/src/ocr_rec.cpp
deploy/cpp_infer/src/ocr_rec.cpp
+2
-2
No files found.
deploy/cpp_infer/include/ocr_cls.h
View file @
9336e344
...
@@ -40,7 +40,7 @@ public:
...
@@ -40,7 +40,7 @@ public:
const
int
&
gpu_id
,
const
int
&
gpu_mem
,
const
int
&
gpu_id
,
const
int
&
gpu_mem
,
const
int
&
cpu_math_library_num_threads
,
const
int
&
cpu_math_library_num_threads
,
const
bool
&
use_mkldnn
,
const
double
&
cls_thresh
,
const
bool
&
use_mkldnn
,
const
double
&
cls_thresh
,
const
bool
&
use_tensorrt
,
const
&
bool
use_fp16
)
{
const
bool
&
use_tensorrt
,
const
bool
&
use_fp16
)
{
this
->
use_gpu_
=
use_gpu
;
this
->
use_gpu_
=
use_gpu
;
this
->
gpu_id_
=
gpu_id
;
this
->
gpu_id_
=
gpu_id
;
this
->
gpu_mem_
=
gpu_mem
;
this
->
gpu_mem_
=
gpu_mem
;
...
...
deploy/cpp_infer/include/ocr_det.h
View file @
9336e344
...
@@ -44,9 +44,8 @@ public:
...
@@ -44,9 +44,8 @@ public:
const
bool
&
use_mkldnn
,
const
int
&
max_side_len
,
const
bool
&
use_mkldnn
,
const
int
&
max_side_len
,
const
double
&
det_db_thresh
,
const
double
&
det_db_thresh
,
const
double
&
det_db_box_thresh
,
const
double
&
det_db_box_thresh
,
const
double
&
det_db_unclip_ratio
,
const
double
&
det_db_unclip_ratio
,
const
bool
&
visualize
,
const
bool
&
visualize
const
bool
&
use_tensorrt
,
const
bool
&
use_tensorrt
,
const
bool
&
use_fp16
)
{
const
bool
&
use_fp16
)
{
this
->
use_gpu_
=
use_gpu
;
this
->
use_gpu_
=
use_gpu
;
this
->
gpu_id_
=
gpu_id
;
this
->
gpu_id_
=
gpu_id
;
this
->
gpu_mem_
=
gpu_mem
;
this
->
gpu_mem_
=
gpu_mem
;
...
...
deploy/cpp_infer/src/main.cpp
View file @
9336e344
...
@@ -77,11 +77,11 @@ int main(int argc, char **argv) {
...
@@ -77,11 +77,11 @@ int main(int argc, char **argv) {
auto
end
=
std
::
chrono
::
system_clock
::
now
();
auto
end
=
std
::
chrono
::
system_clock
::
now
();
auto
duration
=
auto
duration
=
std
::
chrono
::
duration_cast
<
std
::
chrono
::
microseconds
>
(
end
-
start
);
std
::
chrono
::
duration_cast
<
std
::
chrono
::
microseconds
>
(
end
-
start
);
std
::
cout
<<
"
花费了
"
std
::
cout
<<
"
Cost
"
<<
double
(
duration
.
count
())
*
<<
double
(
duration
.
count
())
*
std
::
chrono
::
microseconds
::
period
::
num
/
std
::
chrono
::
microseconds
::
period
::
num
/
std
::
chrono
::
microseconds
::
period
::
den
std
::
chrono
::
microseconds
::
period
::
den
<<
"
秒
"
<<
std
::
endl
;
<<
"
s
"
<<
std
::
endl
;
return
0
;
return
0
;
}
}
deploy/cpp_infer/src/ocr_cls.cpp
View file @
9336e344
...
@@ -88,7 +88,7 @@ void Classifier::LoadModel(const std::string &model_dir) {
...
@@ -88,7 +88,7 @@ void Classifier::LoadModel(const std::string &model_dir) {
if
(
this
->
use_mkldnn_
)
{
if
(
this
->
use_mkldnn_
)
{
config
.
EnableMKLDNN
();
config
.
EnableMKLDNN
();
}
}
config
.
SetCpuMathLibraryNumThreads
(
this
->
cpu_math_library_num_threads_
)
config
.
SetCpuMathLibraryNumThreads
(
this
->
cpu_math_library_num_threads_
)
;
}
}
// false for zero copy tensor
// false for zero copy tensor
...
...
deploy/cpp_infer/src/ocr_rec.cpp
View file @
9336e344
...
@@ -76,7 +76,7 @@ void CRNNRecognizer::Run(std::vector<std::vector<std::vector<int>>> boxes,
...
@@ -76,7 +76,7 @@ void CRNNRecognizer::Run(std::vector<std::vector<std::vector<int>>> boxes,
float
(
*
std
::
max_element
(
&
predict_batch
[
n
*
predict_shape
[
2
]],
float
(
*
std
::
max_element
(
&
predict_batch
[
n
*
predict_shape
[
2
]],
&
predict_batch
[(
n
+
1
)
*
predict_shape
[
2
]]));
&
predict_batch
[(
n
+
1
)
*
predict_shape
[
2
]]));
if
(
argmax_idx
>
0
&&
(
not
(
i
>
0
&&
argmax_idx
==
last_index
)))
{
if
(
argmax_idx
>
0
&&
(
!
(
i
>
0
&&
argmax_idx
==
last_index
)))
{
score
+=
max_value
;
score
+=
max_value
;
count
+=
1
;
count
+=
1
;
str_res
.
push_back
(
label_list_
[
argmax_idx
]);
str_res
.
push_back
(
label_list_
[
argmax_idx
]);
...
@@ -183,4 +183,4 @@ cv::Mat CRNNRecognizer::GetRotateCropImage(const cv::Mat &srcimage,
...
@@ -183,4 +183,4 @@ cv::Mat CRNNRecognizer::GetRotateCropImage(const cv::Mat &srcimage,
}
}
}
}
}
// namespace PaddleOCR
}
// namespace PaddleOCR
\ No newline at end of file
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