Armadillo 15.0.0 "Medium Roast"

Author: eddelbuettel

inst/include/current/armadillo

@@ -302,7 +302,7 @@ namespace arma
   #include "armadillo_bits/op_flip_bones.hpp"
   #include "armadillo_bits/op_reverse_bones.hpp"
   #include "armadillo_bits/op_princomp_bones.hpp"
-  #include "armadillo_bits/op_misc_bones.hpp"
+  #include "armadillo_bits/op_elem_bones.hpp"
   #include "armadillo_bits/op_orth_null_bones.hpp"
   #include "armadillo_bits/op_relational_bones.hpp"
   #include "armadillo_bits/op_find_bones.hpp"
@@ -549,7 +549,6 @@ namespace arma
   #include "armadillo_bits/fn_circshift.hpp"
   #include "armadillo_bits/fn_shuffle.hpp"
   #include "armadillo_bits/fn_prod.hpp"
-  #include "armadillo_bits/fn_eps.hpp"
   #include "armadillo_bits/fn_pinv.hpp"
   #include "armadillo_bits/fn_rank.hpp"
   #include "armadillo_bits/fn_kron.hpp"
@@ -761,7 +760,7 @@ namespace arma
   #include "armadillo_bits/op_flip_meat.hpp"
   #include "armadillo_bits/op_reverse_meat.hpp"
   #include "armadillo_bits/op_princomp_meat.hpp"
-  #include "armadillo_bits/op_misc_meat.hpp"
+  #include "armadillo_bits/op_elem_meat.hpp"
   #include "armadillo_bits/op_orth_null_meat.hpp"
   #include "armadillo_bits/op_relational_meat.hpp"
   #include "armadillo_bits/op_find_meat.hpp"

inst/include/current/armadillo_bits/arma_version.hpp

@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: Apache-2.0
-//
+// 
 // Copyright 2008-2016 Conrad Sanderson (https://conradsanderson.id.au)
 // Copyright 2008-2016 National ICT Australia (NICTA)
-//
+// 
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // https://www.apache.org/licenses/LICENSE-2.0
-//
+// 
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,10 +21,10 @@
 
 
 
-#define ARMA_VERSION_MAJOR 14
-#define ARMA_VERSION_MINOR 6
-#define ARMA_VERSION_PATCH 3
-#define ARMA_VERSION_NAME  "Caffe Mocha"
+#define ARMA_VERSION_MAJOR 15
+#define ARMA_VERSION_MINOR 0
+#define ARMA_VERSION_PATCH 0
+#define ARMA_VERSION_NAME  "Medium Roast"
 
 
 
@@ -33,16 +33,16 @@ struct arma_version
   static constexpr unsigned int major = ARMA_VERSION_MAJOR;
   static constexpr unsigned int minor = ARMA_VERSION_MINOR;
   static constexpr unsigned int patch = ARMA_VERSION_PATCH;
-
+  
   static
   inline
   std::string
   as_string()
     {
     const char* nickname = ARMA_VERSION_NAME;
-
+    
     std::ostringstream ss;
-
+    
     ss << arma_version::major
        << '.'
        << arma_version::minor
@@ -51,7 +51,7 @@ struct arma_version
        << " ("
        << nickname
        << ')';
-
+    
     return ss.str();
     }
   };

inst/include/current/armadillo_bits/cond_rel_bones.hpp

@@ -163,7 +163,7 @@
   #define ARMA_OPTIMISE_SYM
   //// Comment out the above line to disable optimised handling
   //// of symmetric/hermitian matrices by various functions:
-  //// solve(), inv(), pinv(), expmat(), logmat(), sqrtmat(), rcond(), rank()
+  //// solve(), inv(), pinv(), expmat(), logmat(), sqrtmat(), powmat(), rank(), cond(), rcond() 
 #endif
 
 #if !defined(ARMA_OPTIMISE_INVEXPR)

inst/include/current/armadillo_bits/cond_rel_meat.hpp

@@ -1330,6 +1330,47 @@ arma_assert_atlas_size(const T1& A, const T2& B)
 
 
 
+template<typename eT>
+inline
+void
+arma_elem_type_string(std::string& out)
+  {
+       if(       is_u8<eT>::value)  { out = "u8";        }
+  else if(       is_s8<eT>::value)  { out = "s8";        }
+  else if(      is_u16<eT>::value)  { out = "u16";       }
+  else if(      is_s16<eT>::value)  { out = "s16";       }
+  else if(      is_u32<eT>::value)  { out = "u32";       }
+  else if(      is_s32<eT>::value)  { out = "s32";       }
+  else if(      is_u64<eT>::value)  { out = "u64";       }
+  else if(      is_s64<eT>::value)  { out = "s64";       }
+  else if(   is_ulng_t<eT>::value)  { out = "ulng_t";    }
+  else if(   is_slng_t<eT>::value)  { out = "slng_t";    }
+  else if(    is_float<eT>::value)  { out = "float";     }
+  else if(   is_double<eT>::value)  { out = "double";    }
+  else if( is_cx_float<eT>::value)  { out = "cx_float";  }
+  else if(is_cx_double<eT>::value)  { out = "cx_double"; }
+  else if(     is_fp16<eT>::value)  { out = "fp16";      }
+  else if(  is_cx_fp16<eT>::value)  { out = "cx_fp16";   }
+  else                              { out = "unknown";   }
+  }
+
+
+
+template<typename eT>
+arma_cold
+inline
+void
+arma_type_print(const char* header)
+  {
+  std::string elem_type_str;
+  
+  arma_elem_type_string<eT>(elem_type_str);
+  
+  get_cerr_stream() << header << ": " << elem_type_str << std::endl;
+  }
+
+
+
 //
 // macros
 
@@ -1372,6 +1413,7 @@ arma_assert_atlas_size(const T1& A, const T2& B)
   #define arma_debug_sigprint       arma_sigprint(ARMA_FNSIG); arma_bktprint
   #define arma_debug_sigprint_this  arma_sigprint(ARMA_FNSIG); arma_thisprint
   #define arma_debug_print          arma_print
+  #define arma_debug_type_print     arma_type_print
 
   // for compatibility with earlier versions of Armadillo
   #define arma_extra_debug_sigprint       arma_sigprint(ARMA_FNSIG); arma_bktprint
@@ -1383,6 +1425,7 @@ arma_assert_atlas_size(const T1& A, const T2& B)
   #define arma_debug_sigprint        true ? (void)0 : arma_bktprint
   #define arma_debug_sigprint_this   true ? (void)0 : arma_thisprint
   #define arma_debug_print           true ? (void)0 : arma_print
+  #define arma_debug_type_print      true ? (void)0 : arma_type_print
 
   // for compatibility with earlier versions of Armadillo
   #define arma_extra_debug_sigprint        true ? (void)0 : arma_bktprint

inst/include/current/armadillo_bits/config.hpp

@@ -136,55 +136,6 @@ struct eop_aux
 
   template<typename T1, typename T2> arma_inline static typename   arma_integral_only<T1>::result pow (const T1 base, const T2 exponent) { return T1( std::pow( double(base), double(exponent) ) ); }
   template<typename T1, typename T2> arma_inline static typename arma_real_or_cx_only<T1>::result pow (const T1 base, const T2 exponent) { return T1( std::pow(        base,         exponent  ) ); }
-  
-  
-  template<typename eT>
-  arma_inline
-  static
-  typename arma_integral_only<eT>::result
-  direct_eps(const eT)
-    {
-    return eT(0);
-    }
-  
-  
-  template<typename eT>
-  inline
-  static
-  typename arma_real_only<eT>::result
-  direct_eps(const eT x)
-    {
-    //arma_debug_sigprint();
-    
-    // according to IEEE Standard for Floating-Point Arithmetic (IEEE 754)
-    // the mantissa length for double is 53 bits = std::numeric_limits<double>::digits
-    // the mantissa length for float  is 24 bits = std::numeric_limits<float >::digits
-    
-    //return std::pow( std::numeric_limits<eT>::radix, (std::floor(std::log10(std::abs(x))/std::log10(std::numeric_limits<eT>::radix))-(std::numeric_limits<eT>::digits-1)) );
-    
-    const eT radix_eT     = eT(std::numeric_limits<eT>::radix);
-    const eT digits_m1_eT = eT(std::numeric_limits<eT>::digits - 1);
-    
-    // return std::pow( radix_eT, eT(std::floor(std::log10(std::abs(x))/std::log10(radix_eT)) - digits_m1_eT) );
-    return eop_aux::pow( radix_eT, eT(std::floor(std::log10(std::abs(x))/std::log10(radix_eT)) - digits_m1_eT) );
-    }
-  
-  
-  template<typename T>
-  inline
-  static
-  typename arma_real_only<T>::result
-  direct_eps(const std::complex<T>& x)
-    {
-    //arma_debug_sigprint();
-    
-    //return std::pow( std::numeric_limits<T>::radix, (std::floor(std::log10(std::abs(x))/std::log10(std::numeric_limits<T>::radix))-(std::numeric_limits<T>::digits-1)) );
-    
-    const T radix_T     = T(std::numeric_limits<T>::radix);
-    const T digits_m1_T = T(std::numeric_limits<T>::digits - 1);
-    
-    return std::pow( radix_T, T(std::floor(std::log10(std::abs(x))/std::log10(radix_T)) - digits_m1_T) );
-    }
   };