Users/mkuriche/rocprofiler sdk fmt build fix memory header (#2537)
* [rocprofiler-sdk] Fix fmt::join build errors - remedy use of fmt::join without include <fmt/ranges.h> * include memory header * Disable FMT build for SDK CI * Add -DROCPROFILER_BUILD_FMT=OFF to sanitizer steps * Add temporary workaround for rccl.h issue * Add ROCPROFILER_INTERNAL_RCCL_API_TRACE to SDK CI builds * disable clang-tidy for vendored includes --------- Co-authored-by: Jonathan R. Madsen <jonathanrmadsen@gmail.com> Co-authored-by: jbonnell-amd <jason.bonnell@amd.com>
Этот коммит содержится в:
Mythreya Kuricheti
коммит произвёл
GitHub
GitHub
родитель
5e15839611
Коммит
36d9d33d90
@@ -325,6 +325,8 @@ jobs:
|
||||
${{ matrix.system.ci-flags }} -- \
|
||||
-DROCPROFILER_DEP_ROCMCORE=ON \
|
||||
-DROCPROFILER_BUILD_DOCS=OFF \
|
||||
-DROCPROFILER_BUILD_FMT=OFF \
|
||||
-DROCPROFILER_INTERNAL_RCCL_API_TRACE=ON \
|
||||
-DCMAKE_BUILD_TYPE=${{ matrix.system.build-type }} \
|
||||
-DCMAKE_INSTALL_PREFIX=/opt/rocprofiler-sdk \
|
||||
-DCPACK_GENERATOR='DEB;RPM;TGZ' \
|
||||
@@ -632,6 +634,8 @@ jobs:
|
||||
-- \
|
||||
-DROCPROFILER_DEP_ROCMCORE=ON \
|
||||
-DROCPROFILER_BUILD_DOCS=OFF \
|
||||
-DROCPROFILER_BUILD_FMT=OFF \
|
||||
-DROCPROFILER_INTERNAL_RCCL_API_TRACE=ON \
|
||||
-DCMAKE_BUILD_TYPE=${{ matrix.system.build-type }} \
|
||||
-DCMAKE_PREFIX_PATH='${{ env.ROCM_PATH }};${{ env.ROCM_PATH }}/llvm' \
|
||||
-DPython3_EXECUTABLE=$(which python3) \
|
||||
@@ -846,6 +850,8 @@ jobs:
|
||||
--memcheck ${{ matrix.system.sanitizer }}
|
||||
--run-attempt ${{ github.run_attempt }}
|
||||
--
|
||||
-DROCPROFILER_BUILD_FMT=OFF \
|
||||
-DROCPROFILER_INTERNAL_RCCL_API_TRACE=ON \
|
||||
-DCMAKE_BUILD_TYPE=${{ matrix.system.build-type }}
|
||||
-DCMAKE_INSTALL_PREFIX="${{ env.ROCM_PATH }}"
|
||||
-DCMAKE_PREFIX_PATH='${{ env.ROCM_PATH }};${{ env.ROCM_PATH }}/llvm'
|
||||
|
||||
@@ -78,7 +78,9 @@ macro(ROCPROFILER_ACTIVATE_CLANG_TIDY)
|
||||
"path to clang-tidy executable")
|
||||
|
||||
set(CMAKE_CXX_CLANG_TIDY
|
||||
${ROCPROFILER_CLANG_TIDY_EXE} -header-filter=${PROJECT_SOURCE_DIR}/source/.*
|
||||
${ROCPROFILER_CLANG_TIDY_EXE}
|
||||
-header-filter=${PROJECT_SOURCE_DIR}/source/.*
|
||||
--exclude-header-filter=${PROJECT_SOURCE_DIR}/source/include/rocprofiler-sdk/rccl/details/.*
|
||||
--warnings-as-errors=*,-misc-header-include-cycle)
|
||||
|
||||
# Create a preprocessor definition that depends on .clang-tidy content so the
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
#include "lib/common/filesystem.hpp"
|
||||
|
||||
#include <fmt/format.h>
|
||||
#include <fmt/ranges.h>
|
||||
#include <glog/logging.h>
|
||||
#include <glog/vlog_is_on.h>
|
||||
|
||||
|
||||
@@ -56,6 +56,7 @@
|
||||
#include <rocprofiler-sdk-rocpd/types.h>
|
||||
|
||||
#include <fmt/format.h>
|
||||
#include <fmt/ranges.h>
|
||||
#include <sqlite3.h>
|
||||
#include <unistd.h>
|
||||
|
||||
|
||||
@@ -33,6 +33,7 @@
|
||||
#include <rocprofiler-sdk/marker/api_id.h>
|
||||
|
||||
#include <fmt/format.h>
|
||||
#include <fmt/ranges.h>
|
||||
|
||||
#include <unistd.h>
|
||||
#include <cstdint>
|
||||
|
||||
@@ -31,6 +31,7 @@
|
||||
#include <rocprofiler-sdk/cxx/operators.hpp>
|
||||
|
||||
#include <fmt/format.h>
|
||||
#include <fmt/ranges.h>
|
||||
#include <sqlite3.h>
|
||||
|
||||
#include <iomanip>
|
||||
|
||||
@@ -54,6 +54,7 @@
|
||||
#include <rocprofiler-sdk-rocpd/sql.h>
|
||||
|
||||
#include <fmt/format.h>
|
||||
#include <fmt/ranges.h>
|
||||
#include <gotcha/gotcha.h>
|
||||
#include <pybind11/detail/common.h>
|
||||
#include <pybind11/pybind11.h>
|
||||
|
||||
@@ -23,6 +23,9 @@
|
||||
#include "lib/python/rocpd/source/serialization/sql.hpp"
|
||||
#include "lib/output/sql/common.hpp"
|
||||
|
||||
#include <fmt/format.h>
|
||||
#include <fmt/ranges.h>
|
||||
|
||||
namespace cereal
|
||||
{
|
||||
SQLite3InputArchive::SQLite3InputArchive(sqlite3* conn,
|
||||
|
||||
@@ -31,6 +31,8 @@
|
||||
#include "lib/output/generator.hpp"
|
||||
#include "lib/output/sql/common.hpp"
|
||||
|
||||
#include <fmt/format.h>
|
||||
#include <fmt/ranges.h>
|
||||
#include <sqlite3.h>
|
||||
|
||||
#include <chrono>
|
||||
|
||||
@@ -79,6 +79,7 @@
|
||||
#include <rocprofiler-sdk/cxx/operators.hpp>
|
||||
|
||||
#include <fmt/core.h>
|
||||
#include <fmt/ranges.h>
|
||||
|
||||
#include <time.h>
|
||||
#include <unistd.h>
|
||||
|
||||
@@ -30,6 +30,7 @@
|
||||
#include <hsa/hsa_ven_amd_aqlprofile.h>
|
||||
|
||||
#include <cstdint>
|
||||
#include <memory>
|
||||
#include <optional>
|
||||
#include <string>
|
||||
#include <unordered_map>
|
||||
|
||||
@@ -39,6 +39,7 @@
|
||||
#include <rocprofiler-sdk/rocprofiler.h>
|
||||
|
||||
#include <fmt/core.h>
|
||||
#include <fmt/ranges.h>
|
||||
#include <gtest/gtest.h>
|
||||
#include <hsa/hsa.h>
|
||||
#include <hsa/hsa_api_trace.h>
|
||||
|
||||
@@ -39,6 +39,7 @@
|
||||
#include <rocprofiler-sdk/rocprofiler.h>
|
||||
|
||||
#include <fmt/core.h>
|
||||
#include <fmt/ranges.h>
|
||||
#include <gtest/gtest.h>
|
||||
#include <hsa/hsa.h>
|
||||
#include <hsa/hsa_api_trace.h>
|
||||
|
||||
@@ -31,8 +31,8 @@
|
||||
#include <hip/hip_deprecated.h>
|
||||
#include <hip/hip_version.h>
|
||||
|
||||
#include "fmt/core.h"
|
||||
#include "fmt/ranges.h"
|
||||
#include <fmt/core.h>
|
||||
#include <fmt/ranges.h>
|
||||
|
||||
#define ROCP_SDK_HIP_FORMATTER(TYPE, ...) \
|
||||
template <> \
|
||||
|
||||
@@ -22,6 +22,9 @@
|
||||
|
||||
#include "lib/rocprofiler-sdk/hsa/queue.hpp"
|
||||
|
||||
#include <fmt/format.h>
|
||||
#include <fmt/ranges.h>
|
||||
|
||||
namespace fmt
|
||||
{
|
||||
template <>
|
||||
|
||||
@@ -39,6 +39,8 @@
|
||||
#include <rocprofiler-sdk/external_correlation.h>
|
||||
#include <rocprofiler-sdk/fwd.h>
|
||||
|
||||
#include <fmt/format.h>
|
||||
#include <fmt/ranges.h>
|
||||
#include <hsa/hsa.h>
|
||||
#include <hsa/hsa_ext_amd.h>
|
||||
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <rocprofiler-sdk/cxx/details/tokenize.hpp>
|
||||
|
||||
#include <fmt/format.h>
|
||||
#include <fmt/ranges.h>
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include <cstddef>
|
||||
|
||||
Ссылка в новой задаче
Block a user