BlueBrain · Adrien4193 · Apr 17, 2024 · Apr 17, 2024 · Apr 17, 2024
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,18 +22,18 @@ option(BRAYNS_ENABLE_ATLAS "Build atlas support" ON)
 option(BRAYNS_ENABLE_APPS "Build applications" ON)
 option(BRAYNS_ENABLE_TESTS "Build unit tests" ON)
 
+find_package(fmt REQUIRED)
 find_package(OpenMP REQUIRED)
 find_package(ospray REQUIRED)
-find_package(rkcommon REQUIRED)
 find_package(Poco REQUIRED COMPONENTS Foundation JSON Net NetSSL)
+find_package(rkcommon REQUIRED)
 find_package(ZLIB REQUIRED)
-find_package(spdlog REQUIRED)
 
 if(BRAYNS_ENABLE_CIRCUITS)
     find_package(HDF5 REQUIRED)
     find_package(HighFive REQUIRED)
-    find_package(sonata REQUIRED)
     find_package(MorphIO REQUIRED)
+    find_package(sonata REQUIRED)
 endif()
 
 if(BRAYNS_ENABLE_ATLAS)

diff --git a/scripts/superbuild/CMakeLists.txt b/scripts/superbuild/CMakeLists.txt
@@ -14,6 +14,17 @@ option(BRAYNS_ENABLE_INSTALL "Install Brayns with dependencies" OFF)
 
 include(ExternalProject)
 
+ExternalProject_Add(
+    fmt
+    GIT_REPOSITORY https://github.com/fmtlib/fmt.git
+    GIT_TAG 10.2.1
+    GIT_SHALLOW ON
+    CMAKE_ARGS
+    -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
+    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
+)
+
 ExternalProject_Add(
     libsonata
     GIT_REPOSITORY https://github.com/BlueBrain/libsonata.git
@@ -89,17 +100,6 @@ ExternalProject_Add(
     -DENABLE_ACTIVERECORD_COMPILER=OFF
 )
 
-ExternalProject_Add(
-    spdlog
-    GIT_REPOSITORY https://github.com/gabime/spdlog.git
-    GIT_TAG v1.13.0
-    GIT_SHALLOW ON
-    CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-    -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
-)
-
 if(BRAYNS_ENABLE_INSTALL)
     ExternalProject_Add(
         Brayns
@@ -113,10 +113,10 @@ if(BRAYNS_ENABLE_INSTALL)
     ExternalProject_Add_StepDependencies(
         Brayns
         configure
+        fmt
         libsonata
         morphio
         ospray
         poco
-        spdlog
     )
 endif()
diff --git a/src/brayns/atlas/io/nrrdloader/header/HeaderEntryParser.cpp b/src/brayns/atlas/io/nrrdloader/header/HeaderEntryParser.cpp
@@ -25,7 +25,7 @@
 #include <brayns/core/utils/string/StringSplitter.h>
 #include <brayns/core/utils/string/StringTrimmer.h>
 
-#include <spdlog/fmt/bundled/printf.h>
+#include <fmt/printf.h>
 
 namespace
 {

diff --git a/src/brayns/circuits/api/coloring/methods/MorphologySectionTypeColorMethod.cpp b/src/brayns/circuits/api/coloring/methods/MorphologySectionTypeColorMethod.cpp
@@ -30,7 +30,7 @@
 
 #include <algorithm>
 
-#include <spdlog/fmt/fmt.h>
+#include <fmt/format.h>
 
 namespace
 {

diff --git a/src/brayns/circuits/api/neuron/NeuronMorphologyReader.cpp b/src/brayns/circuits/api/neuron/NeuronMorphologyReader.cpp
@@ -18,7 +18,7 @@
 
 #include "NeuronMorphologyReader.h"
 
-#include <spdlog/fmt/fmt.h>
+#include <fmt/format.h>
 
 #include <morphio/morphology.h>
 #include <morphio/section.h>

diff --git a/src/brayns/circuits/io/CellPlacementLoader.cpp b/src/brayns/circuits/io/CellPlacementLoader.cpp
@@ -34,7 +34,7 @@
 #include <brayns/core/utils/Log.h>
 #include <brayns/core/utils/Timer.h>
 
-#include <spdlog/fmt/fmt.h>
+#include <fmt/format.h>
 
 #include <array>
 #include <filesystem>

diff --git a/src/brayns/circuits/io/sonataloader/ParameterCheck.cpp b/src/brayns/circuits/io/sonataloader/ParameterCheck.cpp
@@ -23,7 +23,7 @@
 #include <brayns/circuits/io/sonataloader/data/Names.h>
 #include <brayns/circuits/io/sonataloader/data/PopulationType.h>
 
-#include <spdlog/fmt/fmt.h>
+#include <fmt/format.h>
 
 #include <filesystem>
 #include <unordered_set>

diff --git a/src/brayns/circuits/io/sonataloader/data/detail/Common.cpp b/src/brayns/circuits/io/sonataloader/data/detail/Common.cpp
@@ -18,7 +18,7 @@
 
 #include "Common.h"
 
-#include <spdlog/fmt/fmt.h>
+#include <fmt/format.h>
 
 namespace sonataloader::detail
 {

diff --git a/src/brayns/core/CMakeLists.txt b/src/brayns/core/CMakeLists.txt
@@ -11,14 +11,14 @@ set_target_properties(core PROPERTIES OUTPUT_NAME braynsCore)
 target_link_libraries(
     core
     PUBLIC
+    fmt::fmt
     OpenMP::OpenMP_CXX
     ospray::ospray
     Poco::Foundation
     Poco::JSON
     Poco::Net
     Poco::NetSSL
     rkcommon::rkcommon
-    spdlog::spdlog
     PRIVATE
     ${ZLIB_LIBRARIES}
     stb

diff --git a/src/brayns/core/Version.cpp b/src/brayns/core/Version.cpp
@@ -21,7 +21,7 @@
 
 #include "Version.h"
 
-#include <spdlog/fmt/fmt.h>
+#include <fmt/format.h>
 
 namespace brayns
 {

diff --git a/src/brayns/core/engine/colormethods/SolidColorMethod.cpp b/src/brayns/core/engine/colormethods/SolidColorMethod.cpp
@@ -25,7 +25,7 @@
 #include <brayns/core/engine/components/ColorSolid.h>
 #include <brayns/core/engine/components/GeometryViews.h>
 
-#include <spdlog/fmt/fmt.h>
+#include <fmt/format.h>
 
 namespace
 {

diff --git a/src/brayns/core/engine/systems/GenericColorSystem.cpp b/src/brayns/core/engine/systems/GenericColorSystem.cpp
@@ -23,7 +23,7 @@
 #include <algorithm>
 #include <unordered_set>
 
-#include <spdlog/fmt/fmt.h>
+#include <fmt/format.h>
 
 namespace
 {

diff --git a/src/brayns/core/json/JsonError.h b/src/brayns/core/json/JsonError.h
@@ -26,7 +26,7 @@
 #include <variant>
 #include <vector>
 
-#include <spdlog/fmt/fmt.h>
+#include <fmt/format.h>
 
 namespace brayns
 {

diff --git a/src/brayns/core/json/JsonType.h b/src/brayns/core/json/JsonType.h
@@ -27,7 +27,7 @@
 #include <type_traits>
 #include <unordered_map>
 
-#include <spdlog/fmt/fmt.h>
+#include <fmt/format.h>
 
 #include <Poco/JSON/Array.h>
 #include <Poco/JSON/JSONException.h>

diff --git a/src/brayns/core/network/client/ClientRef.h b/src/brayns/core/network/client/ClientRef.h
@@ -24,7 +24,7 @@
 #include <functional>
 #include <memory>
 
-#include <spdlog/fmt/fmt.h>
+#include <fmt/format.h>
 
 #include <brayns/core/network/websocket/IWebSocket.h>
 

diff --git a/src/brayns/core/network/client/ClientRequest.h b/src/brayns/core/network/client/ClientRequest.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <spdlog/fmt/fmt.h>
+#include <fmt/format.h>
 
 #include <brayns/core/network/websocket/InputPacket.h>
 

diff --git a/src/brayns/core/network/entrypoint/EntrypointRegistry.cpp b/src/brayns/core/network/entrypoint/EntrypointRegistry.cpp
@@ -23,7 +23,7 @@
 
 #include <stdexcept>
 
-#include <spdlog/fmt/fmt.h>
+#include <fmt/format.h>
 
 namespace brayns
 {

diff --git a/src/brayns/core/network/jsonrpc/JsonRpcException.cpp b/src/brayns/core/network/jsonrpc/JsonRpcException.cpp
@@ -21,7 +21,7 @@
 
 #include "JsonRpcException.h"
 
-#include <spdlog/fmt/fmt.h>
+#include <fmt/format.h>
 
 namespace
 {

diff --git a/src/brayns/core/network/jsonrpc/JsonRpcException.h b/src/brayns/core/network/jsonrpc/JsonRpcException.h
@@ -23,7 +23,7 @@
 
 #include <stdexcept>
 
-#include <spdlog/fmt/fmt.h>
+#include <fmt/format.h>
 
 #include <brayns/core/json/Json.h>
 

diff --git a/src/brayns/core/network/jsonrpc/JsonRpcParser.cpp b/src/brayns/core/network/jsonrpc/JsonRpcParser.cpp
@@ -21,7 +21,7 @@
 
 #include "JsonRpcParser.h"
 
-#include <spdlog/fmt/fmt.h>
+#include <fmt/format.h>
 
 #include <brayns/core/json/Json.h>
 

diff --git a/src/brayns/core/network/jsonrpc/JsonRpcRequest.h b/src/brayns/core/network/jsonrpc/JsonRpcRequest.h
@@ -23,7 +23,7 @@
 
 #include <string_view>
 
-#include <spdlog/fmt/fmt.h>
+#include <fmt/format.h>
 
 #include <brayns/core/network/client/ClientRef.h>
 #include <brayns/core/network/jsonrpc/JsonRpcException.h>

diff --git a/src/brayns/core/network/jsonrpc/RequestId.h b/src/brayns/core/network/jsonrpc/RequestId.h
@@ -24,7 +24,7 @@
 #include <functional>
 #include <typeindex>
 
-#include <spdlog/fmt/fmt.h>
+#include <fmt/format.h>
 
 #include <brayns/core/json/JsonAdapter.h>
 

diff --git a/src/brayns/core/network/task/JsonRpcTask.cpp b/src/brayns/core/network/task/JsonRpcTask.cpp
@@ -23,7 +23,7 @@
 
 #include <cassert>
 
-#include <spdlog/fmt/fmt.h>
+#include <fmt/format.h>
 
 #include <brayns/core/utils/Log.h>
 

diff --git a/src/brayns/core/utils/Log.cpp b/src/brayns/core/utils/Log.cpp
@@ -21,26 +21,7 @@
 
 #include "Log.h"
 
-#include <spdlog/sinks/stdout_color_sinks.h>
-
-namespace
-{
-class LoggerFactory
-{
-public:
-    static std::shared_ptr<spdlog::logger> createLogger()
-    {
-        auto logger = spdlog::stdout_color_mt("Brayns");
-        logger->set_pattern("%^[%l][%T] %v%$");
-#ifdef NDEBUG
-        logger->set_level(spdlog::level::info);
-#else
-        logger->set_level(spdlog::level::debug);
-#endif
-        return logger;
-    }
-};
-} // namespace
+#include <iostream>
 
 namespace brayns
 {
@@ -60,13 +41,18 @@ EnumMap<LogLevel> EnumReflector<LogLevel>::reflect()
 
 void Log::setLevel(LogLevel level)
 {
-    _logger->set_level(spdlog::level::level_enum(level));
+    _level = level;
 }
 
 void Log::disable()
 {
     setLevel(LogLevel::Off);
 }
 
-std::shared_ptr<spdlog::logger> Log::_logger = LoggerFactory::createLogger();
+void Log::_handleMessage(LogLevel level, std::string_view message)
+{
+    auto &levelName = EnumInfo::getName(level);
+    auto record = fmt::format("[Brayns][{}] {}", levelName, message);
+    std::cout << record << '\n';
+}
 } // namespace brayns
diff --git a/src/brayns/core/utils/Log.h b/src/brayns/core/utils/Log.h
@@ -21,9 +21,10 @@
 
 #pragma once
 
-#define SPDLOG_HEADER_ONLY
-#include <spdlog/fmt/ostr.h>
-#include <spdlog/spdlog.h>
+#include <string>
+#include <string_view>
+
+#include <fmt/format.h>
 
 #include <brayns/core/utils/EnumInfo.h>
 
@@ -35,14 +36,14 @@ namespace brayns
  */
 enum class LogLevel
 {
-    Trace = spdlog::level::trace,
-    Debug = spdlog::level::debug,
-    Info = spdlog::level::info,
-    Warn = spdlog::level::warn,
-    Error = spdlog::level::err,
-    Critical = spdlog::level::critical,
-    Off = spdlog::level::off,
-    Count = spdlog::level::n_levels
+    Trace,
+    Debug,
+    Info,
+    Warn,
+    Error,
+    Critical,
+    Off,
+    Count,
 };
 
 template<>
@@ -78,7 +79,12 @@ class Log
     template<typename... Args>
     static void log(LogLevel level, fmt::format_string<Args...> format, Args &&...args)
     {
-        _logger->log(spdlog::level::level_enum(level), format, std::forward<Args>(args)...);
+        if (level < _level)
+        {
+            return;
+        }
+        auto message = fmt::format(format, std::forward<Args>(args)...);
+        _handleMessage(level, message);
     }
 
     /**
@@ -160,6 +166,8 @@ class Log
     }
 
 private:
-    static std::shared_ptr<spdlog::logger> _logger;
+    static inline LogLevel _level = LogLevel::Info;
+
+    static void _handleMessage(LogLevel level, std::string_view message);
 };
 } // namespace brayns
diff --git a/src/brayns/core/utils/parsing/RangeParser.h b/src/brayns/core/utils/parsing/RangeParser.h
@@ -25,7 +25,7 @@
 #include <brayns/core/utils/string/StringInfo.h>
 #include <brayns/core/utils/string/StringParser.h>
 
-#include <spdlog/fmt/fmt.h>
+#include <fmt/format.h>
 
 #include <algorithm>
 #include <stdexcept>