Updated SPDLOG as an optional dependency

This commit is contained in:
Alejandro Saucedo 2020-09-03 19:18:22 +01:00
parent 0410ae0db6
commit 36a60922ba
19 changed files with 151 additions and 77 deletions

View file

@ -3,8 +3,6 @@
#include "kompute/Kompute.hpp"
#include <fmt/ranges.h>
TEST_CASE("test_logistic_regression") {
uint32_t ITERATIONS = 100;
@ -77,6 +75,6 @@ TEST_CASE("test_logistic_regression") {
REQUIRE(wIn->data()[1] > 1.0);
REQUIRE(bIn->data()[0] < 0.0);
SPDLOG_DEBUG("Result wIn: {}, bIn: {}",
wIn->data(), bIn->data());
//SPDLOG_DEBUG("Result wIn: {}, bIn: {}",
// wIn->data(), bIn->data());
}

View file

@ -2,23 +2,19 @@
// clang-format: SPDLOG_ACTIVE_LEVEL must be defined before spdlog.h import
#if DEBUG
#ifndef SPDLOG_ACTIVE_LEVEL
#define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_DEBUG
#endif
#endif
#include <spdlog/spdlog.h>
// clang-format: ranges.h must come after spdlog.h
#include <fmt/ranges.h>
//#include <spdlog/spdlog.h>
//// clang-format: ranges.h must come after spdlog.h
//#include <fmt/ranges.h>
#include "catch2/catch.hpp"
int main( int argc, char* argv[] ) {
#if DEBUG
spdlog::set_level(spdlog::level::debug);
#else
spdlog::set_level(spdlog::level::info);
#endif
int result = Catch::Session().run( argc, argv );
// global clean-up...

View file

@ -3,8 +3,6 @@
#include "kompute/Kompute.hpp"
#include <fmt/ranges.h>
TEST_CASE("End to end OpMult Flow should execute correctly from manager")
{
kp::Manager mgr;
@ -20,17 +18,8 @@ TEST_CASE("End to end OpMult Flow should execute correctly from manager")
{ 0, 0, 0 }) };
mgr.evalOp<kp::OpCreateTensor>({ tensorOutput });
spdlog::info("OpCreateTensor success for tensors");
spdlog::info("Tensor one: {}", tensorLHS->data());
spdlog::info("Tensor two: {}", tensorRHS->data());
spdlog::info("Tensor output: {}", tensorOutput->data());
spdlog::info("Calling op mult");
mgr.evalOp<kp::OpMult<>>({ tensorLHS, tensorRHS, tensorOutput });
spdlog::info("OpMult call success");
spdlog::info("Tensor output: {}", tensorOutput->data());
REQUIRE(tensorOutput->data() == std::vector<float>{0, 4, 12});
}

View file

@ -3,8 +3,6 @@
#include "kompute/Kompute.hpp"
#include <fmt/ranges.h>
TEST_CASE("test_multiple_algo_exec_single_cmd_buf_record") {
kp::Manager mgr;

View file

@ -3,8 +3,6 @@
#include "kompute/Kompute.hpp"
#include <fmt/ranges.h>
TEST_CASE("test_opcreatetensor_create_single_tensor") {
kp::Manager mgr;

View file

@ -3,8 +3,6 @@
#include "kompute/Kompute.hpp"
#include <fmt/ranges.h>
#include "kompute_test/shaders/shadertest_op_custom_shader.hpp"
TEST_CASE("test_op_shader_raw_data_from_constructor") {