Canonicalize all includes in PyTorch. (#14849)
Summary:
Anywhere we used #include "foo.h", we now say #include <foo.h>
Paths are adjusted to be rooted out of aten/src, torch/lib, or
the root level directory.
I modified CMakeLists.txt by hand to remove TH and THC from
the include paths.
I used the following script to do the canonicalization:
```
import subprocess
import re
import os.path
files = subprocess.check_output(['git', 'ls-files']).decode('utf-8').rstrip().split('\n')
for fn in files:
if not any(fn.endswith(suff) for suff in ['.cu', '.cpp', '.in', '.h', '.hpp', '.cu', '.cuh', '.cc']):
continue
if not any(fn.startswith(pref) for pref in ["aten/", "torch/"]):
continue
with open(fn, 'r') as f:
c = f.read()
def fmt(p):
return "#include <{}>".format(p)
def repl(m):
p = m.group(1)
if p in ["dlfcn.h", "unistd.h", "nvrtc.h", "cuda.h", "cuda_runtime.h", "cstdint", "cudnn.h", "Python.h", "cusparse.h", "cuda_runtime_api.h", "cuda_fp16.h", "cublas_v2.h", "stdint.h", "curand_kernel.h"]:
return fmt(p)
if any(p.startswith(pref) for pref in ["torch/csrc", "c10/", "ATen/", "caffe2/", "TH/", "THC/", "Eigen/", "gtest/", "zdl/", "gloo/", "onnx/", "miopen/"]):
return fmt(p)
for root in ["aten/src", "torch/lib", ""]:
for bad_root in [os.path.dirname(fn), "aten/src/TH", "aten/src/THC", "torch/csrc"]:
new_p = os.path.relpath(os.path.join(bad_root, p), root)
if not new_p.startswith("../") and (os.path.exists(os.path.join(root, new_p)) or os.path.exists(os.path.join(root, new_p + ".in"))):
return fmt(new_p)
print("ERROR: ", fn, p)
return m.group(0)
new_c = re.sub(r'#include "([^"]+)"', repl, c)
if new_c != c:
print(fn)
with open(fn, 'w') as f:
f.write(new_c)
```
Signed-off-by: Edward Z. Yang <ezyang@fb.com>
Pull Request resolved: https://github.com/pytorch/pytorch/pull/14849
Reviewed By: dzhulgakov
Differential Revision: D13363445
Pulled By: ezyang
fbshipit-source-id: 52361f878a672785f9306c9e9ab2513128092b68
2018-12-09 03:32:01 +00:00
|
|
|
#include <c10d/PrefixStore.hpp>
|
2018-08-24 01:04:16 +00:00
|
|
|
|
|
|
|
|
namespace c10d {
|
|
|
|
|
|
2020-02-05 23:26:06 +00:00
|
|
|
PrefixStore::PrefixStore(
|
|
|
|
|
const std::string& prefix,
|
2020-11-12 06:49:06 +00:00
|
|
|
c10::intrusive_ptr<Store> store)
|
2018-08-24 01:04:16 +00:00
|
|
|
: prefix_(prefix), store_(store) {}
|
|
|
|
|
|
|
|
|
|
std::string PrefixStore::joinKey(const std::string& key) {
|
|
|
|
|
return prefix_ + "/" + key;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
std::vector<std::string> PrefixStore::joinKeys(
|
|
|
|
|
const std::vector<std::string>& keys) {
|
|
|
|
|
std::vector<std::string> joinedKeys;
|
|
|
|
|
joinedKeys.reserve(keys.size());
|
|
|
|
|
for (const auto& key : keys) {
|
2020-03-09 21:51:06 +00:00
|
|
|
joinedKeys.emplace_back(joinKey(key));
|
2018-08-24 01:04:16 +00:00
|
|
|
}
|
|
|
|
|
return joinedKeys;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void PrefixStore::set(
|
|
|
|
|
const std::string& key,
|
|
|
|
|
const std::vector<uint8_t>& value) {
|
2020-02-05 23:26:06 +00:00
|
|
|
store_->set(joinKey(key), value);
|
2018-08-24 01:04:16 +00:00
|
|
|
}
|
|
|
|
|
|
2021-02-08 21:41:54 +00:00
|
|
|
std::vector<uint8_t> PrefixStore::compareSet(
|
|
|
|
|
const std::string& key,
|
2021-04-29 20:55:42 +00:00
|
|
|
const std::vector<uint8_t>& expectedValue,
|
|
|
|
|
const std::vector<uint8_t>& desiredValue) {
|
|
|
|
|
return store_->compareSet(joinKey(key), expectedValue, desiredValue);
|
2021-02-08 21:41:54 +00:00
|
|
|
}
|
|
|
|
|
|
2018-08-24 01:04:16 +00:00
|
|
|
std::vector<uint8_t> PrefixStore::get(const std::string& key) {
|
2020-02-05 23:26:06 +00:00
|
|
|
return store_->get(joinKey(key));
|
2018-08-24 01:04:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int64_t PrefixStore::add(const std::string& key, int64_t value) {
|
2020-02-05 23:26:06 +00:00
|
|
|
return store_->add(joinKey(key), value);
|
2018-08-24 01:04:16 +00:00
|
|
|
}
|
|
|
|
|
|
2020-09-28 22:23:09 +00:00
|
|
|
bool PrefixStore::deleteKey(const std::string& key) {
|
|
|
|
|
return store_->deleteKey(joinKey(key));
|
|
|
|
|
}
|
|
|
|
|
|
2021-04-28 20:44:35 +00:00
|
|
|
void PrefixStore::watchKey(const std::string& key, WatchKeyCallback callback) {
|
|
|
|
|
return store_->watchKey(joinKey(key), std::move(callback));
|
|
|
|
|
}
|
|
|
|
|
|
2020-09-26 07:45:59 +00:00
|
|
|
int64_t PrefixStore::getNumKeys() {
|
|
|
|
|
return store_->getNumKeys();
|
|
|
|
|
}
|
|
|
|
|
|
2018-08-24 01:04:16 +00:00
|
|
|
bool PrefixStore::check(const std::vector<std::string>& keys) {
|
|
|
|
|
auto joinedKeys = joinKeys(keys);
|
2020-02-05 23:26:06 +00:00
|
|
|
return store_->check(joinedKeys);
|
2018-08-24 01:04:16 +00:00
|
|
|
}
|
|
|
|
|
|
2018-09-06 19:47:20 +00:00
|
|
|
void PrefixStore::wait(const std::vector<std::string>& keys) {
|
|
|
|
|
auto joinedKeys = joinKeys(keys);
|
2020-02-05 23:26:06 +00:00
|
|
|
store_->wait(joinedKeys);
|
2018-09-06 19:47:20 +00:00
|
|
|
}
|
|
|
|
|
|
2018-08-24 01:04:16 +00:00
|
|
|
void PrefixStore::wait(
|
|
|
|
|
const std::vector<std::string>& keys,
|
|
|
|
|
const std::chrono::milliseconds& timeout) {
|
|
|
|
|
auto joinedKeys = joinKeys(keys);
|
2020-02-05 23:26:06 +00:00
|
|
|
store_->wait(joinedKeys, timeout);
|
2018-08-24 01:04:16 +00:00
|
|
|
}
|
|
|
|
|
|
2021-03-15 20:21:12 +00:00
|
|
|
const std::chrono::milliseconds& PrefixStore::getTimeout() const noexcept {
|
|
|
|
|
return store_->getTimeout();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void PrefixStore::setTimeout(const std::chrono::milliseconds& timeout) {
|
|
|
|
|
store_->setTimeout(timeout);
|
|
|
|
|
}
|
|
|
|
|
|
2018-08-24 01:04:16 +00:00
|
|
|
} // namespace c10d
|