Skip to content
16 changes: 0 additions & 16 deletions paddle/fluid/platform/profiler/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,3 @@ cc_library(
cpu_utilization
event_bind
custom_tracer)
cc_test(
test_event_node
SRCS test_event_node.cc
DEPS event_node profiler_logger)
cc_test(
test_extra_info
SRCS test_extra_info.cc
DEPS profiler_utils)
cc_test(
test_serialization_logger
SRCS dump/test_serialization_logger.cc
DEPS event_bind)
cc_test(
new_profiler_test
SRCS profiler_test.cc
DEPS new_profiler)
6 changes: 3 additions & 3 deletions paddle/fluid/platform/profiler/dump/deserialization_reader.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ namespace platform {
class DeserializationReader {
public:
explicit DeserializationReader(const std::string& filename);
explicit DeserializationReader(const char* filename);
~DeserializationReader();
std::unique_ptr<ProfilerResult> Parse();
TEST_API explicit DeserializationReader(const char* filename);
TEST_API ~DeserializationReader();
TEST_API std::unique_ptr<ProfilerResult> Parse();

private:
void OpenFile();
Expand Down
10 changes: 6 additions & 4 deletions paddle/fluid/platform/profiler/dump/serialization_logger.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License. */
#include "paddle/fluid/platform/device/gpu/gpu_info.h"
#include "paddle/fluid/platform/profiler/dump/nodetree.pb.h"
#include "paddle/fluid/platform/profiler/output_logger.h"
#include "paddle/utils/test_macros.h"

namespace paddle {
namespace platform {
Expand All @@ -28,20 +29,21 @@ namespace platform {
class SerializationLogger : public BaseLogger {
public:
explicit SerializationLogger(const std::string& filename);
explicit SerializationLogger(const char* filename);
~SerializationLogger();
TEST_API explicit SerializationLogger(const char* filename);
TEST_API ~SerializationLogger();
std::string filename() { return filename_; }
void LogDeviceTraceEventNode(const DeviceTraceEventNode&) override;
void LogHostTraceEventNode(const HostTraceEventNode&) override;
void LogRuntimeTraceEventNode(const CudaRuntimeTraceEventNode&) override;
void LogNodeTrees(const NodeTrees&) override;
void LogExtraInfo(const std::unordered_map<std::string, std::string>);
TEST_API void LogExtraInfo(
const std::unordered_map<std::string, std::string>);
void LogMemTraceEventNode(const MemTraceEventNode&) override;
#if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
void LogDeviceProperty(
const std::map<uint32_t, gpuDeviceProp>& device_property_map);
#endif
void LogMetaInfo(const std::string& version, uint32_t span_indx);
TEST_API void LogMetaInfo(const std::string& version, uint32_t span_indx);

private:
void OpenFile();
Expand Down
17 changes: 9 additions & 8 deletions paddle/fluid/platform/profiler/event_node.h
Original file line number Diff line number Diff line change
Expand Up @@ -280,9 +280,9 @@ class NodeTrees {
: thread_event_trees_map_(thread_event_trees_map) {}

// destructor
~NodeTrees();
TEST_API ~NodeTrees();

void LogMe(BaseLogger* logger);
TEST_API void LogMe(BaseLogger* logger);
void HandleTrees(std::function<void(HostTraceEventNode*)>,
std::function<void(CudaRuntimeTraceEventNode*)>,
std::function<void(DeviceTraceEventNode*)>,
Expand All @@ -291,15 +291,16 @@ class NodeTrees {
const std::map<uint64_t, HostTraceEventNode*>& GetNodeTrees() const {
return thread_event_trees_map_;
}
std::map<uint64_t, std::vector<HostTraceEventNode*>> Traverse(bool bfs) const;
TEST_API std::map<uint64_t, std::vector<HostTraceEventNode*>> Traverse(
bool bfs) const;

private:
std::map<uint64_t, HostTraceEventNode*> thread_event_trees_map_;
void BuildTrees(const std::vector<HostTraceEventNode*>&,
const std::vector<CudaRuntimeTraceEventNode*>&,
const std::vector<DeviceTraceEventNode*>&,
const std::vector<MemTraceEventNode*>&,
const std::vector<OperatorSupplementEventNode*>&);
TEST_API void BuildTrees(const std::vector<HostTraceEventNode*>&,
const std::vector<CudaRuntimeTraceEventNode*>&,
const std::vector<DeviceTraceEventNode*>&,
const std::vector<MemTraceEventNode*>&,
const std::vector<OperatorSupplementEventNode*>&);
HostTraceEventNode* BuildTreeRelationship(
std::vector<HostTraceEventNode*> host_event_nodes,
std::vector<CudaRuntimeTraceEventNode*> runtime_event_nodes,
Expand Down
2 changes: 1 addition & 1 deletion paddle/fluid/platform/profiler/event_python.h
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ class ProfilerResult {
explicit ProfilerResult(std::unique_ptr<NodeTrees> tree,
const ExtraInfo& extra_info);

~ProfilerResult();
TEST_API ~ProfilerResult();
std::map<uint64_t, HostPythonNode*> GetData() {
return thread_event_trees_map_;
}
Expand Down
5 changes: 4 additions & 1 deletion test/cpp/fluid/platform/profiler/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
# Note(Liyulingyue): create an empty cmake file to avoid conflict
add_subdirectory(dump)
paddle_test(test_event_node SRCS test_event_node.cc)
paddle_test(test_extra_info SRCS test_extra_info.cc)
paddle_test(new_profiler_test SRCS profiler_test.cc DEPS common)
1 change: 1 addition & 0 deletions test/cpp/fluid/platform/profiler/dump/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
paddle_test(test_serialization_logger SRCS test_serialization_logger.cc)