[mlpack-svn] r11929 - mlpack/trunk/src/mlpack/core/arma_extend

fastlab-svn at coffeetalk-1.cc.gatech.edu fastlab-svn at coffeetalk-1.cc.gatech.edu
Tue Mar 20 23:44:24 EDT 2012


Author: rcurtin
Date: 2012-03-20 23:44:24 -0400 (Tue, 20 Mar 2012)
New Revision: 11929

Modified:
   mlpack/trunk/src/mlpack/core/arma_extend/promote_type.hpp
Log:
I think that some of the promotions I had written are actually invalid.  For
now, we simply use what is given in Armadillo when ARMA_64BIT_WORD is defined.


Modified: mlpack/trunk/src/mlpack/core/arma_extend/promote_type.hpp
===================================================================
--- mlpack/trunk/src/mlpack/core/arma_extend/promote_type.hpp	2012-03-21 03:29:56 UTC (rev 11928)
+++ mlpack/trunk/src/mlpack/core/arma_extend/promote_type.hpp	2012-03-21 03:44:24 UTC (rev 11929)
@@ -25,14 +25,7 @@
 template<> struct is_promotable<s64, u16> : public is_promotable_ok { typedef s64 result; };
 template<> struct is_promotable<s64, s8 > : public is_promotable_ok { typedef s64 result; };
 template<> struct is_promotable<s64, u8 > : public is_promotable_ok { typedef s64 result; };
-#endif
 
-
-template<> struct is_promotable<u64, s32> : public is_promotable_ok { typedef s64 result; };  // float ?
-template<> struct is_promotable<u64, s16> : public is_promotable_ok { typedef s64 result; };  // float ?
-template<> struct is_promotable<u64, s8 > : public is_promotable_ok { typedef s64 result; };  // float ?
-
-#ifndef ARMA_64BIT_WORD
 template<> struct is_promotable<u64, u32> : public is_promotable_ok { typedef u64 result; };
 template<> struct is_promotable<u64, u16> : public is_promotable_ok { typedef u64 result; };
 template<> struct is_promotable<u64, u8 > : public is_promotable_ok { typedef u64 result; };
@@ -47,27 +40,15 @@
 template<> struct is_promotable<u64, float> : public is_promotable_ok { typedef float result; };
 
 template<> struct is_promotable<u64, s64> : public is_promotable_ok { typedef s64 result; };  // float ?
-#endif
 
-template<> struct is_promotable<s32, s64> : public is_promotable_ok { typedef s64 result; };
-
-#ifndef ARMA_64BIT_WORD
 template<> struct is_promotable<u32, s64> : public is_promotable_ok { typedef s64 result; };  // float ?
 template<> struct is_promotable<s16, s64> : public is_promotable_ok { typedef s64 result; };
 template<> struct is_promotable<u16, s64> : public is_promotable_ok { typedef s64 result; };
 template<> struct is_promotable<s8 , s64> : public is_promotable_ok { typedef s64 result; };
 template<> struct is_promotable<u8 , s64> : public is_promotable_ok { typedef s64 result; };
-#endif
-template<> struct is_promotable<s32, u64> : public is_promotable_ok { typedef s64 result; };  // float ?
-#ifndef ARMA_64BIT_WORD
+
 template<> struct is_promotable<u32, u64> : public is_promotable_ok { typedef u64 result; };
-#endif
-template<> struct is_promotable<s16, u64> : public is_promotable_ok { typedef s64 result; };  // float ?
-#ifndef ARMA_64BIT_WORD
 template<> struct is_promotable<u16, u64> : public is_promotable_ok { typedef u64 result; };
-#endif
-template<> struct is_promotable<s8 , u64> : public is_promotable_ok { typedef s64 result; };  // float ?
-#ifndef ARMA_64BIT_WORD
 template<> struct is_promotable<u8 , u64> : public is_promotable_ok { typedef u64 result; };
 #endif
 




More information about the mlpack-svn mailing list