Move generic functions

This changeset moves a few generic functions from cuda_compilation_cache to compilation_cache

Author: nicolasvasilache

tc/core/compilation_cache.cc

@@ -123,4 +123,19 @@ bool detail::TensorInfo::operator<(const TensorInfo& t) const {
       strides < t.strides;
 }
 
+bool operator==(
+    const std::vector<const DLTensor*>& inputsTensor,
+    const std::vector<detail::TensorInfo>& inputsInfo) {
+  if (inputsTensor.size() != inputsInfo.size()) {
+    return false;
+  }
+  CHECK(inputsTensor.size() == inputsInfo.size());
+  for (size_t i = 0, n = inputsInfo.size(); i < n; ++i) {
+    if (!(inputsInfo[i] == inputsTensor[i])) {
+      return false;
+    }
+  }
+  return true;
+}
+
 } // namespace tc

tc/core/compilation_cache.h

@@ -88,4 +88,15 @@ class CacheEntrySameKeyDifferentValue : public std::invalid_argument {
       : invalid_argument(what_arg) {}
 };
 
+bool operator==(
+    const std::vector<const DLTensor*>& inputsTensor,
+    const std::vector<detail::TensorInfo>& inputsInfo);
+
+inline std::string makeOptionsFilename(const std::string& filename) {
+  return filename + ".options";
+}
+
+inline std::string makeCudaFilename(const std::string& filename) {
+  return filename + ".cuda";
+}
 } // namespace tc

tc/core/cuda/cuda_compilation_cache.cc

@@ -57,21 +57,6 @@ void WriteProtobufArray(const Array& arr, Buf* buf) {
 }
 } // namespace
 
-bool operator==(
-    const std::vector<const DLTensor*>& inputsTensor,
-    const std::vector<detail::TensorInfo>& inputsInfo) {
-  if (inputsTensor.size() != inputsInfo.size()) {
-    return false;
-  }
-  CHECK(inputsTensor.size() == inputsInfo.size());
-  for (size_t i = 0, n = inputsInfo.size(); i < n; ++i) {
-    if (!(inputsInfo[i] == inputsTensor[i])) {
-      return false;
-    }
-  }
-  return true;
-}
-
 std::shared_ptr<CudaCache>& CudaCache::getGlobalSharedCache() {
   static std::shared_ptr<CudaCache> cudaCache_;
   return cudaCache_;
@@ -556,14 +541,6 @@ void removeFromCudaCacheEntriesNotInOptionsCache(
   cc.removeEntriesNotInOptionsCache(oc);
 }
 
-std::string makeOptionsFilename(const std::string& filename) {
-  return filename + ".options";
-}
-
-std::string makeCudaFilename(const std::string& filename) {
-  return filename + ".cuda";
-}
-
 std::unique_ptr<CudaCache::RetrievalResult> ManualCudaCache::retrieveKernel(
     const std::string& id,
     const std::vector<const DLTensor*>& inputs,

tc/core/cuda/cuda_compilation_cache.h

@@ -426,14 +426,6 @@ void removeFromCudaCacheEntriesNotInOptionsCache(
     CudaCache& cc,
     const OptionsCache& oc);
 
-bool operator==(
-    const std::vector<const DLTensor*>& inputsTensor,
-    const std::vector<detail::TensorInfo>& inputsInfo);
-
-std::string makeOptionsFilename(const std::string& filename);
-
-std::string makeCudaFilename(const std::string& filename);
-
 } // namespace tc
 
 #include "tc/core/cuda/cuda_compilation_cache-inl.h"