Skip to content

[TEST BUILD] Feature/remove spdlog #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Fixstars-momoko wants to merge 3 commits into from
Closed

[TEST BUILD] Feature/remove spdlog #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e02e44e
removed validation.cc
Fixstars-momoko Dec 18, 2024
3b1484c
removed all log
Fixstars-momoko Dec 19, 2024
337d8fc
Merge branch 'release/v1.8' into feature/remove-spdlog
Fixstars-momoko Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/bb/base/bb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include <ion/ion.h>

#include "log.h"
// #include "log.h"

namespace ion {
namespace bb {
Expand Down Expand Up @@ -548,7 +548,7 @@ class ReorderBuffer : public BuildingBlock<X> {
// Check order
for (int i = 0; i < order.size(); i++) {
if (std::count(order.begin(), order.end(), i) != 1) {
log::error("Invalid order");
// log::error("Invalid order");
throw std::runtime_error("Invalid order");
}
}
Expand Down Expand Up @@ -1065,7 +1065,7 @@ class ConstantBuffer : public BuildingBlock<X> {
if ((ss >> value) && value <= static_cast<value_t>(std::numeric_limits<T>::max()) && value >= static_cast<value_t>(std::numeric_limits<T>::lowest())) {
result.push_back(static_cast<T>(value));
} else {
log::error("Invalid value");
// log::error("Invalid value");
throw std::runtime_error("Invalid value");
}
}
Expand Down
10 changes: 5 additions & 5 deletions src/bb/dnn/rt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include "ion/export.h"

#include "log.h"
// #include "log.h"
#include "json/json.hpp"

#include "rt_dnndk.h"
Expand Down Expand Up @@ -61,19 +61,19 @@ extern "C" ION_EXPORT int ion_bb_dnn_generic_object_detection(halide_buffer_t *i

if (is_tfl_available()) {
// EdgeTPU
ion::log::info("TFlite runtime is available");
//ion::log::info("TFlite runtime is available");
return object_detection_tfl(in, model_root_url, cache_root, out);
} else if (dnndk_enable && dnndk::is_dnndk_available()) {
// DPU (FPGA)
ion::log::info("DNNDK runtime is available");
//ion::log::info("DNNDK runtime is available");
return dnndk::object_detection(in, model_root_url, cache_root, out);
} else if (is_ort_available()) {
// CPU, GPU (CUDA)
ion::log::info("ONNX runtime is available");
//ion::log::info("ONNX runtime is available");
std::string session_id(reinterpret_cast<const char *>(session_id_buf->host));
return object_detection_ort(in, session_id, model_root_url, cache_root, cuda_enable, out);
} else {
ion::log::error("No available runtime");
//ion::log::error("No available runtime");
return -1;
}

Expand Down
2 changes: 1 addition & 1 deletion src/bb/image-io/rt_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include "ion/export.h"


#include "log.h"
// #include "log.h"

#include "httplib.h"

Expand Down
12 changes: 6 additions & 6 deletions src/bb/image-io/rt_file.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#include "json/json.hpp"

#include "log.h"
// #include "log.h"

#include "rt_common.h"
#include "httplib.h"
Expand Down Expand Up @@ -131,7 +131,7 @@ class Writer {

~Writer() {
if (!disposed_){
ion::log::debug("Trying to call dispose from distructor since disposed_ is {}", disposed_);
// ion::log::debug("Trying to call dispose from distructor since disposed_ is {}", disposed_);
dispose();
}

Expand Down Expand Up @@ -183,29 +183,29 @@ class Writer {
}

void dispose() {
ion::log::debug("Writer::dispose() :: is called");
// ion::log::debug("Writer::dispose() :: is called");
// Already disposed if thread is not joinable
if (thread_ && thread_->joinable()) {
keep_running_ = false;
task_cv_.notify_one();
thread_->join();
thread_ = nullptr;
}
ion::log::debug("Writer::dispose() :: is finished");
// ion::log::debug("Writer::dispose() :: is finished");
disposed_ = true;
}


static void release_instance(const char * id) {
ion::log::debug("Writer::release_instance() :: is called");
// ion::log::debug("Writer::release_instance() :: is called");
if (instances.count(id) == 0) {
return;
}

Writer & writer = *instances[id].get();
writer.dispose();
instances.erase(id);
ion::log::debug("Writer::release_instance() :: Instance is delete");
// ion::log::debug("Writer::release_instance() :: Instance is delete");

}

Expand Down
38 changes: 19 additions & 19 deletions src/bb/image-io/rt_realsense.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include <HalideBuffer.h>

#include "log.h"
// #include "log.h"

#include "rt_common.h"

Expand Down Expand Up @@ -110,62 +110,62 @@ class RealSense {
: dm_("realsense2", false), device_is_available_(false), ctx_(nullptr), devices_(nullptr), pipeline_(nullptr), config_(nullptr), frameset_(nullptr) {

if (!init_symbols()) {
log::error("Failed to init realsense symbols");
// log::error("Failed to init realsense symbols");
return;
}

rs2_error_t *err = nullptr;

int version = rs2_get_api_version(&err);
if (err) {
log::error("Failed call realsense API: {}", rs2_get_error_message(err));
// log::error("Failed call realsense API: {}", rs2_get_error_message(err));
return;
}

ctx_ = rs2_create_context(version, &err);
if (err) {
log::error("Failed call realsense API: {}", rs2_get_error_message(err));
// log::error("Failed call realsense API: {}", rs2_get_error_message(err));
return;
}

devices_ = rs2_query_devices(ctx_, &err);
if (err) {
log::error("Failed call realsense API: {}", rs2_get_error_message(err));
// log::error("Failed call realsense API: {}", rs2_get_error_message(err));
return;
}

int num_of_devices = rs2_get_device_count(devices_, &err);
if (err) {
log::error("Failed call realsense API: {}", rs2_get_error_message(err));
// log::error("Failed call realsense API: {}", rs2_get_error_message(err));
return;
}
if (num_of_devices == 0) {
log::error("Cannot find realsense device");
// log::error("Cannot find realsense device");
return;
}

int fps = 30;
config_ = rs2_create_config(&err);
if (err) {
log::error("Failed call realsense API: {}", rs2_get_error_message(err));
// log::error("Failed call realsense API: {}", rs2_get_error_message(err));
return;
}

rs2_config_enable_stream(config_, RS2_STREAM_INFRARED, 1, width, height, RS2_FORMAT_Y8, fps, &err);
if (err) {
log::error("Failed call realsense API: {}", rs2_get_error_message(err));
// log::error("Failed call realsense API: {}", rs2_get_error_message(err));
return;
}

rs2_config_enable_stream(config_, RS2_STREAM_INFRARED, 2, width, height, RS2_FORMAT_Y8, fps, &err);
if (err) {
log::error("Failed call realsense API: {}", rs2_get_error_message(err));
// log::error("Failed call realsense API: {}", rs2_get_error_message(err));
return;
}

rs2_config_enable_stream(config_, RS2_STREAM_DEPTH, 0, width, height, RS2_FORMAT_Z16, fps, &err);
if (err) {
log::error("Failed call realsense API: {}", rs2_get_error_message(err));
// log::error("Failed call realsense API: {}", rs2_get_error_message(err));
return;
}

Expand All @@ -176,13 +176,13 @@ class RealSense {

pipeline_ = rs2_create_pipeline(ctx_, &err);
if (err) {
log::error("Failed call realsense API: {}", rs2_get_error_message(err));
// log::error("Failed call realsense API: {}", rs2_get_error_message(err));
return;
}

rs2_pipeline_start_with_config(pipeline_, config_, &err);
if (err) {
log::error("Failed call realsense API: {}", rs2_get_error_message(err));
// log::error("Failed call realsense API: {}", rs2_get_error_message(err));
return;
}

Expand Down Expand Up @@ -314,10 +314,10 @@ extern "C" int ION_EXPORT ion_bb_image_io_realsense_d435_infrared(halide_buffer_
}
return 0;
} catch (const std::exception &e) {
ion::log::error("Exception was thrown: {}", e.what());
// ion::// log::error("Exception was thrown: {}", e.what());
return 1;
} catch (...) {
ion::log::error("Unknown exception was thrown");
// ion::// log::error("Unknown exception was thrown");
return 1;
}
}
Expand Down Expand Up @@ -354,10 +354,10 @@ extern "C" int ION_EXPORT ion_bb_image_io_realsense_d435_depth(halide_buffer_t *
}
return 0;
} catch (const std::exception &e) {
ion::log::error("Exception was thrown: {}", e.what());
// ion::// log::error("Exception was thrown: {}", e.what());
return 1;
} catch (...) {
ion::log::error("Unknown exception was thrown");
// ion::// log::error("Unknown exception was thrown");
return 1;
}
}
Expand All @@ -383,10 +383,10 @@ extern "C" int ION_EXPORT ion_bb_image_io_realsense_d435_frameset(halide_buffer_
}
return 0;
} catch (const std::exception &e) {
ion::log::error("Exception was thrown: {}", e.what());
// ion::// log::error("Exception was thrown: {}", e.what());
return 1;
} catch (...) {
ion::log::error("Unknown exception was thrown");
// ion::// log::error("Unknown exception was thrown");
return 1;
}
}
Expand Down
Loading
Loading