Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI test with CUDA 11.0 + Perfetto connector fix (bringing PR 212 to completion) #262

Closed
wants to merge 19 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .github/workflows/build-with-kokkos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ jobs:
repository: kokkos/kokkos
path: kokkos
ref: develop
- name: Ensure non-interactive frontend.
run : |
echo "DEBIAN_FRONTEND=noninteractive" >> $GITHUB_ENV
- name: Install compilers
run : |
apt update
Expand Down Expand Up @@ -71,6 +74,18 @@ jobs:
exit -1
esac

# Add Kitware's APT source to get the latest CMake version (or at least newer than 3.19 to support JSON presets).
# See also https://apt.kitware.com/.
- name: Add Kitware's APT source to get the latest CMake version.
run : |
apt --yes --no-install-recommends install wget lsb-release ca-certificates gnupg
wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/kitware.list >/dev/null
apt update
rm /usr/share/keyrings/kitware-archive-keyring.gpg
apt --no-install-recommends --yes install kitware-archive-keyring
apt policy cmake

- name: Install git, CMake, OpenMPI, PAPI and dtrace
run: |
apt --yes --no-install-recommends install \
Expand Down
2 changes: 1 addition & 1 deletion profiling/perfetto-connector/perfetto/perfetto.cc
Original file line number Diff line number Diff line change
Expand Up @@ -49830,7 +49830,7 @@ constexpr uint8_t kChunkNeedsPatching =
} // namespace.

constexpr size_t TraceBuffer::ChunkRecord::kMaxSize;
constexpr size_t TraceBuffer::InlineChunkHeaderSize = sizeof(ChunkRecord);
const size_t TraceBuffer::InlineChunkHeaderSize = sizeof(ChunkRecord);

// static
std::unique_ptr<TraceBuffer> TraceBuffer::Create(size_t size_in_bytes,
Expand Down
34 changes: 10 additions & 24 deletions profiling/perfetto-connector/perfetto/perfetto.h
Original file line number Diff line number Diff line change
Expand Up @@ -6318,7 +6318,16 @@ enum TraceConfig_LockdownModeOperation : int;
enum TraceConfig_CompressionType : int;
enum TraceConfig_StatsdLogging : int;
enum TraceConfig_TriggerConfig_TriggerMode : int;
enum BuiltinClock : int;
enum BuiltinClock : int {
BUILTIN_CLOCK_UNKNOWN = 0,
BUILTIN_CLOCK_REALTIME = 1,
BUILTIN_CLOCK_REALTIME_COARSE = 2,
BUILTIN_CLOCK_MONOTONIC = 3,
BUILTIN_CLOCK_MONOTONIC_COARSE = 4,
BUILTIN_CLOCK_MONOTONIC_RAW = 5,
BUILTIN_CLOCK_BOOTTIME = 6,
BUILTIN_CLOCK_MAX_ID = 63,
};
enum DataSourceConfig_SessionInitiator : int;
enum ChromeConfig_ClientPriority : int;
enum TraceConfig_BufferConfig_FillPolicy : int;
Expand Down Expand Up @@ -19744,34 +19753,11 @@ enum AndroidLogPriority : int {
// gen_amalgamated expanded: #include "perfetto/protozero/copyable_ptr.h"
// gen_amalgamated expanded: #include "perfetto/base/export.h"

namespace perfetto {
namespace protos {
namespace gen {
enum BuiltinClock : int;
} // namespace perfetto
} // namespace protos
} // namespace gen

namespace protozero {
class Message;
} // namespace protozero

namespace perfetto {
namespace protos {
namespace gen {
enum BuiltinClock : int {
BUILTIN_CLOCK_UNKNOWN = 0,
BUILTIN_CLOCK_REALTIME = 1,
BUILTIN_CLOCK_REALTIME_COARSE = 2,
BUILTIN_CLOCK_MONOTONIC = 3,
BUILTIN_CLOCK_MONOTONIC_COARSE = 4,
BUILTIN_CLOCK_MONOTONIC_RAW = 5,
BUILTIN_CLOCK_BOOTTIME = 6,
BUILTIN_CLOCK_MAX_ID = 63,
};
} // namespace perfetto
} // namespace protos
} // namespace gen

#endif // PERFETTO_PROTOS_PROTOS_PERFETTO_COMMON_BUILTIN_CLOCK_PROTO_CPP_H_
// gen_amalgamated begin header: gen/protos/perfetto/common/commit_data_request.gen.h
Expand Down
Loading