Make spdlog and fmt mutually exclusive and support -Werror=missing-braces (KomputeProject#419)

* Update bin2h.cmake to avoid -Werror=missing-braces

Signed-off-by: zachferguson <[email protected]>
Signed-off-by: Zachary Ferguson <[email protected]>

* Use the fmt inside spdlog if using spdlog

Signed-off-by: zachferguson <[email protected]>
Signed-off-by: Zachary Ferguson <[email protected]>

* Fix python build by linking fmt when KOMPUTE_OPT_LOG_LEVEL_DISABLED

Signed-off-by: Zachary Ferguson <[email protected]>

---------

Signed-off-by: zachferguson <[email protected]>
Signed-off-by: Zachary Ferguson <[email protected]>

Author: zfergus

CMakeLists.txt

@@ -171,7 +171,7 @@ else()
 endif()
 
 # Spdlog
-if(KOMPUTE_OPT_USE_SPDLOG)
+if(NOT KOMPUTE_OPT_LOG_LEVEL_DISABLED AND KOMPUTE_OPT_USE_SPDLOG)
     add_compile_definitions(KOMPUTE_OPT_USE_SPDLOG=1)
 
     if(KOMPUTE_OPT_USE_BUILT_IN_SPDLOG)
@@ -185,17 +185,17 @@ if(KOMPUTE_OPT_USE_SPDLOG)
     else()
         find_package(spdlog REQUIRED)
     endif()
-endif()
-
-# fmt
-if(KOMPUTE_OPT_USE_BUILT_IN_FMT)
-    set(FMT_INSTALL ${KOMPUTE_OPT_INSTALL})
-    FetchContent_Declare(fmt GIT_REPOSITORY https://github.com/fmtlib/fmt.git
-        GIT_TAG 11.0.0
-        GIT_SHALLOW 1) # Source: https://github.com/fmtlib/fmt/releases
-    FetchContent_MakeAvailable(fmt)
 else()
-    find_package(fmt REQUIRED)
+    # fmt
+    if(KOMPUTE_OPT_USE_BUILT_IN_FMT)
+        set(FMT_INSTALL ${KOMPUTE_OPT_INSTALL})
+        FetchContent_Declare(fmt GIT_REPOSITORY https://github.com/fmtlib/fmt.git
+            GIT_TAG 11.0.0
+            GIT_SHALLOW 1) # Source: https://github.com/fmtlib/fmt/releases
+        FetchContent_MakeAvailable(fmt)
+    else()
+        find_package(fmt REQUIRED)
+    endif()
 endif()
 
 # GoogleTest

cmake/bin2h.cmake

@@ -95,12 +95,12 @@ function(BIN2H)
     set(namespaceStart "namespace ${HEADER_NAMESPACE} {")
     set(namespaceEnd "} // namespace ${HEADER_NAMESPACE}")
     set(arrayIncludes "#pragma once\n#include <array>\n#include <cstdint>")
-    set(arrayDefinition "const std::array<uint32_t, ${arraySize}> ${BIN2H_VARIABLE_NAME} = { ${arrayValues} };")
+    set(arrayDefinition "const std::array<uint32_t, ${arraySize}> ${BIN2H_VARIABLE_NAME} = { { ${arrayValues} } };")
 
     set(declarations "${arrayIncludes}\n\n${namespaceStart}\n${arrayDefinition}\n${namespaceEnd}\n\n")
     if(BIN2H_APPEND)
         file(APPEND ${BIN2H_HEADER_FILE} "${declarations}")
     else()
         file(WRITE ${BIN2H_HEADER_FILE} "${declarations}")
     endif()
-endfunction()
+endfunction()

src/CMakeLists.txt

@@ -67,13 +67,22 @@ if(KOMPUTE_OPT_ANDROID_BUILD)
     target_link_libraries(kompute PUBLIC vulkanAndroid
         android
         kp_logger
-        kp_shader
-        fmt::fmt)
+        kp_shader)
 else()
     target_link_libraries(kompute PUBLIC Vulkan::Vulkan
         kp_logger
-        kp_shader
-        fmt::fmt)
+        kp_shader)
+endif()
+
+# If OPT_LOG_LEVEL is disabled, kp_logger wont link against fmt::fmt, but we
+# still need it for non-logging utilities. Therefore, explicitly link fmt::fmt
+# to kompute target.
+if(KOMPUTE_OPT_LOG_LEVEL_DISABLED)
+    if(KOMPUTE_OPT_USE_SPDLOG)
+        message(FATAL_ERROR "KOMPUTE_OPT_LOG_LEVEL_DISABLED is incompatible with KOMPUTE_OPT_USE_SPDLOG. To continue set either one option to 'OFF'.")
+    else()
+        target_link_libraries(kompute PUBLIC fmt::fmt)
+    endif()
 endif()
 
 if(KOMPUTE_OPT_BUILD_PYTHON)
@@ -94,7 +103,7 @@ add_subdirectory(shaders)
 add_subdirectory(include)
 
 if(KOMPUTE_OPT_INSTALL)
-    if (KOMPUTE_OPT_USE_BUILT_IN_FMT)
+    if (NOT KOMPUTE_OPT_USE_SPDLOG AND KOMPUTE_OPT_USE_BUILT_IN_FMT)
         # We can't export fmt::fmt because it's alias target, so we unwrap the alias and install it.
         get_target_property(fmt_aliased_target fmt::fmt ALIASED_TARGET)
         install(TARGETS ${fmt_aliased_target}

src/Manager.cpp

@@ -2,8 +2,13 @@
 
 #include "kompute/Manager.hpp"
 #include "kompute/logger/Logger.hpp"
+#if KOMPUTE_OPT_USE_SPDLOG
+#include <spdlog/fmt/fmt.h>
+#include <spdlog/fmt/ranges.h>
+#else
 #include <fmt/core.h>
 #include <fmt/ranges.h>
+#endif
 #include <iterator>
 #include <set>
 #include <sstream>

src/Memory.cpp

@@ -3,7 +3,11 @@
 #include "kompute/Memory.hpp"
 #include "kompute/Image.hpp"
 #include "kompute/Tensor.hpp"
+#if KOMPUTE_OPT_USE_SPDLOG
+#include <spdlog/fmt/fmt.h>
+#else
 #include <fmt/core.h>
+#endif
 
 namespace kp {
 

src/include/kompute/Algorithm.hpp

@@ -3,7 +3,12 @@
 
 #include "kompute/Core.hpp"
 
-#include "fmt/format.h"
+#if KOMPUTE_OPT_USE_SPDLOG
+#include <spdlog/fmt/fmt.h>
+#else
+#include <fmt/format.h>
+#endif
+
 #include "kompute/Tensor.hpp"
 #include "logger/Logger.hpp"