Drop src/torchcodec/_core/ when including headers from _core

Dmitry Rogozhkin · Dmitry Rogozhkin · commit 0afe054b4ff9 · 2025-10-27T11:25:40.000-07:00
To facilitate development of out-of-tree torchcodec features (such as
non-cuda gpu plugins) we need to make torchcodec headers includable
by 3rd party projects. This means dropping `src/torchcodec/_core/`
prefix when torchcodec self-includes headers.

Signed-off-by: Dmitry Rogozhkin &lt;dmitry.v.rogozhkin@gmail.com&gt;
diff --git a/src/torchcodec/_core/AVIOContextHolder.cpp b/src/torchcodec/_core/AVIOContextHolder.cpp
@@ -4,7 +4,7 @@
 // This source code is licensed under the BSD-style license found in the
 // LICENSE file in the root directory of this source tree.
 
-#include "src/torchcodec/_core/AVIOContextHolder.h"
+#include "AVIOContextHolder.h"
 #include <torch/types.h>
 
 namespace facebook::torchcodec {
diff --git a/src/torchcodec/_core/AVIOContextHolder.h b/src/torchcodec/_core/AVIOContextHolder.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "src/torchcodec/_core/FFMPEGCommon.h"
+#include "FFMPEGCommon.h"
 
 namespace facebook::torchcodec {
 
diff --git a/src/torchcodec/_core/AVIOFileLikeContext.cpp b/src/torchcodec/_core/AVIOFileLikeContext.cpp
@@ -4,7 +4,7 @@
 // This source code is licensed under the BSD-style license found in the
 // LICENSE file in the root directory of this source tree.
 
-#include "src/torchcodec/_core/AVIOFileLikeContext.h"
+#include "AVIOFileLikeContext.h"
 #include <torch/types.h>
 
 namespace facebook::torchcodec {
diff --git a/src/torchcodec/_core/AVIOFileLikeContext.h b/src/torchcodec/_core/AVIOFileLikeContext.h
@@ -9,7 +9,7 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "src/torchcodec/_core/AVIOContextHolder.h"
+#include "AVIOContextHolder.h"
 
 namespace py = pybind11;
 
diff --git a/src/torchcodec/_core/AVIOTensorContext.cpp b/src/torchcodec/_core/AVIOTensorContext.cpp
@@ -4,7 +4,7 @@
 // This source code is licensed under the BSD-style license found in the
 // LICENSE file in the root directory of this source tree.
 
-#include "src/torchcodec/_core/AVIOTensorContext.h"
+#include "AVIOTensorContext.h"
 #include <torch/types.h>
 
 namespace facebook::torchcodec {
diff --git a/src/torchcodec/_core/AVIOTensorContext.h b/src/torchcodec/_core/AVIOTensorContext.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <torch/types.h>
-#include "src/torchcodec/_core/AVIOContextHolder.h"
+#include "AVIOContextHolder.h"
 
 namespace facebook::torchcodec {
 
diff --git a/src/torchcodec/_core/BetaCudaDeviceInterface.cpp b/src/torchcodec/_core/BetaCudaDeviceInterface.cpp
@@ -9,15 +9,15 @@
 #include <mutex>
 #include <vector>
 
-#include "src/torchcodec/_core/BetaCudaDeviceInterface.h"
+#include "BetaCudaDeviceInterface.h"
 
-#include "src/torchcodec/_core/DeviceInterface.h"
-#include "src/torchcodec/_core/FFMPEGCommon.h"
-#include "src/torchcodec/_core/NVDECCache.h"
+#include "DeviceInterface.h"
+#include "FFMPEGCommon.h"
+#include "NVDECCache.h"
 
-#include "src/torchcodec/_core/NVCUVIDRuntimeLoader.h"
-#include "src/torchcodec/_core/nvcuvid_include/cuviddec.h"
-#include "src/torchcodec/_core/nvcuvid_include/nvcuvid.h"
+#include "NVCUVIDRuntimeLoader.h"
+#include "nvcuvid_include/cuviddec.h"
+#include "nvcuvid_include/nvcuvid.h"
 
 extern "C" {
 #include <libavutil/hwcontext_cuda.h>
diff --git a/src/torchcodec/_core/BetaCudaDeviceInterface.h b/src/torchcodec/_core/BetaCudaDeviceInterface.h
@@ -15,11 +15,11 @@
 
 #pragma once
 
-#include "src/torchcodec/_core/CUDACommon.h"
-#include "src/torchcodec/_core/Cache.h"
-#include "src/torchcodec/_core/DeviceInterface.h"
-#include "src/torchcodec/_core/FFMPEGCommon.h"
-#include "src/torchcodec/_core/NVDECCache.h"
+#include "CUDACommon.h"
+#include "Cache.h"
+#include "DeviceInterface.h"
+#include "FFMPEGCommon.h"
+#include "NVDECCache.h"
 
 #include <map>
 #include <memory>
@@ -28,8 +28,8 @@
 #include <unordered_map>
 #include <vector>
 
-#include "src/torchcodec/_core/nvcuvid_include/cuviddec.h"
-#include "src/torchcodec/_core/nvcuvid_include/nvcuvid.h"
+#include "nvcuvid_include/cuviddec.h"
+#include "nvcuvid_include/nvcuvid.h"
 
 namespace facebook::torchcodec {
 
diff --git a/src/torchcodec/_core/CUDACommon.cpp b/src/torchcodec/_core/CUDACommon.cpp
@@ -4,8 +4,8 @@
 // This source code is licensed under the BSD-style license found in the
 // LICENSE file in the root directory of this source tree.
 
-#include "src/torchcodec/_core/CUDACommon.h"
-#include "src/torchcodec/_core/Cache.h" // for PerGpuCache
+#include "CUDACommon.h"
+#include "Cache.h" // for PerGpuCache
 
 namespace facebook::torchcodec {
 
diff --git a/src/torchcodec/_core/CUDACommon.h b/src/torchcodec/_core/CUDACommon.h
@@ -11,8 +11,8 @@
 #include <npp.h>
 #include <torch/types.h>
 
-#include "src/torchcodec/_core/FFMPEGCommon.h"
-#include "src/torchcodec/_core/Frame.h"
+#include "FFMPEGCommon.h"
+#include "Frame.h"
 
 extern "C" {
 #include <libavutil/hwcontext_cuda.h>
diff --git a/src/torchcodec/_core/CpuDeviceInterface.cpp b/src/torchcodec/_core/CpuDeviceInterface.cpp
@@ -4,7 +4,7 @@
 // This source code is licensed under the BSD-style license found in the
 // LICENSE file in the root directory of this source tree.
 
-#include "src/torchcodec/_core/CpuDeviceInterface.h"
+#include "CpuDeviceInterface.h"
 
 namespace facebook::torchcodec {
 namespace {
diff --git a/src/torchcodec/_core/CpuDeviceInterface.h b/src/torchcodec/_core/CpuDeviceInterface.h
@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include "src/torchcodec/_core/DeviceInterface.h"
-#include "src/torchcodec/_core/FFMPEGCommon.h"
-#include "src/torchcodec/_core/FilterGraph.h"
+#include "DeviceInterface.h"
+#include "FFMPEGCommon.h"
+#include "FilterGraph.h"
 
 namespace facebook::torchcodec {
 
diff --git a/src/torchcodec/_core/CudaDeviceInterface.cpp b/src/torchcodec/_core/CudaDeviceInterface.cpp
@@ -3,9 +3,9 @@
 #include <torch/types.h>
 #include <mutex>
 
-#include "src/torchcodec/_core/Cache.h"
-#include "src/torchcodec/_core/CudaDeviceInterface.h"
-#include "src/torchcodec/_core/FFMPEGCommon.h"
+#include "Cache.h"
+#include "CudaDeviceInterface.h"
+#include "FFMPEGCommon.h"
 
 extern "C" {
 #include <libavutil/hwcontext_cuda.h>
diff --git a/src/torchcodec/_core/CudaDeviceInterface.h b/src/torchcodec/_core/CudaDeviceInterface.h
@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include "src/torchcodec/_core/CUDACommon.h"
-#include "src/torchcodec/_core/DeviceInterface.h"
-#include "src/torchcodec/_core/FilterGraph.h"
+#include "CUDACommon.h"
+#include "DeviceInterface.h"
+#include "FilterGraph.h"
 
 namespace facebook::torchcodec {
 
diff --git a/src/torchcodec/_core/DeviceInterface.cpp b/src/torchcodec/_core/DeviceInterface.cpp
@@ -4,7 +4,7 @@
 // This source code is licensed under the BSD-style license found in the
 // LICENSE file in the root directory of this source tree.
 
-#include "src/torchcodec/_core/DeviceInterface.h"
+#include "DeviceInterface.h"
 #include <map>
 #include <mutex>
 
diff --git a/src/torchcodec/_core/DeviceInterface.h b/src/torchcodec/_core/DeviceInterface.h
@@ -12,9 +12,9 @@
 #include <stdexcept>
 #include <string>
 #include "FFMPEGCommon.h"
-#include "src/torchcodec/_core/Frame.h"
-#include "src/torchcodec/_core/StreamOptions.h"
-#include "src/torchcodec/_core/Transform.h"
+#include "Frame.h"
+#include "StreamOptions.h"
+#include "Transform.h"
 
 namespace facebook::torchcodec {
 
diff --git a/src/torchcodec/_core/Encoder.cpp b/src/torchcodec/_core/Encoder.cpp
@@ -1,7 +1,7 @@
 #include <sstream>
 
-#include "src/torchcodec/_core/AVIOTensorContext.h"
-#include "src/torchcodec/_core/Encoder.h"
+#include "AVIOTensorContext.h"
+#include "Encoder.h"
 #include "torch/types.h"
 
 namespace facebook::torchcodec {
diff --git a/src/torchcodec/_core/Encoder.h b/src/torchcodec/_core/Encoder.h
@@ -1,8 +1,8 @@
 #pragma once
 #include <torch/types.h>
-#include "src/torchcodec/_core/AVIOContextHolder.h"
-#include "src/torchcodec/_core/FFMPEGCommon.h"
-#include "src/torchcodec/_core/StreamOptions.h"
+#include "AVIOContextHolder.h"
+#include "FFMPEGCommon.h"
+#include "StreamOptions.h"
 
 namespace facebook::torchcodec {
 class AudioEncoder {
diff --git a/src/torchcodec/_core/FFMPEGCommon.cpp b/src/torchcodec/_core/FFMPEGCommon.cpp
@@ -4,7 +4,7 @@
 // This source code is licensed under the BSD-style license found in the
 // LICENSE file in the root directory of this source tree.
 
-#include "src/torchcodec/_core/FFMPEGCommon.h"
+#include "FFMPEGCommon.h"
 
 #include <c10/util/Exception.h>
 
diff --git a/src/torchcodec/_core/FilterGraph.cpp b/src/torchcodec/_core/FilterGraph.cpp
@@ -4,8 +4,8 @@
 // This source code is licensed under the BSD-style license found in the
 // LICENSE file in the root directory of this source tree.
 
-#include "src/torchcodec/_core/FilterGraph.h"
-#include "src/torchcodec/_core/FFMPEGCommon.h"
+#include "FilterGraph.h"
+#include "FFMPEGCommon.h"
 
 extern "C" {
 #include <libavfilter/buffersink.h>
diff --git a/src/torchcodec/_core/FilterGraph.h b/src/torchcodec/_core/FilterGraph.h
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include "src/torchcodec/_core/FFMPEGCommon.h"
-#include "src/torchcodec/_core/StreamOptions.h"
+#include "FFMPEGCommon.h"
+#include "StreamOptions.h"
 
 namespace facebook::torchcodec {
 
diff --git a/src/torchcodec/_core/Frame.cpp b/src/torchcodec/_core/Frame.cpp
@@ -4,7 +4,7 @@
 // This source code is licensed under the BSD-style license found in the
 // LICENSE file in the root directory of this source tree.
 
-#include "src/torchcodec/_core/Frame.h"
+#include "Frame.h"
 
 namespace facebook::torchcodec {
 
diff --git a/src/torchcodec/_core/Frame.h b/src/torchcodec/_core/Frame.h
@@ -7,9 +7,9 @@
 #pragma once
 
 #include <torch/types.h>
-#include "src/torchcodec/_core/FFMPEGCommon.h"
-#include "src/torchcodec/_core/Metadata.h"
-#include "src/torchcodec/_core/StreamOptions.h"
+#include "FFMPEGCommon.h"
+#include "Metadata.h"
+#include "StreamOptions.h"
 
 namespace facebook::torchcodec {
 
diff --git a/src/torchcodec/_core/NVCUVIDRuntimeLoader.cpp b/src/torchcodec/_core/NVCUVIDRuntimeLoader.cpp
@@ -17,10 +17,10 @@ bool loadNVCUVIDLibrary() {
 } // namespace facebook::torchcodec
 #else
 
-#include "src/torchcodec/_core/NVCUVIDRuntimeLoader.h"
+#include "NVCUVIDRuntimeLoader.h"
 
-#include "src/torchcodec/_core/nvcuvid_include/cuviddec.h"
-#include "src/torchcodec/_core/nvcuvid_include/nvcuvid.h"
+#include "nvcuvid_include/cuviddec.h"
+#include "nvcuvid_include/nvcuvid.h"
 
 #include <torch/types.h>
 #include <cstdio>
diff --git a/src/torchcodec/_core/NVDECCache.cpp b/src/torchcodec/_core/NVDECCache.cpp
@@ -7,9 +7,9 @@
 #include <torch/types.h>
 #include <mutex>
 
-#include "src/torchcodec/_core/CUDACommon.h"
-#include "src/torchcodec/_core/FFMPEGCommon.h"
-#include "src/torchcodec/_core/NVDECCache.h"
+#include "CUDACommon.h"
+#include "FFMPEGCommon.h"
+#include "NVDECCache.h"
 
 #include <cuda_runtime.h> // For cudaGetDevice
 
diff --git a/src/torchcodec/_core/NVDECCache.h b/src/torchcodec/_core/NVDECCache.h
@@ -13,9 +13,9 @@
 #include <cuda.h>
 #include <torch/types.h>
 
-#include "src/torchcodec/_core/NVCUVIDRuntimeLoader.h"
-#include "src/torchcodec/_core/nvcuvid_include/cuviddec.h"
-#include "src/torchcodec/_core/nvcuvid_include/nvcuvid.h"
+#include "NVCUVIDRuntimeLoader.h"
+#include "nvcuvid_include/cuviddec.h"
+#include "nvcuvid_include/nvcuvid.h"
 
 namespace facebook::torchcodec {
 
diff --git a/src/torchcodec/_core/SingleStreamDecoder.cpp b/src/torchcodec/_core/SingleStreamDecoder.cpp
@@ -4,7 +4,7 @@
 // This source code is licensed under the BSD-style license found in the
 // LICENSE file in the root directory of this source tree.
 
-#include "src/torchcodec/_core/SingleStreamDecoder.h"
+#include "SingleStreamDecoder.h"
 #include <cstdint>
 #include <cstdio>
 #include <iostream>
diff --git a/src/torchcodec/_core/SingleStreamDecoder.h b/src/torchcodec/_core/SingleStreamDecoder.h
@@ -12,12 +12,12 @@
 #include <ostream>
 #include <string_view>
 
-#include "src/torchcodec/_core/AVIOContextHolder.h"
-#include "src/torchcodec/_core/DeviceInterface.h"
-#include "src/torchcodec/_core/FFMPEGCommon.h"
-#include "src/torchcodec/_core/Frame.h"
-#include "src/torchcodec/_core/StreamOptions.h"
-#include "src/torchcodec/_core/Transform.h"
+#include "AVIOContextHolder.h"
+#include "DeviceInterface.h"
+#include "FFMPEGCommon.h"
+#include "Frame.h"
+#include "StreamOptions.h"
+#include "Transform.h"
 
 namespace facebook::torchcodec {
 
diff --git a/src/torchcodec/_core/Transform.cpp b/src/torchcodec/_core/Transform.cpp
@@ -4,9 +4,9 @@
 // This source code is licensed under the BSD-style license found in the
 // LICENSE file in the root directory of this source tree.
 
-#include "src/torchcodec/_core/Transform.h"
+#include "Transform.h"
 #include <torch/types.h>
-#include "src/torchcodec/_core/FFMPEGCommon.h"
+#include "FFMPEGCommon.h"
 
 namespace facebook::torchcodec {
 
diff --git a/src/torchcodec/_core/Transform.h b/src/torchcodec/_core/Transform.h
@@ -8,8 +8,8 @@
 
 #include <optional>
 #include <string>
-#include "src/torchcodec/_core/Frame.h"
-#include "src/torchcodec/_core/Metadata.h"
+#include "Frame.h"
+#include "Metadata.h"
 
 namespace facebook::torchcodec {
 
diff --git a/src/torchcodec/_core/ValidationUtils.cpp b/src/torchcodec/_core/ValidationUtils.cpp
@@ -4,7 +4,7 @@
 // This source code is licensed under the BSD-style license found in the
 // LICENSE file in the root directory of this source tree.
 
-#include "src/torchcodec/_core/ValidationUtils.h"
+#include "ValidationUtils.h"
 #include <limits>
 #include "c10/util/Exception.h"
 
diff --git a/src/torchcodec/_core/custom_ops.cpp b/src/torchcodec/_core/custom_ops.cpp
@@ -10,11 +10,11 @@
 #include <string>
 #include "c10/core/SymIntArrayRef.h"
 #include "c10/util/Exception.h"
-#include "src/torchcodec/_core/AVIOFileLikeContext.h"
-#include "src/torchcodec/_core/AVIOTensorContext.h"
-#include "src/torchcodec/_core/Encoder.h"
-#include "src/torchcodec/_core/SingleStreamDecoder.h"
-#include "src/torchcodec/_core/ValidationUtils.h"
+#include "AVIOFileLikeContext.h"
+#include "AVIOTensorContext.h"
+#include "Encoder.h"
+#include "SingleStreamDecoder.h"
+#include "ValidationUtils.h"
 
 namespace facebook::torchcodec {
 
diff --git a/src/torchcodec/_core/pybind_ops.cpp b/src/torchcodec/_core/pybind_ops.cpp
@@ -8,7 +8,7 @@
 #include <pybind11/stl.h>
 #include <cstdint>
 
-#include "src/torchcodec/_core/AVIOFileLikeContext.h"
+#include "AVIOFileLikeContext.h"
 
 namespace py = pybind11;
 
