Skip to content

Commit 418659a

Browse files
priankakariatpriankakariat
committed
Merge branch 'master' into image-classifier-c-api
2 parents 395db11 + 6656416 commit 418659a

File tree

18 files changed

+80
-95
lines changed

18 files changed

+80
-95
lines changed

‎tensorflow_lite_support/c/task/text/BUILD‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ cc_library_with_tflite(
7373
"bert_question_answerer.h",
7474
],
7575
tflite_deps = [
76-
"//tensorflow_lite_support/cc/task/text/qa:bert_question_answerer",
77-
"//tensorflow_lite_support/cc/task/text/qa:question_answerer",
76+
"//tensorflow_lite_support/cc/task/text:bert_question_answerer",
77+
"//tensorflow_lite_support/cc/task/text:question_answerer",
7878
],
7979
)

‎tensorflow_lite_support/c/task/text/bert_question_answerer.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ limitations under the License.
1717

1818
#include <memory>
1919

20-
#include "tensorflow_lite_support/cc/task/text/qa/bert_question_answerer.h"
21-
#include "tensorflow_lite_support/cc/task/text/qa/question_answerer.h"
20+
#include "tensorflow_lite_support/cc/task/text/bert_question_answerer.h"
21+
#include "tensorflow_lite_support/cc/task/text/question_answerer.h"
2222

2323
namespace {
24-
using BertQuestionAnswererCpp = ::tflite::task::text::qa::BertQuestionAnswerer;
25-
using QaAnswerCpp = ::tflite::task::text::qa::QaAnswer;
24+
using BertQuestionAnswererCpp = ::tflite::task::text::BertQuestionAnswerer;
25+
using QaAnswerCpp = ::tflite::task::text::QaAnswer;
2626
} // namespace
2727

2828
#ifdef __cplusplus

‎tensorflow_lite_support/cc/task/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ answer question based on context.
1515
Use the C++ API to answer questions as follows:
1616

1717
```cc
18-
using tflite::task::text::qa::BertQuestionAnswerer;
19-
using tflite::task::text::qa::QaAnswer;
18+
using tflite::task::text::BertQuestionAnswerer;
19+
using tflite::task::text::QaAnswer;
2020
// Create API handler with Mobile Bert model.
2121
auto qa_client = BertQuestionAnswerer::CreateBertQuestionAnswererFromFile("/path/to/mobileBertModel", "/path/to/vocab");
2222
// Or create API handler with Albert model.

‎tensorflow_lite_support/cc/task/processor/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ cc_library_with_tflite(
5050
],
5151
deps = [
5252
"//tensorflow_lite_support/cc/port:status_macros",
53+
"//tensorflow_lite_support/cc/port:statusor",
5354
"//tensorflow_lite_support/cc/task/core:classification_head",
5455
"//tensorflow_lite_support/cc/task/core:label_map_item",
5556
"//tensorflow_lite_support/cc/task/core:score_calibration",

‎tensorflow_lite_support/cc/task/processor/classification_postprocessor.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ using ::tflite::task::core::ScoreCalibration;
4040
} // namespace
4141

4242
/* static */
43-
absl::StatusOr<std::unique_ptr<ClassificationPostprocessor>>
43+
tflite::support::StatusOr<std::unique_ptr<ClassificationPostprocessor>>
4444
ClassificationPostprocessor::Create(
4545
core::TfLiteEngine* engine, const std::initializer_list<int> output_indices,
4646
std::unique_ptr<ClassificationOptions> options) {

‎tensorflow_lite_support/cc/task/processor/classification_postprocessor.h‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ limitations under the License.
1919
#include <initializer_list>
2020

2121
#include "tensorflow_lite_support/cc/port/status_macros.h"
22+
#include "tensorflow_lite_support/cc/port/statusor.h"
2223
#include "tensorflow_lite_support/cc/task/core/classification_head.h"
2324
#include "tensorflow_lite_support/cc/task/core/label_map_item.h"
2425
#include "tensorflow_lite_support/cc/task/core/score_calibration.h"
@@ -46,10 +47,10 @@ namespace processor {
4647
// results will be filled.
4748
class ClassificationPostprocessor : public Postprocessor {
4849
public:
49-
static absl::StatusOr<std::unique_ptr<ClassificationPostprocessor>> Create(
50-
core::TfLiteEngine* engine,
51-
const std::initializer_list<int> output_indices,
52-
std::unique_ptr<ClassificationOptions> options);
50+
static tflite::support::StatusOr<std::unique_ptr<ClassificationPostprocessor>>
51+
Create(core::TfLiteEngine* engine,
52+
const std::initializer_list<int> output_indices,
53+
std::unique_ptr<ClassificationOptions> options);
5354

5455
template <typename T>
5556
absl::Status Postprocess(T* classifications);

‎tensorflow_lite_support/cc/task/processor/embedding_postprocessor.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace task {
2020
namespace processor {
2121

2222
/* static */
23-
absl::StatusOr<std::unique_ptr<EmbeddingPostprocessor>>
23+
tflite::support::StatusOr<std::unique_ptr<EmbeddingPostprocessor>>
2424
EmbeddingPostprocessor::Create(core::TfLiteEngine* engine,
2525
const std::initializer_list<int> output_indices,
2626
std::unique_ptr<EmbeddingOptions> options) {

‎tensorflow_lite_support/cc/task/processor/embedding_postprocessor.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ namespace processor {
3535
// - Either 2 or 4 dimensions, i.e. `[1 x N]` or `[1 x 1 x 1 x N]`.
3636
class EmbeddingPostprocessor : public Postprocessor {
3737
public:
38-
static absl::StatusOr<std::unique_ptr<EmbeddingPostprocessor>> Create(
39-
core::TfLiteEngine* engine,
40-
const std::initializer_list<int> output_indices,
41-
std::unique_ptr<EmbeddingOptions> options);
38+
static tflite::support::StatusOr<std::unique_ptr<EmbeddingPostprocessor>>
39+
Create(core::TfLiteEngine* engine,
40+
const std::initializer_list<int> output_indices,
41+
std::unique_ptr<EmbeddingOptions> options);
4242

4343
template <typename T>
4444
absl::Status Postprocess(T* embedding);

‎tensorflow_lite_support/cc/task/text/BUILD‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,46 @@ cc_library_with_tflite(
3939
"@org_tensorflow//tensorflow/lite/core/api",
4040
],
4141
)
42+
43+
cc_library_with_tflite(
44+
name = "question_answerer",
45+
hdrs = [
46+
"question_answerer.h",
47+
],
48+
tflite_deps = [
49+
"//tensorflow_lite_support/cc/task/core:base_task_api",
50+
"//tensorflow_lite_support/cc/task/core:tflite_engine",
51+
],
52+
)
53+
54+
cc_library_with_tflite(
55+
name = "bert_question_answerer",
56+
srcs = [
57+
"bert_question_answerer.cc",
58+
],
59+
hdrs = [
60+
"bert_question_answerer.h",
61+
],
62+
tflite_deps = [
63+
":question_answerer",
64+
"@org_tensorflow//tensorflow/lite/core/shims:builtin_ops",
65+
"//tensorflow_lite_support/cc/task/core:base_task_api",
66+
"//tensorflow_lite_support/cc/task/core:task_api_factory",
67+
"//tensorflow_lite_support/cc/task/core:tflite_engine",
68+
],
69+
deps = [
70+
"//tensorflow_lite_support/cc/port:status_macros",
71+
"//tensorflow_lite_support/cc/port:statusor",
72+
"//tensorflow_lite_support/cc/task/core:task_utils",
73+
"//tensorflow_lite_support/cc/task/text/proto:bert_question_answerer_options_proto_inc",
74+
"//tensorflow_lite_support/cc/text/tokenizers:bert_tokenizer",
75+
"//tensorflow_lite_support/cc/text/tokenizers:sentencepiece_tokenizer",
76+
"//tensorflow_lite_support/cc/text/tokenizers:tokenizer",
77+
"//tensorflow_lite_support/cc/text/tokenizers:tokenizer_utils",
78+
"//tensorflow_lite_support/metadata:metadata_schema_cc",
79+
"@com_google_absl//absl/base:core_headers",
80+
"@com_google_absl//absl/container:flat_hash_map",
81+
"@com_google_absl//absl/status",
82+
"@com_google_absl//absl/strings",
83+
],
84+
)

tensorflow_lite_support/cc/task/text/qa/bert_question_answerer.cc renamed to tensorflow_lite_support/cc/task/text/bert_question_answerer.cc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
1313
limitations under the License.
1414
==============================================================================*/
1515

16-
#include "tensorflow_lite_support/cc/task/text/qa/bert_question_answerer.h"
16+
#include "tensorflow_lite_support/cc/task/text/bert_question_answerer.h"
1717

1818
#include "external/com_google_absl/absl/status/status.h"
1919
#include "external/com_google_absl/absl/strings/str_join.h"
@@ -28,7 +28,6 @@ limitations under the License.
2828
namespace tflite {
2929
namespace task {
3030
namespace text {
31-
namespace qa {
3231

3332
constexpr char kIdsTensorName[] = "ids";
3433
constexpr char kMaskTensorName[] = "mask";
@@ -409,7 +408,6 @@ void BertQuestionAnswerer::InitializeSentencepieceTokenizerFromBinary(
409408
spmodel_buffer_size);
410409
}
411410

412-
} // namespace qa
413411
} // namespace text
414412
} // namespace task
415413
} // namespace tflite

0 commit comments

Comments
 (0)