Skip to content

Commit

Permalink
[caffe2][SDT] Check whether TORCH_DISABLE_SDT macro is defined befo…
Browse files Browse the repository at this point in the history
…re referencing it (pytorch#107149)

Summary:
Some jobs in the next diff in stack (D48229150) fail with the following message:

```
stderr: In file included from xplat/caffe2/c10/cuda/CUDACachingAllocator.cpp:9:
xplat/caffe2/c10/util/static_tracepoint.h:4:6: error: 'TORCH_DISABLE_SDT' is not defined, evaluates to 0 [-Werror,-Wundef]
    !TORCH_DISABLE_SDT
```

When porting USDT macros to PyTorch in D47159249, I must have not hit a codepath which treated warnings as errors during testing.

This diff fixes the issue by first checking whether the `TORCH_DISABLE_SDT` macro is defined before trying to access it in the `static_tracepoint.h` header.

Test Plan:
Similar to D47159249, tested the following macro on test scripts with `libbpf` USDTs:
* `CAFFE_DISABLE_SDT`

Reviewed By: chaekit

Differential Revision: D48251736

Pull Request resolved: pytorch#107149
Approved by: https://github.com/chaekit
  • Loading branch information
vlad-scherbich authored and summerdo committed Aug 17, 2023
1 parent cf4178f commit 231a199
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion c10/util/static_tracepoint.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#if defined(__ELF__) && (defined(__x86_64__) || defined(__i386__)) && \
!TORCH_DISABLE_SDT
!(defined(TORCH_DISABLE_SDT) && TORCH_DISABLE_SDT)

#define TORCH_HAVE_SDT 1

Expand Down

0 comments on commit 231a199

Please sign in to comment.