This is an automated email from the ASF dual-hosted git repository. aboda pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 4518628bd502ce991111f456283607fd419d385a Author: Martin Zink <[email protected]> AuthorDate: Mon Feb 15 15:04:43 2021 +0100 MINIFICPP-1491: Fixing build failures in Tensorflow extension Signed-off-by: Arpad Boda <[email protected]> This closes #1001 --- extensions/tensorflow/TFExtractTopLabels.cpp | 4 ++-- libminifi/test/tensorflow-tests/TensorFlowTests.cpp | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/extensions/tensorflow/TFExtractTopLabels.cpp b/extensions/tensorflow/TFExtractTopLabels.cpp index 9bcb067..f0853c1 100644 --- a/extensions/tensorflow/TFExtractTopLabels.cpp +++ b/extensions/tensorflow/TFExtractTopLabels.cpp @@ -133,11 +133,11 @@ int64_t TFExtractTopLabels::LabelsReadCallback::process(const std::shared_ptr<io uint64_t buf_size = 8096; buf.resize(buf_size); - while (total_read < stream->getSize()) { + while (total_read < stream->size()) { auto read = stream->read(reinterpret_cast<uint8_t *>(&buf[0]), static_cast<int>(buf_size)); for (auto i = 0; i < read; i++) { - if (buf[i] == '\n' || total_read + i == stream->getSize()) { + if (buf[i] == '\n' || total_read + i == stream->size()) { labels_->emplace_back(label.substr(0, label_size)); label_size = 0; } else { diff --git a/libminifi/test/tensorflow-tests/TensorFlowTests.cpp b/libminifi/test/tensorflow-tests/TensorFlowTests.cpp index 0334a2d..d4dc27c 100644 --- a/libminifi/test/tensorflow-tests/TensorFlowTests.cpp +++ b/libminifi/test/tensorflow-tests/TensorFlowTests.cpp @@ -45,8 +45,8 @@ TEST_CASE("TensorFlow: Apply Graph", "[tfApplyGraph]") { // NOLINT auto repo = std::make_shared<TestRepository>(); // Define directory for input protocol buffers - std::string in_dir("/tmp/gt.XXXXXX"); - REQUIRE(testController.createTempDirectory(&in_dir[0]) != nullptr); + char in_dir_format[] = "/tmp/gt.XXXXXX"; + std::string in_dir = testController.createTempDirectory(in_dir_format); // Define input graph protocol buffer file std::string in_graph_file(in_dir); @@ -57,8 +57,8 @@ TEST_CASE("TensorFlow: Apply Graph", "[tfApplyGraph]") { // NOLINT in_tensor_file.append("/tensor.pb"); // Define directory for output protocol buffers - std::string out_dir("/tmp/gt.XXXXXX"); - REQUIRE(testController.createTempDirectory(&out_dir[0]) != nullptr); + char out_dir_format[] = "/tmp/gt.XXXXXX"; + std::string out_dir = testController.createTempDirectory(out_dir_format); // Define output tensor protocol buffer file std::string out_tensor_file(out_dir); @@ -184,16 +184,16 @@ TEST_CASE("TensorFlow: ConvertImageToTensor", "[tfConvertImageToTensor]") { // N auto repo = std::make_shared<TestRepository>(); // Define directory for input protocol buffers - std::string in_dir("/tmp/gt.XXXXXX"); - REQUIRE(testController.createTempDirectory(&in_dir[0]) != nullptr); + char in_dir_format[] = "/tmp/gt.XXXXXX"; + std::string in_dir = testController.createTempDirectory(in_dir_format); // Define input tensor protocol buffer file std::string in_img_file(in_dir); in_img_file.append("/img"); // Define directory for output protocol buffers - std::string out_dir("/tmp/gt.XXXXXX"); - REQUIRE(testController.createTempDirectory(&out_dir[0]) != nullptr); + char out_dir_format[] = "/tmp/gt.XXXXXX"; + std::string out_dir = testController.createTempDirectory(out_dir_format); // Define output tensor protocol buffer file std::string out_tensor_file(out_dir); @@ -312,8 +312,8 @@ TEST_CASE("TensorFlow: Extract Top Labels", "[tfExtractTopLabels]") { // NOLINT auto repo = std::make_shared<TestRepository>(); // Define directory for input protocol buffers - std::string in_dir("/tmp/gt.XXXXXX"); - REQUIRE(testController.createTempDirectory(&in_dir[0]) != nullptr); + char in_dir_format[] = "/tmp/gt.XXXXXX"; + std::string in_dir = testController.createTempDirectory(in_dir_format); // Define input labels file std::string in_labels_file(in_dir);
