apaam/mlpack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove backported Armadillo code that we don't need.

Browse Source
This commit is contained in:
Ryan Curtin
2016-06-20 09:03:36 -04:00
parent 77834972a9
commit efca3c46af
4 changed files with 0 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mlpack/core/arma_extend/promote_type.hpp
-50
View File
@@ -1,50 +0,0 @@
// Extra promote_type definitions until 64-bit index support is added to
// Armadillo. These aren't necessary on Armadillo > 3.6.1.
#if (ARMA_VERSION_MAJOR < 3) || \
((ARMA_VERSION_MAJOR == 3) && (ARMA_VERSION_MINOR < 6)) || \
((ARMA_VERSION_MAJOR == 3) && (ARMA_VERSION_MINOR == 6) && \
(ARMA_VERSION_PATCH < 2))
#ifndef ARMA_64BIT_WORD
template<typename T> struct is_promotable<std::complex<T>, s64> : public is_promotable_ok { typedef std::complex<T> result; };
template<typename T> struct is_promotable<std::complex<T>, u64> : public is_promotable_ok { typedef std::complex<T> result; };
template<> struct is_promotable<double, s64> : public is_promotable_ok { typedef double result; };
template<> struct is_promotable<double, u64> : public is_promotable_ok { typedef double result; };
template<> struct is_promotable<float, s64> : public is_promotable_ok { typedef float result; };
template<> struct is_promotable<float, u64> : public is_promotable_ok { typedef float result; };
template<> struct is_promotable<s64, u64> : public is_promotable_ok { typedef s64 result; };
template<> struct is_promotable<s64, s32> : public is_promotable_ok { typedef s64 result; };
template<> struct is_promotable<s64, u32> : public is_promotable_ok { typedef s64 result; }; // float ?
template<> struct is_promotable<s64, s16> : public is_promotable_ok { typedef s64 result; };
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; };
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; };
template<typename T> struct is_promotable<s64, std::complex<T> > : public is_promotable_ok { typedef std::complex<T> result; };
template<typename T> struct is_promotable<u64, std::complex<T> > : public is_promotable_ok { typedef std::complex<T> result; };
template<> struct is_promotable<s64, double> : public is_promotable_ok { typedef double result; };
template<> struct is_promotable<u64, double> : public is_promotable_ok { typedef double result; };
template<> struct is_promotable<s64, float> : public is_promotable_ok { typedef float result; };
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 ?
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; };
template<> struct is_promotable<u32, u64> : public is_promotable_ok { typedef u64 result; };
template<> struct is_promotable<u16, u64> : public is_promotable_ok { typedef u64 result; };
template<> struct is_promotable<u8 , u64> : public is_promotable_ok { typedef u64 result; };
#endif
#endif
src/mlpack/core/arma_extend/restrictors.hpp
-22
View File
@@ -1,22 +0,0 @@
// Modifications to allow u64/s64 in Armadillo when ARMA_64BIT_WORD is not
// defined. Only required on Armadillo < 3.6.2.
#if (ARMA_VERSION_MAJOR < 3) || \
((ARMA_VERSION_MAJOR == 3) && (ARMA_VERSION_MINOR < 6)) || \
((ARMA_VERSION_MAJOR == 3) && (ARMA_VERSION_MINOR == 6) && \
(ARMA_VERSION_PATCH < 2))
#ifndef ARMA_64BIT_WORD
template<> struct arma_scalar_only<u64> { typedef u64 result; };
template<> struct arma_scalar_only<s64> { typedef s64 result; };
template<> struct arma_integral_only<u64> { typedef u64 result; };
template<> struct arma_integral_only<s64> { typedef s64 result; };
template<> struct arma_unsigned_integral_only<u64> { typedef u64 result; };
template<> struct arma_signed_integral_only<s64> { typedef s64 result; };
template<> struct arma_signed_only<s64> { typedef s64 result; };
#endif
#endif
src/mlpack/core/arma_extend/traits.hpp
-49
View File
@@ -1,49 +0,0 @@
// Extra traits to support u64 and s64 (or, specifically, unsigned long and
// long) until that is applied to the Armadillo sources.
// This isn't necessary if Armadillo was compiled with 64-bit support, or if
// ARMA_USE_U64S64 is enabled, or if Armadillo >= 3.6.2 is used (by default
// Armadillo 3.6.2 allows long types).
#if (ARMA_VERSION_MAJOR < 3) || \
((ARMA_VERSION_MAJOR == 3) && (ARMA_VERSION_MINOR < 6)) || \
((ARMA_VERSION_MAJOR == 3) && (ARMA_VERSION_MINOR == 6) && \
(ARMA_VERSION_PATCH < 2))
#if !(defined(ARMA_64BIT_WORD) || defined(ARMA_USE_U64S64))
template<typename T1>
struct is_u64
{ static const bool value = false; };
template<>
struct is_u64<u64>
{ static const bool value = true; };
template<typename T1>
struct is_s64
{ static const bool value = false; };
template<>
struct is_s64<s64>
{ static const bool value = true; };
template<>
struct is_supported_elem_type<u64>
{
static const bool value = true;
};
template<>
struct is_supported_elem_type<s64>
{
static const bool value = true;
};
template<>
struct is_signed<u64>
{
static const bool value = false;
};
#endif
#endif
src/mlpack/core/arma_extend/typedef.hpp
-30
View File
@@ -1,30 +0,0 @@
// Extensions to typedef u64 and s64 until that support is added into
// Armadillo. We only need to typedef s64 on Armadillo > 1.2.0. This is not
// necessary for Armadillo > 3.6.1.
#if (ARMA_VERSION_MAJOR < 3) || \
((ARMA_VERSION_MAJOR == 3) && (ARMA_VERSION_MINOR < 6)) || \
((ARMA_VERSION_MAJOR == 3) && (ARMA_VERSION_MINOR == 6) && \
(ARMA_VERSION_PATCH < 2))
#ifndef ARMA_64BIT_WORD
// We must typedef both u64 and s64.
#if ULONG_MAX >= 0xffffffffffffffff
typedef unsigned long u64;
typedef long s64;
#elif ULLONG_MAX >= 0xffffffffffffffff
typedef unsigned long long u64;
typedef long long s64;
#else
#error "don't know how to typedef 'u64' on this system"
#endif
namespace junk
{
struct arma_64_elem_size_test
{
arma_static_check( (sizeof(u64) != 8), ERROR___TYPE_U64_HAS_UNSUPPORTED_SIZE );
arma_static_check( (sizeof(s64) != 8), ERROR___TYPE_S64_HAS_UNSUPPORTED_SIZE );
};
}
#endif
#endif