Skip to content

Commit 9bae2fc

Browse files
briancoutinhopytorchmergebot
authored andcommitted
[profiler] Enable all configured activities in CUPTI Range profiler mode (pytorch#154749)
Summary: Updates the pytorch range profiler mode (metrics mode) to support all trace activitity types. Reviewed By: sraikund16 Bifferential Revision: D75568693 Pull Request resolved: pytorch#154749 Approved by: https://github.com/sraikund16
1 parent 26f066b commit 9bae2fc

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

torch/csrc/profiler/kineto_shim.cpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -177,13 +177,15 @@ class ExperimentalConfigWrapper {
177177
return !config_.profiler_metrics.empty();
178178
}
179179

180-
void prepareTraceWithExperimentalOptions(bool add_cpu_activity) {
180+
void prepareTraceWithExperimentalOptions(
181+
std::set<libkineto::ActivityType>&& enabled_activities) {
182+
std::set<libkineto::ActivityType> k_activities =
183+
std::move(enabled_activities);
181184
#ifdef USE_KINETO
182-
std::set<libkineto::ActivityType> k_activities{
183-
libkineto::ActivityType::CUDA_PROFILER_RANGE};
185+
k_activities.insert(libkineto::ActivityType::CUDA_PROFILER_RANGE);
184186

185-
// Only add CPU activities if we are measuring per kernel ranges
186-
if (add_cpu_activity && config_.profiler_measure_per_kernel) {
187+
// Add CPU activities if we are measuring per kernel ranges
188+
if (config_.profiler_measure_per_kernel) {
187189
k_activities.insert(kCpuTypes.begin(), kCpuTypes.end());
188190
}
189191

@@ -288,7 +290,7 @@ void prepareTrace(
288290

289291
// Experimental Configuration options are present
290292
if (config && configWrap.assertValid()) {
291-
configWrap.prepareTraceWithExperimentalOptions(has_cpu_activity);
293+
configWrap.prepareTraceWithExperimentalOptions(std::move(k_activities));
292294
return;
293295
}
294296

0 commit comments

Comments
 (0)