Canonicalize THD includes with .. in them

Summary: Pull Request resolved: https://github.com/pytorch/pytorch/pull/13980 Reviewed By: jerryzh168 Differential Revision: D13062706 fbshipit-source-id: 100e10d1bae7efc3e13f029708c2c1dd053ce074
2025-12-07 12:21:27 +01:00 · 2018-11-14 17:31:32 -08:00 · 2018-11-14 17:31:32 -08:00 · 72da09bb4d
commit 72da09bb4d
parent 7ea9c674bc
28 changed files with 42 additions and 42 deletions
--- a/torch/lib/THD/CMakeLists.txt
+++ b/torch/lib/THD/CMakeLists.txt
@ -105,7 +105,7 @@ SET(all_h THD.h ${base_h} ${process_group_h})

 EXCLUDE_DIR(all_cpp ".*/generic/.*\\.cpp$")

-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/..")

 ADD_LIBRARY(THD STATIC ${all_cpp})

--- a/torch/lib/THD/THD.h
+++ b/torch/lib/THD/THD.h
@ -7,14 +7,14 @@
 #endif

 #ifndef _THD_CORE
-#include "base/DataChannelRequest.h"
-#include "base/TensorDescriptor.h"
+#include <THD/base/DataChannelRequest.h>
+#include <THD/base/TensorDescriptor.h>
 #else
-#include "base/DataChannelRequest.hpp"
-#include "base/TensorDescriptor.hpp"
+#include <THD/base/DataChannelRequest.hpp>
+#include <THD/base/TensorDescriptor.hpp>
 #endif
-#include "base/ChannelType.h"
-#include "base/Cuda.h"
+#include <THD/base/ChannelType.h>
+#include <THD/base/Cuda.h>

-#include "process_group/Collectives.h"
-#include "process_group/General.h"
+#include <THD/process_group/Collectives.h>
+#include <THD/process_group/General.h>
--- a/torch/lib/THD/base/Cuda.h
+++ b/torch/lib/THD/base/Cuda.h
@ -1,7 +1,7 @@
 #pragma once

 #ifdef USE_CUDA
-#include "../THD.h"
+#include <THD/THD.h>

 #include <THC/THC.h>

--- a/torch/lib/THD/base/DataChannelRequest.h
+++ b/torch/lib/THD/base/DataChannelRequest.h
@ -1,6 +1,6 @@
 #pragma once

-#include "../THD.h"
+#include <THD/THD.h>

 #ifndef _THD_CORE
 struct _THDRequest;
--- a/torch/lib/THD/base/TensorDescriptor.h
+++ b/torch/lib/THD/base/TensorDescriptor.h
@ -1,7 +1,7 @@
 #pragma once

 #include <TH/TH.h>
-#include "../THD.h"
+#include <THD/THD.h>
 #ifdef USE_CUDA
 #include <THC/THC.h>
 #endif
--- a/torch/lib/THD/base/data_channels/DataChannelGloo.hpp
+++ b/torch/lib/THD/base/data_channels/DataChannelGloo.hpp
@ -1,7 +1,7 @@
 #pragma once

-#include "../ChannelUtils.hpp"
-#include "../DataChannel.hpp"
+#include <THD/base/ChannelUtils.hpp>
+#include <THD/base/DataChannel.hpp>
 #include "DataChannelUtils.hpp"

 #include "gloo/rendezvous/store.h"
--- a/torch/lib/THD/base/data_channels/DataChannelMPI.hpp
+++ b/torch/lib/THD/base/data_channels/DataChannelMPI.hpp
@ -1,6 +1,6 @@
 #pragma once

-#include "../DataChannel.hpp"
+#include <THD/base/DataChannel.hpp>

 #include <mpi.h>
 #include <memory>
--- a/torch/lib/THD/base/data_channels/DataChannelNccl.cpp
+++ b/torch/lib/THD/base/data_channels/DataChannelNccl.cpp
@ -1,5 +1,5 @@
 #include "DataChannelNccl.hpp"
-#include "../Cuda.hpp"
+#include <THD/base/Cuda.hpp>
 #include "DataChannelUtils.hpp"

 #include <ATen/ATen.h>
--- a/torch/lib/THD/base/data_channels/DataChannelNccl.hpp
+++ b/torch/lib/THD/base/data_channels/DataChannelNccl.hpp
@ -1,6 +1,6 @@
 #pragma once

-#include "../DataChannel.hpp"
+#include <THD/base/DataChannel.hpp>
 #include "DataChannelUtils.hpp"

 #include <nccl.h>
--- a/torch/lib/THD/base/data_channels/DataChannelTCP.hpp
+++ b/torch/lib/THD/base/data_channels/DataChannelTCP.hpp
@ -1,6 +1,6 @@
 #pragma once

-#include "../DataChannel.hpp"
+#include <THD/base/DataChannel.hpp>
 #include "DataChannelUtils.hpp"

 #include <sys/poll.h>
--- a/torch/lib/THD/base/data_channels/DataChannelUtils.hpp
+++ b/torch/lib/THD/base/data_channels/DataChannelUtils.hpp
@ -1,6 +1,6 @@
 #pragma once

-#include "../DataChannel.hpp"
+#include <THD/base/DataChannel.hpp>

 #include <atomic>
 #include <condition_variable>
--- a/torch/lib/THD/base/data_channels/GlooCache.hpp
+++ b/torch/lib/THD/base/data_channels/GlooCache.hpp
@ -1,8 +1,8 @@
 #pragma once

-#include "../ChannelUtils.hpp"
-#include "../Cuda.hpp"
-#include "../DataChannel.hpp"
+#include <THD/base/ChannelUtils.hpp>
+#include <THD/base/Cuda.hpp>
+#include <THD/base/DataChannel.hpp>

 #include "gloo/algorithm.h"
 #include "gloo/allgather_ring.h"
--- a/torch/lib/THD/base/data_channels/Store.cpp
+++ b/torch/lib/THD/base/data_channels/Store.cpp
@ -1,5 +1,5 @@
 #include "Store.hpp"
-#include "../ChannelUtils.hpp"
+#include <THD/base/ChannelUtils.hpp>

 #include <poll.h>
 #include <unistd.h>
--- a/torch/lib/THD/base/data_channels/Store.hpp
+++ b/torch/lib/THD/base/data_channels/Store.hpp
@ -1,6 +1,6 @@
 #pragma once

-#include "../ChannelUtils.hpp"
+#include <THD/base/ChannelUtils.hpp>
 #include "gloo/rendezvous/store.h"

 #include <memory>
--- a/torch/lib/THD/base/init_methods/InitMethod.hpp
+++ b/torch/lib/THD/base/init_methods/InitMethod.hpp
@ -1,6 +1,6 @@
 #pragma once

-#include "../ChannelUtils.hpp"
+#include <THD/base/ChannelUtils.hpp>

 #include <stdexcept>
 #include <string>
--- a/torch/lib/THD/base/init_methods/InitMethodUtils.hpp
+++ b/torch/lib/THD/base/init_methods/InitMethodUtils.hpp
@ -1,6 +1,6 @@
 #pragma once

-#include "../ChannelUtils.hpp"
+#include <THD/base/ChannelUtils.hpp>

 #include <string>
 #include <vector>
--- a/torch/lib/THD/process_group/Collectives.cpp
+++ b/torch/lib/THD/process_group/Collectives.cpp
@ -1,5 +1,5 @@
 #include "Collectives.hpp"
-#include "../base/ChannelUtils.hpp"
+#include <THD/base/ChannelUtils.hpp>
 #include "General.hpp"

 #include <vector>
--- a/torch/lib/THD/process_group/Collectives.h
+++ b/torch/lib/THD/process_group/Collectives.h
@ -1,7 +1,7 @@
 #pragma once

-#include "../THD.h"
-#include "../base/DataChannel.h"
+#include <THD/THD.h>
+#include <THD/base/DataChannel.h>

 THD_API int THDGetRank();
 THD_API int THDGetNumProcesses();
--- a/torch/lib/THD/process_group/Collectives.hpp
+++ b/torch/lib/THD/process_group/Collectives.hpp
@ -1,4 +1,4 @@
 #pragma once

 #include "Collectives.h"
-#include "base/TensorDescriptor.hpp"
+#include <THD/base/TensorDescriptor.hpp>
--- a/torch/lib/THD/process_group/General.cpp
+++ b/torch/lib/THD/process_group/General.cpp
@ -1,5 +1,5 @@
 #include "General.hpp"
-#include "../base/Exceptions.hpp"
+#include <THD/base/Exceptions.hpp>

 namespace thd {
 std::unique_ptr<DataChannel> dataChannel;
--- a/torch/lib/THD/process_group/General.h
+++ b/torch/lib/THD/process_group/General.h
@ -1,8 +1,8 @@
 #pragma once

 #include <string>
-#include "../THD.h"
-#include "../base/DataChannel.h"
+#include <THD/THD.h>
+#include <THD/base/DataChannel.h>

 THD_API void THDProcessGroupInit(
    THDChannelType channel_type,
--- a/torch/lib/THD/process_group/General.hpp
+++ b/torch/lib/THD/process_group/General.hpp
@ -2,7 +2,7 @@

 #include <memory>
 #include "General.h"
-#include "base/DataChannel.hpp"
+#include <THD/base/DataChannel.hpp>

 namespace thd {
 extern std::unique_ptr<DataChannel> dataChannel;
--- a/torch/lib/THD/test/data_channel_collectives.cpp
+++ b/torch/lib/THD/test/data_channel_collectives.cpp
@ -1,10 +1,10 @@
 #ifdef WITH_GLOO
-#include "../base/data_channels/DataChannelGloo.hpp"
+#include <THD/base/data_channels/DataChannelGloo.hpp>
 #endif // WITH_GLOO
 #ifdef WITH_MPI
-#include "../base/data_channels/DataChannelMPI.hpp"
+#include <THD/base/data_channels/DataChannelMPI.hpp>
 #endif // WITH_MPI
-#include "../base/data_channels/DataChannelTCP.hpp"
+#include <THD/base/data_channels/DataChannelTCP.hpp>
 #include "TestUtils.hpp"

 #include <THPP/tensors/THTensor.hpp>
--- a/torch/lib/THD/test/data_channel_gloo_cache.cpp
+++ b/torch/lib/THD/test/data_channel_gloo_cache.cpp
@ -1,4 +1,4 @@
-#include "../base/data_channels/DataChannelGloo.hpp"
+#include <THD/base/data_channels/DataChannelGloo.hpp>
 #include "TestUtils.hpp"

 #include <THPP/tensors/THTensor.hpp>
--- a/torch/lib/THD/test/data_channel_mpi_smoke.cpp
+++ b/torch/lib/THD/test/data_channel_mpi_smoke.cpp
@ -1,4 +1,4 @@
-#include "../base/data_channels/DataChannelMPI.hpp"
+#include <THD/base/data_channels/DataChannelMPI.hpp>

 #include <unistd.h>
 #include <cassert>
--- a/torch/lib/THD/test/data_channel_tcp_accept_timeout.cpp
+++ b/torch/lib/THD/test/data_channel_tcp_accept_timeout.cpp
@ -1,4 +1,4 @@
-#include "../base/data_channels/DataChannelTCP.hpp"
+#include <THD/base/data_channels/DataChannelTCP.hpp>
 #include "TestUtils.hpp"

 #include <cassert>
--- a/torch/lib/THD/test/data_channel_tcp_slow_master.cpp
+++ b/torch/lib/THD/test/data_channel_tcp_slow_master.cpp
@ -1,4 +1,4 @@
-#include "../base/data_channels/DataChannelTCP.hpp"
+#include <THD/base/data_channels/DataChannelTCP.hpp>
 #include "TestUtils.hpp"

 #include <THPP/tensors/THTensor.hpp>
--- a/torch/lib/THD/test/data_channel_tcp_smoke.cpp
+++ b/torch/lib/THD/test/data_channel_tcp_smoke.cpp
@ -1,4 +1,4 @@
-#include "../base/data_channels/DataChannelTCP.hpp"
+#include <THD/base/data_channels/DataChannelTCP.hpp>
 #include "TestUtils.hpp"

 #include <THPP/tensors/THTensor.hpp>