Merge pull request pytorch#915 from pavanky/convert

Macros to convert between real and accreal

Author: soumith

THGenerateAllTypes.h

@@ -2,95 +2,10 @@
 #error "You must define TH_GENERIC_FILE before including THGenerateAllTypes.h"
 #endif
 
-#define real unsigned char
-#define accreal long
-#define Real Byte
-#define THInf UCHAR_MAX
-#define TH_REAL_IS_BYTE
-#line 1 TH_GENERIC_FILE
-#include TH_GENERIC_FILE
-#undef real
-#undef accreal
-#undef Real
-#undef THInf
-#undef TH_REAL_IS_BYTE
+#define THGenerateAllTypes
 
-#define real char
-#define accreal long
-#define Real Char
-#define THInf CHAR_MAX
-#define TH_REAL_IS_CHAR
-#line 1 TH_GENERIC_FILE
-#include TH_GENERIC_FILE
-#undef real
-#undef accreal
-#undef Real
-#undef THInf
-#undef TH_REAL_IS_CHAR
-
-#define real short
-#define accreal long
-#define Real Short
-#define THInf SHRT_MAX
-#define TH_REAL_IS_SHORT
-#line 1 TH_GENERIC_FILE
-#include TH_GENERIC_FILE
-#undef real
-#undef accreal
-#undef Real
-#undef THInf
-#undef TH_REAL_IS_SHORT
-
-#define real int
-#define accreal long
-#define Real Int
-#define THInf INT_MAX
-#define TH_REAL_IS_INT
-#line 1 TH_GENERIC_FILE
-#include TH_GENERIC_FILE
-#undef real
-#undef accreal
-#undef Real
-#undef THInf
-#undef TH_REAL_IS_INT
-
-#define real long
-#define accreal long
-#define Real Long
-#define THInf LONG_MAX
-#define TH_REAL_IS_LONG
-#line 1 TH_GENERIC_FILE
-#include TH_GENERIC_FILE
-#undef real
-#undef accreal
-#undef Real
-#undef THInf
-#undef TH_REAL_IS_LONG
-
-#define real float
-#define accreal double
-#define Real Float
-#define THInf FLT_MAX
-#define TH_REAL_IS_FLOAT
-#line 1 TH_GENERIC_FILE
-#include TH_GENERIC_FILE
-#undef real
-#undef accreal
-#undef Real
-#undef THInf
-#undef TH_REAL_IS_FLOAT
-
-#define real double
-#define accreal double
-#define Real Double
-#define THInf DBL_MAX
-#define TH_REAL_IS_DOUBLE
-#line 1 TH_GENERIC_FILE
-#include TH_GENERIC_FILE
-#undef real
-#undef accreal
-#undef Real
-#undef THInf
-#undef TH_REAL_IS_DOUBLE
+#include "THGenerateFloatTypes.h"
+#include "THGenerateIntTypes.h"
 
+#undef THGenerateAllTypes
 #undef TH_GENERIC_FILE

THGenerateFloatTypes.h

@@ -4,6 +4,8 @@
 
 #define real float
 #define accreal double
+#define TH_CONVERT_REAL_TO_ACCREAL(_val) (accreal)(_val)
+#define TH_CONVERT_ACCREAL_TO_REAL(_val) (real)(_val)
 #define Real Float
 #define THInf FLT_MAX
 #define TH_REAL_IS_FLOAT
@@ -14,9 +16,13 @@
 #undef Real
 #undef THInf
 #undef TH_REAL_IS_FLOAT
+#undef TH_CONVERT_REAL_TO_ACCREAL
+#undef TH_CONVERT_ACCREAL_TO_REAL
 
 #define real double
 #define accreal double
+#define TH_CONVERT_REAL_TO_ACCREAL(_val) (accreal)(_val)
+#define TH_CONVERT_ACCREAL_TO_REAL(_val) (real)(_val)
 #define Real Double
 #define THInf DBL_MAX
 #define TH_REAL_IS_DOUBLE
@@ -27,5 +33,9 @@
 #undef Real
 #undef THInf
 #undef TH_REAL_IS_DOUBLE
+#undef TH_CONVERT_REAL_TO_ACCREAL
+#undef TH_CONVERT_ACCREAL_TO_REAL
 
+#ifndef THGenerateAllTypes
 #undef TH_GENERIC_FILE
+#endif

THGenerateHalfType.h

@@ -5,6 +5,8 @@
 #include "THHalf.h"
 #define real THHalf
 #define accreal float
+#define TH_CONVERT_REAL_TO_ACCREAL(_val) TH_half2float(_val)
+#define TH_CONVERT_ACCREAL_TO_REAL(_val) TH_float2half(_val)
 #define Real Half
 #define THInf TH_HALF_MAX
 #define TH_REAL_IS_HALF
@@ -15,5 +17,9 @@
 #undef Real
 #undef THInf
 #undef TH_REAL_IS_HALF
+#undef TH_CONVERT_REAL_TO_ACCREAL
+#undef TH_CONVERT_ACCREAL_TO_REAL
 
+#ifndef THGenerateAllTypes
 #undef TH_GENERIC_FILE
+#endif

THGenerateIntTypes.h

@@ -5,6 +5,8 @@
 #define real unsigned char
 #define accreal long
 #define Real Byte
+#define TH_CONVERT_REAL_TO_ACCREAL(_val) (accreal)(_val)
+#define TH_CONVERT_ACCREAL_TO_REAL(_val) (real)(_val)
 #define THInf UCHAR_MAX
 #define TH_REAL_IS_BYTE
 #line 1 TH_GENERIC_FILE
@@ -14,11 +16,16 @@
 #undef Real
 #undef THInf
 #undef TH_REAL_IS_BYTE
+#undef TH_CONVERT_REAL_TO_ACCREAL
+#undef TH_CONVERT_ACCREAL_TO_REAL
+
 
 #define real char
 #define accreal long
 #define Real Char
 #define THInf CHAR_MAX
+#define TH_CONVERT_REAL_TO_ACCREAL(_val) (accreal)(_val)
+#define TH_CONVERT_ACCREAL_TO_REAL(_val) (real)(_val)
 #define TH_REAL_IS_CHAR
 #line 1 TH_GENERIC_FILE
 #include TH_GENERIC_FILE
@@ -27,9 +34,13 @@
 #undef Real
 #undef THInf
 #undef TH_REAL_IS_CHAR
+#undef TH_CONVERT_REAL_TO_ACCREAL
+#undef TH_CONVERT_ACCREAL_TO_REAL
 
 #define real short
 #define accreal long
+#define TH_CONVERT_REAL_TO_ACCREAL(_val) (accreal)(_val)
+#define TH_CONVERT_ACCREAL_TO_REAL(_val) (real)(_val)
 #define Real Short
 #define THInf SHRT_MAX
 #define TH_REAL_IS_SHORT
@@ -40,9 +51,13 @@
 #undef Real
 #undef THInf
 #undef TH_REAL_IS_SHORT
+#undef TH_CONVERT_REAL_TO_ACCREAL
+#undef TH_CONVERT_ACCREAL_TO_REAL
 
 #define real int
 #define accreal long
+#define TH_CONVERT_REAL_TO_ACCREAL(_val) (accreal)(_val)
+#define TH_CONVERT_ACCREAL_TO_REAL(_val) (real)(_val)
 #define Real Int
 #define THInf INT_MAX
 #define TH_REAL_IS_INT
@@ -53,9 +68,13 @@
 #undef Real
 #undef THInf
 #undef TH_REAL_IS_INT
+#undef TH_CONVERT_REAL_TO_ACCREAL
+#undef TH_CONVERT_ACCREAL_TO_REAL
 
 #define real long
 #define accreal long
+#define TH_CONVERT_REAL_TO_ACCREAL(_val) (accreal)(_val)
+#define TH_CONVERT_ACCREAL_TO_REAL(_val) (real)(_val)
 #define Real Long
 #define THInf LONG_MAX
 #define TH_REAL_IS_LONG
@@ -66,5 +85,9 @@
 #undef Real
 #undef THInf
 #undef TH_REAL_IS_LONG
+#undef TH_CONVERT_REAL_TO_ACCREAL
+#undef TH_CONVERT_ACCREAL_TO_REAL
 
+#ifndef THGenerateAllTypes
 #undef TH_GENERIC_FILE
+#endif