build: relocated src/common/spdlog to third_party

oneapi-src · Jan 15, 2025 · 1326f7c · 1326f7c
1 parent c33f7d1
commit 1326f7c
Show file tree

Hide file tree

Showing 56 changed files with 7 additions and 29 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 #===============================================================================
-# Copyright 2016-2024 Intel Corporation
+# Copyright 2016-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ file(GLOB HEADERS_SUBDIR
     ${CMAKE_CURRENT_SOURCE_DIR}/../include/oneapi/dnnl/*.h
     ${CMAKE_CURRENT_SOURCE_DIR}/../include/oneapi/dnnl/*.hpp
     )
+include_directories_with_host_compiler(${PROJECT_SOURCE_DIR}/third_party)
 include_directories_with_host_compiler(${CMAKE_CURRENT_SOURCE_DIR})
 
 if (DNNL_LIBRARY_TYPE STREQUAL "SHARED")

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
@@ -1,5 +1,5 @@
 #===============================================================================
-# Copyright 2019-2024 Intel Corporation
+# Copyright 2019-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -48,13 +48,8 @@ if(NOT DNNL_CPU_RUNTIME STREQUAL "THREADPOOL")
     list(REMOVE_ITEM SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/stream_threadpool.cpp")
 endif()
 
-if(DNNL_EXPERIMENTAL_LOGGING)
-    include_directories(${CMAKE_CURRENT_LIST_DIR})
-else()
-    # avoid building and linking spdlog if logging support is not enabled
-    list(REMOVE_ITEM SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/spdlog/*")
+if(NOT DNNL_EXPERIMENTAL_LOGGING)
     list(REMOVE_ITEM SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/logging.cpp")
-    list(REMOVE_ITEM SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/logging.hpp")
 endif()
 
 set(OBJ_LIB ${LIB_PACKAGE_NAME}_common)

diff --git a/src/common/logging.cpp b/src/common/logging.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright 2024 Intel Corporation
+* Copyright 2024-2025 Intel Corporation
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@
 #include "common/logging.hpp"
 #include "common/utils.hpp"
 
-#include "common/spdlog/sinks/rotating_file_sink.h"
-#include "common/spdlog/spdlog.h"
+#include "spdlog/sinks/rotating_file_sink.h"
+#include "spdlog/spdlog.h"
 
 namespace dnnl {
 namespace impl {

diff --git a/src/common/spdlog/.clang-format b/src/common/spdlog/.clang-format
diff --git a/src/common/spdlog/README.md → third_party/spdlog/README.md b/src/common/spdlog/README.md → third_party/spdlog/README.md
diff --git a/src/common/spdlog/common-inl.h → third_party/spdlog/common-inl.h b/src/common/spdlog/common-inl.h → third_party/spdlog/common-inl.h
diff --git a/src/common/spdlog/common.h → third_party/spdlog/common.h b/src/common/spdlog/common.h → third_party/spdlog/common.h
diff --git a/src/common/spdlog/details/backtracer-inl.h → third_party/spdlog/details/backtracer-inl.h b/src/common/spdlog/details/backtracer-inl.h → third_party/spdlog/details/backtracer-inl.h
diff --git a/src/common/spdlog/details/backtracer.h → third_party/spdlog/details/backtracer.h b/src/common/spdlog/details/backtracer.h → third_party/spdlog/details/backtracer.h
diff --git a/src/common/spdlog/details/circular_q.h → third_party/spdlog/details/circular_q.h b/src/common/spdlog/details/circular_q.h → third_party/spdlog/details/circular_q.h
diff --git a/src/common/spdlog/details/console_globals.h → third_party/spdlog/details/console_globals.h b/src/common/spdlog/details/console_globals.h → third_party/spdlog/details/console_globals.h
diff --git a/src/common/spdlog/details/file_helper-inl.h → third_party/spdlog/details/file_helper-inl.h b/src/common/spdlog/details/file_helper-inl.h → third_party/spdlog/details/file_helper-inl.h
diff --git a/src/common/spdlog/details/file_helper.h → third_party/spdlog/details/file_helper.h b/src/common/spdlog/details/file_helper.h → third_party/spdlog/details/file_helper.h
diff --git a/src/common/spdlog/details/fmt_helper.h → third_party/spdlog/details/fmt_helper.h b/src/common/spdlog/details/fmt_helper.h → third_party/spdlog/details/fmt_helper.h
diff --git a/src/common/spdlog/details/log_msg-inl.h → third_party/spdlog/details/log_msg-inl.h b/src/common/spdlog/details/log_msg-inl.h → third_party/spdlog/details/log_msg-inl.h
diff --git a/src/common/spdlog/details/log_msg.h → third_party/spdlog/details/log_msg.h b/src/common/spdlog/details/log_msg.h → third_party/spdlog/details/log_msg.h
diff --git a/...ommon/spdlog/details/log_msg_buffer-inl.h → ...party/spdlog/details/log_msg_buffer-inl.h b/...ommon/spdlog/details/log_msg_buffer-inl.h → ...party/spdlog/details/log_msg_buffer-inl.h
diff --git a/src/common/spdlog/details/log_msg_buffer.h → third_party/spdlog/details/log_msg_buffer.h b/src/common/spdlog/details/log_msg_buffer.h → third_party/spdlog/details/log_msg_buffer.h
diff --git a/src/common/spdlog/details/null_mutex.h → third_party/spdlog/details/null_mutex.h b/src/common/spdlog/details/null_mutex.h → third_party/spdlog/details/null_mutex.h
diff --git a/src/common/spdlog/details/os-inl.h → third_party/spdlog/details/os-inl.h b/src/common/spdlog/details/os-inl.h → third_party/spdlog/details/os-inl.h
diff --git a/src/common/spdlog/details/os.h → third_party/spdlog/details/os.h b/src/common/spdlog/details/os.h → third_party/spdlog/details/os.h
diff --git a/...mmon/spdlog/details/periodic_worker-inl.h → ...arty/spdlog/details/periodic_worker-inl.h b/...mmon/spdlog/details/periodic_worker-inl.h → ...arty/spdlog/details/periodic_worker-inl.h
diff --git a/src/common/spdlog/details/periodic_worker.h → third_party/spdlog/details/periodic_worker.h b/src/common/spdlog/details/periodic_worker.h → third_party/spdlog/details/periodic_worker.h
diff --git a/src/common/spdlog/details/registry-inl.h → third_party/spdlog/details/registry-inl.h b/src/common/spdlog/details/registry-inl.h → third_party/spdlog/details/registry-inl.h
diff --git a/src/common/spdlog/details/registry.h → third_party/spdlog/details/registry.h b/src/common/spdlog/details/registry.h → third_party/spdlog/details/registry.h
diff --git a/...mmon/spdlog/details/synchronous_factory.h → ...arty/spdlog/details/synchronous_factory.h b/...mmon/spdlog/details/synchronous_factory.h → ...arty/spdlog/details/synchronous_factory.h
diff --git a/src/common/spdlog/details/windows_include.h → third_party/spdlog/details/windows_include.h b/src/common/spdlog/details/windows_include.h → third_party/spdlog/details/windows_include.h
diff --git a/src/common/spdlog/fmt/bundled/base.h → third_party/spdlog/fmt/bundled/base.h b/src/common/spdlog/fmt/bundled/base.h → third_party/spdlog/fmt/bundled/base.h
diff --git a/src/common/spdlog/fmt/bundled/core.h → third_party/spdlog/fmt/bundled/core.h b/src/common/spdlog/fmt/bundled/core.h → third_party/spdlog/fmt/bundled/core.h
diff --git a/src/common/spdlog/fmt/bundled/format-inl.h → third_party/spdlog/fmt/bundled/format-inl.h b/src/common/spdlog/fmt/bundled/format-inl.h → third_party/spdlog/fmt/bundled/format-inl.h
diff --git a/src/common/spdlog/fmt/bundled/format.h → third_party/spdlog/fmt/bundled/format.h b/src/common/spdlog/fmt/bundled/format.h → third_party/spdlog/fmt/bundled/format.h
diff --git a/src/common/spdlog/fmt/fmt.h → third_party/spdlog/fmt/fmt.h b/src/common/spdlog/fmt/fmt.h → third_party/spdlog/fmt/fmt.h
diff --git a/src/common/spdlog/formatter.h → third_party/spdlog/formatter.h b/src/common/spdlog/formatter.h → third_party/spdlog/formatter.h
diff --git a/src/common/spdlog/logger-inl.h → third_party/spdlog/logger-inl.h b/src/common/spdlog/logger-inl.h → third_party/spdlog/logger-inl.h
diff --git a/src/common/spdlog/logger.h → third_party/spdlog/logger.h b/src/common/spdlog/logger.h → third_party/spdlog/logger.h
diff --git a/src/common/spdlog/mdc.h → third_party/spdlog/mdc.h b/src/common/spdlog/mdc.h → third_party/spdlog/mdc.h
diff --git a/src/common/spdlog/pattern_formatter-inl.h → third_party/spdlog/pattern_formatter-inl.h b/src/common/spdlog/pattern_formatter-inl.h → third_party/spdlog/pattern_formatter-inl.h
diff --git a/src/common/spdlog/pattern_formatter.h → third_party/spdlog/pattern_formatter.h b/src/common/spdlog/pattern_formatter.h → third_party/spdlog/pattern_formatter.h
diff --git a/src/common/spdlog/sinks/ansicolor_sink-inl.h → ...d_party/spdlog/sinks/ansicolor_sink-inl.h b/src/common/spdlog/sinks/ansicolor_sink-inl.h → ...d_party/spdlog/sinks/ansicolor_sink-inl.h
diff --git a/src/common/spdlog/sinks/ansicolor_sink.h → third_party/spdlog/sinks/ansicolor_sink.h b/src/common/spdlog/sinks/ansicolor_sink.h → third_party/spdlog/sinks/ansicolor_sink.h
diff --git a/src/common/spdlog/sinks/base_sink-inl.h → third_party/spdlog/sinks/base_sink-inl.h b/src/common/spdlog/sinks/base_sink-inl.h → third_party/spdlog/sinks/base_sink-inl.h
diff --git a/src/common/spdlog/sinks/base_sink.h → third_party/spdlog/sinks/base_sink.h b/src/common/spdlog/sinks/base_sink.h → third_party/spdlog/sinks/base_sink.h
diff --git a/...common/spdlog/sinks/basic_file_sink-inl.h → ..._party/spdlog/sinks/basic_file_sink-inl.h b/...common/spdlog/sinks/basic_file_sink-inl.h → ..._party/spdlog/sinks/basic_file_sink-inl.h
diff --git a/src/common/spdlog/sinks/basic_file_sink.h → third_party/spdlog/sinks/basic_file_sink.h b/src/common/spdlog/sinks/basic_file_sink.h → third_party/spdlog/sinks/basic_file_sink.h
diff --git a/src/common/spdlog/sinks/null_sink.h → third_party/spdlog/sinks/null_sink.h b/src/common/spdlog/sinks/null_sink.h → third_party/spdlog/sinks/null_sink.h
diff --git a/src/common/spdlog/sinks/ostream_sink.h → third_party/spdlog/sinks/ostream_sink.h b/src/common/spdlog/sinks/ostream_sink.h → third_party/spdlog/sinks/ostream_sink.h
diff --git a/...mon/spdlog/sinks/rotating_file_sink-inl.h → ...rty/spdlog/sinks/rotating_file_sink-inl.h b/...mon/spdlog/sinks/rotating_file_sink-inl.h → ...rty/spdlog/sinks/rotating_file_sink-inl.h
diff --git a/src/common/spdlog/sinks/rotating_file_sink.h → ...d_party/spdlog/sinks/rotating_file_sink.h b/src/common/spdlog/sinks/rotating_file_sink.h → ...d_party/spdlog/sinks/rotating_file_sink.h
diff --git a/src/common/spdlog/sinks/sink-inl.h → third_party/spdlog/sinks/sink-inl.h b/src/common/spdlog/sinks/sink-inl.h → third_party/spdlog/sinks/sink-inl.h
diff --git a/src/common/spdlog/sinks/sink.h → third_party/spdlog/sinks/sink.h b/src/common/spdlog/sinks/sink.h → third_party/spdlog/sinks/sink.h
diff --git a/src/common/spdlog/sinks/wincolor_sink-inl.h → third_party/spdlog/sinks/wincolor_sink-inl.h b/src/common/spdlog/sinks/wincolor_sink-inl.h → third_party/spdlog/sinks/wincolor_sink-inl.h
diff --git a/src/common/spdlog/sinks/wincolor_sink.h → third_party/spdlog/sinks/wincolor_sink.h b/src/common/spdlog/sinks/wincolor_sink.h → third_party/spdlog/sinks/wincolor_sink.h
diff --git a/src/common/spdlog/spdlog-inl.h → third_party/spdlog/spdlog-inl.h b/src/common/spdlog/spdlog-inl.h → third_party/spdlog/spdlog-inl.h
diff --git a/src/common/spdlog/spdlog.h → third_party/spdlog/spdlog.h b/src/common/spdlog/spdlog.h → third_party/spdlog/spdlog.h
diff --git a/src/common/spdlog/tweakme.h → third_party/spdlog/tweakme.h b/src/common/spdlog/tweakme.h → third_party/spdlog/tweakme.h
diff --git a/src/common/spdlog/version.h → third_party/spdlog/version.h b/src/common/spdlog/version.h → third_party/spdlog/version.h