support unsafe functions for getting/constructor tensors from TH objects for backward compat.

Author: zdevito

CMakeLists.txt

@@ -177,15 +177,6 @@ INSTALL(TARGETS ATen
   LIBRARY DESTINATION "${TENSOR_LIB_INSTALL_LIB_DIR}"
   ARCHIVE DESTINATION "${TENSOR_LIB_INSTALL_LIB_DIR}")
 
-ADD_EXECUTABLE(scalar_test test/scalar_test.cpp)
-TARGET_LINK_LIBRARIES(scalar_test ATen)
-
-ADD_EXECUTABLE(basic test/basic.cpp)
-TARGET_LINK_LIBRARIES(basic ATen)
-
-add_executable(atest test/atest.cpp)
-target_link_libraries(atest ATen)
-
 FOREACH(HEADER ${base_h})
   INSTALL(FILES ${HEADER} DESTINATION ${TENSOR_LIB_INSTALL_INCLUDE_DIR}/ATen)
 ENDFOREACH()

CheckGenerator.h

@@ -0,0 +1,10 @@
+#pragma once
+#include "ATen/CPUGenerator.h"
+
+namespace at {
+static inline CPUGenerator * check_generator(Generator* expr) {
+  if(auto result = dynamic_cast<CPUGenerator*>(expr))
+    return result;
+  runtime_error("Expected a 'CPUGenerator' but found 'CUDAGenerator'");
+}
+}

Context.h

@@ -17,7 +17,7 @@ class Context {
     initCUDAIfNeeded(p);
     auto & type = type_registry[static_cast<int>(p)][static_cast<int>(s)];
     if(!type)
-      runtime_error("%s%s%sType is not enabled.",toString(p),toString(s));
+      runtime_error("%s%sType is not enabled.",toString(p),toString(s));
     return *type;
   }
   Generator & defaultGenerator(Backend p) {

TensorImpl.h

@@ -20,6 +20,7 @@ struct TensorImpl {
   virtual int64_t dim() = 0;
   virtual Scalar localScalar() = 0;
   virtual void assign_(Scalar s) = 0;
+  virtual void * unsafeGetTH() = 0;
   void retain() {
     ++refcount;
   }

Utils.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include "ATen/CPUGenerator.h"
-
 namespace at {
 
 #define AT_ASSERT(cond, ...) if (! (cond) ) { at::runtime_error(__VA_ARGS__); }
@@ -21,12 +19,4 @@ static inline T* checked_cast(Base* expr, const char * name, int pos) {
     T::typeString(),expr->type().toString(),pos,name);
 }
 
-struct CPUGenerator;
-struct Generator;
-static inline CPUGenerator * check_generator(Generator* expr) {
-  if(auto result = dynamic_cast<CPUGenerator*>(expr))
-    return result;
-  runtime_error("Expected a 'CPUGenerator' but found 'CUDAGenerator'");
-}
-
 } // at

gen.py

@@ -9,6 +9,7 @@
 import function_wrapper
 import dispatch_macros
 import copy_wrapper
+
 from code_template import CodeTemplate
 
 
@@ -197,6 +198,7 @@ def generate_storage_type_and_tensor(backend, density, scalar_type, declarations
     top_env['type_registrations'].append(type_register)
     top_env['type_headers'].append(
         '#include "ATen/{}.h"'.format(env['Type']))
+
     return env
 
 

scratch.py

@@ -109,6 +109,10 @@ struct Tensor {
   template<typename T>
   T * data() const;
 
+  void * unsafeGetTH() {
+    return pImpl->unsafeGetTH();
+  }
+
   //toLongData(), toFloatData() etc.
   #define TO_TYPE_DATA(T,name,_) \
   T * to##name##Data() const;

templates/Tensor.h

@@ -32,6 +32,9 @@ int64_t ${Tensor}::dim() {
 const char * ${Tensor}::typeString() {
   return "${Type}";
 }
+void * ${Tensor}::unsafeGetTH() {
+  return tensor;
+}
 
 ${TensorDenseOrSparse}
 

templates/TensorDerived.cpp

@@ -20,6 +20,7 @@ struct ${Tensor} : public TensorImpl {
   virtual int64_t dim() override;
   virtual Scalar localScalar() override;
   virtual void assign_(Scalar s) override;
+  virtual void * unsafeGetTH() override;
   static const char * typeString();
 
 //TODO(zach): sort of friend permissions later so this