mlpack 4.6.1__cp313-cp313-win_amd64.whl → 4.7.0__cp313-cp313-win_amd64.whl

mlpack/include/mlpack/core/data/detect_file_type_impl.hpp

@@ -15,7 +15,50 @@
 #include "detect_file_type.hpp"
 
 namespace mlpack {
-namespace data {
+
+template<typename DataOptionsType>
+bool OpenFile(const std::string& filename,
+              DataOptionsType& opts,
+              bool isLoading,
+              std::fstream& stream)
+{
+  if (isLoading)
+  {
+#ifdef  _WIN32 // Always open in binary mode on Windows.
+    stream.open(filename.c_str(), std::fstream::in
+        | std::fstream::binary);
+#else
+    stream.open(filename.c_str(), std::fstream::in);
+#endif
+  }
+  else
+  {
+#ifdef  _WIN32 // Always open in binary mode on Windows.
+    stream.open(filename.c_str(), std::fstream::out
+        | std::fstream::binary);
+#else
+    stream.open(filename.c_str(), std::fstream::out);
+#endif
+  }
+
+  if (!stream.is_open())
+  {
+    std::stringstream oss;
+    if (isLoading)
+    {
+      oss << "Cannot open file '" << filename << "' for loading.  "
+          << "Please check if the file exists.";
+      return HandleError(oss, opts);
+    }
+    else if (!isLoading)
+    {
+      oss << "Cannot open file '" << filename << "' for saving.  "
+          << "Please check if you have permissions for writing.";
+      return HandleError(oss, opts);
+    }
+  }
+  return true;
+}
 
 /**
  * Given an istream, attempt to guess the file type.  This is taken originally
@@ -73,11 +116,12 @@ inline FileType GuessFileType(std::istream& f)
   bool hasBinary = false;
   bool hasBracket = false;
   bool hasComma = false;
+  bool hasSemicolon = false;
 
   for (arma::uword i = 0; i < nUse; ++i)
   {
     const unsigned char val = dataMem[i];
-    if ((val <= 8) || (val >= 123))
+    if (val <= 8)
     {
       hasBinary = true;
       break;
@@ -87,57 +131,16 @@ inline FileType GuessFileType(std::istream& f)
     {
       hasBracket = true;
     }
-    if (val == ',')
+
+    if (val == ';')
     {
-      hasComma = true;
+      hasSemicolon = true;
     }
-  }
 
-  if (hasComma && (hasBracket == false))
-  {
-    // If we believe we have a CSV file, then we want to try to skip any header
-    // row.  We'll detect a header row by simply seeing if anything in the first
-    // line doesn't parse as a number.
-    //
-    // TODO: this is not a foolproof algorithm, so there should eventually be a
-    // way added for the user to explicitly indicate that there is or isn't a
-    // header.
-    std::string firstLine;
-    std::getline(f, firstLine);
-
-    std::stringstream str(firstLine);
-    std::string token;
-    bool allNumeric = true;
-    // We'll abuse 'getline()' to split on commas.
-    while (std::getline(str, token, ','))
+    if (val == ',')
     {
-      // Let's see if we can parse the token into a number.
-      double num;
-      std::string rest;
-
-      // Try to parse into a number.
-      std::stringstream s(token);
-      s >> num;
-      if (s.fail())
-      {
-        allNumeric = false;
-        break;
-      }
-
-      // Now check to see there isn't anything else.  (This catches cases like,
-      // e.g., "1a".)
-      s >> rest;
-      if (rest.length() > 0)
-      {
-        allNumeric = false;
-        break;
-      }
+      hasComma = true;
     }
-
-    // If we could parse everything into a number, then let's rewind `f` so that
-    // it's at the start of the file.
-    if (allNumeric)
-      f.seekg(pos1);
   }
 
   delete[] dataMem;
@@ -145,6 +148,9 @@ inline FileType GuessFileType(std::istream& f)
   if (hasBinary)
     return FileType::RawBinary;
 
+  if (hasSemicolon && (hasBracket == false))
+    return FileType::CSVASCII;
+
   if (hasComma && (hasBracket == false))
     return FileType::CSVASCII;
 
@@ -164,7 +170,8 @@ inline FileType GuessFileType(std::istream& f)
  * @param filename Name of the file.
  * @return The detected file type.
  */
-inline FileType AutoDetect(std::fstream& stream, const std::string& filename)
+inline FileType AutoDetectFile(std::fstream& stream,
+                               const std::string& filename)
 {
   // Get the extension.
   std::string extension = Extension(filename);
@@ -271,9 +278,40 @@ inline FileType AutoDetect(std::fstream& stream, const std::string& filename)
   }
   else if (extension == "arff")
   {
-    return FileType::ARFFASCII;
+    detectedLoadType = FileType::ARFFASCII;
+  }
+  else if (extension == "png")
+  {
+    detectedLoadType = FileType::PNG;
+  }
+  else if (extension == "jpg" || extension == "jpeg")
+  {
+    detectedLoadType = FileType::JPG;
+  }
+  else if (extension == "tga")
+  {
+    detectedLoadType = FileType::TGA;
+  }
+  else if (extension == "psd")
+  {
+    detectedLoadType = FileType::PSD;
+  }
+  else if (extension == "gif")
+  {
+    detectedLoadType = FileType::GIF;
+  }
+  else if (extension == "pic")
+  {
+    detectedLoadType = FileType::PIC;
+  }
+  else if (extension == "pnm")
+  {
+    detectedLoadType = FileType::PNM;
+  }
+  else if (extension == "bmp")
+  {
+    detectedLoadType = FileType::BMP;
   }
-
   else // Unknown extension...
   {
     detectedLoadType = FileType::FileTypeUnknown;
@@ -283,12 +321,11 @@ inline FileType AutoDetect(std::fstream& stream, const std::string& filename)
 }
 
 /**
- * Return the type based only on the extension.
+ * Update FileType in DataOptions based on extension.
  *
  * @param filename Name of the file whose type we should detect.
- * @return Detected type of file.
  */
-template<typename MatType, typename DataOptionsType>
+template<typename ObjectType, typename DataOptionsType>
 void DetectFromExtension(const std::string& filename,
                          DataOptionsType& opts)
 {
@@ -300,12 +337,12 @@ void DetectFromExtension(const std::string& filename,
   }
   else if (extension == "txt")
   {
-    if (IsSparseMat<MatType>::value)
+    if (IsSparseMat<ObjectType>::value)
       opts.Format() = FileType::CoordASCII;
     else
       opts.Format() = FileType::RawASCII;
   }
-  else if (extension == "bin")
+  else if (!HasSerialize<ObjectType>::value && extension == "bin")
   {
     opts.Format() = FileType::ArmaBinary;
   }
@@ -322,12 +359,113 @@ void DetectFromExtension(const std::string& filename,
   {
     opts.Format() = FileType::ARFFASCII;
   }
+  else if (extension == "png")
+  {
+    opts.Format() = FileType::PNG;
+  }
+  else if (extension == "jpg" || extension == "jpeg")
+  {
+    opts.Format() = FileType::JPG;
+  }
+  else if (extension == "tga")
+  {
+    opts.Format() = FileType::TGA;
+  }
+  else if (extension == "psd")
+  {
+    opts.Format() = FileType::PSD;
+  }
+  else if (extension == "gif")
+  {
+    opts.Format() = FileType::GIF;
+  }
+  else if (extension == "pic")
+  {
+    opts.Format() = FileType::PIC;
+  }
+  else if (extension == "pnm")
+  {
+    opts.Format() = FileType::PNM;
+  }
+  else if (extension == "bmp")
+  {
+    opts.Format() = FileType::BMP;
+  }
+  else
+  {
+    opts.Format() = FileType::FileTypeUnknown;
+  }
+}
+
+template<typename ObjectType, typename DataOptionsType>
+void DetectFromSerializedExtension(const std::string& filename,
+                                   DataOptionsType& opts)
+{
+  const std::string extension = Extension(filename);
+  if (extension == "xml")
+  {
+    opts.Format() = FileType::XML;
+  }
+  else if (extension == "bin")
+  {
+    opts.Format() = FileType::BIN;
+  }
+  else if (extension == "json")
+  {
+    opts.Format() = FileType::JSON;
+  }
   else
   {
     opts.Format() = FileType::FileTypeUnknown;
   }
 }
 
+template<typename ObjectType, typename DataOptionsType>
+bool DetectFileType(const std::string& filename,
+                    DataOptionsType& opts,
+                    bool isLoading,
+                    std::fstream* stream)
+{
+  if constexpr (HasSerialize<ObjectType>::value)
+  {
+    if (opts.Format() == FileType::AutoDetect)
+    {
+      DetectFromSerializedExtension<ObjectType>(filename, opts);
+      if (opts.Format() == FileType::FileTypeUnknown)
+      {
+        std::stringstream oss;
+        oss << "Unable to detect type of '" << filename
+            << "'; incorrect extension? (allowed: xml/bin/json)";
+        return HandleError(oss, opts);
+      }
+    }
+  }
+  else
+  {
+    if (opts.Format() == FileType::AutoDetect)
+    {
+      if (isLoading)
+      {
+        // Attempt to auto-detect the type from the given file.
+        opts.Format() = AutoDetectFile(*stream, filename);
+      }
+      else
+      {
+        DetectFromExtension<ObjectType>(filename, opts);
+      }
+      // Provide error if we don't know the type.
+      if (opts.Format() == FileType::FileTypeUnknown)
+      {
+        std::stringstream oss;
+        oss <<  "Unable to detect type of '" << filename << "'; "
+            << "incorrect extension?";
+        return HandleError(oss, opts);
+      }
+    }
+  }
+  return true;
+}
+
 /**
  * Count the number of columns in the file.  The file must be a CSV/TSV/TXT file
  * with no header.
@@ -355,5 +493,4 @@ inline size_t CountCols(std::fstream& f)
   return cols;
 }
 
-} // namespace data
 } // namespace mlpack

mlpack/include/mlpack/core/data/extension.hpp

@@ -2,8 +2,8 @@
  * @file core/data/extension.hpp
  * @author Ryan Curtin
  *
- * Given a filename, extract its extension.  This is used by data::Load() and
- * data::Save().
+ * Given a filename, extract its extension.  This is used by Load() and
+ * Save().
  *
  * mlpack is free software; you may redistribute it and/or modify it under the
  * terms of the 3-clause BSD license.  You should have received a copy of the
@@ -16,7 +16,6 @@
 #include <mlpack/prereqs.hpp>
 
 namespace mlpack {
-namespace data {
 
 inline std::string Extension(const std::string& filename)
 {
@@ -32,7 +31,6 @@ inline std::string Extension(const std::string& filename)
   return extension;
 }
 
-} // namespace data
 } // namespace mlpack
 
 #endif

mlpack/include/mlpack/core/data/font8x8_basic.h

@@ -0,0 +1,152 @@
+/**
+ * 8x8 monochrome bitmap fonts for rendering
+ * Author: Daniel Hepper <daniel@hepper.net>
+ *
+ * License: Public Domain
+ *
+ * Based on:
+ * // Summary: font8x8.h
+ * // 8x8 monochrome bitmap fonts for rendering
+ * //
+ * // Author:
+ * //     Marcel Sondaar
+ * //     International Business Machines (public domain VGA fonts)
+ * //
+ * // License:
+ * //     Public Domain
+ *
+ * Fetched from: http://dimensionalrift.homelinux.net/combuster/mos3/?p=viewsource&file=/modules/gfx/font8_8.asm
+ **/
+
+// Constant: font8x8_basic
+// Contains an 8x8 font map for unicode points U+0000 - U+007F (basic latin)
+const unsigned char font8x8Basic[128][8] = {
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0000 (nul)
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0001
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0002
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0003
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0004
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0005
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0006
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0007
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0008
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0009
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+000A
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+000B
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+000C
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+000D
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+000E
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+000F
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0010
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0011
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0012
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0013
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0014
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0015
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0016
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0017
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0018
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0019
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+001A
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+001B
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+001C
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+001D
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+001E
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+001F
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0020 (space)
+    { 0x18, 0x3C, 0x3C, 0x18, 0x18, 0x00, 0x18, 0x00},   // U+0021 (!)
+    { 0x36, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0022 (")
+    { 0x36, 0x36, 0x7F, 0x36, 0x7F, 0x36, 0x36, 0x00},   // U+0023 (#)
+    { 0x0C, 0x3E, 0x03, 0x1E, 0x30, 0x1F, 0x0C, 0x00},   // U+0024 ($)
+    { 0x00, 0x63, 0x33, 0x18, 0x0C, 0x66, 0x63, 0x00},   // U+0025 (%)
+    { 0x1C, 0x36, 0x1C, 0x6E, 0x3B, 0x33, 0x6E, 0x00},   // U+0026 (&)
+    { 0x06, 0x06, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0027 (')
+    { 0x18, 0x0C, 0x06, 0x06, 0x06, 0x0C, 0x18, 0x00},   // U+0028 (()
+    { 0x06, 0x0C, 0x18, 0x18, 0x18, 0x0C, 0x06, 0x00},   // U+0029 ())
+    { 0x00, 0x66, 0x3C, 0xFF, 0x3C, 0x66, 0x00, 0x00},   // U+002A (*)
+    { 0x00, 0x0C, 0x0C, 0x3F, 0x0C, 0x0C, 0x00, 0x00},   // U+002B (+)
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x0C, 0x06},   // U+002C (,)
+    { 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00},   // U+002D (-)
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x0C, 0x00},   // U+002E (.)
+    { 0x60, 0x30, 0x18, 0x0C, 0x06, 0x03, 0x01, 0x00},   // U+002F (/)
+    { 0x3E, 0x63, 0x73, 0x7B, 0x6F, 0x67, 0x3E, 0x00},   // U+0030 (0)
+    { 0x0C, 0x0E, 0x0C, 0x0C, 0x0C, 0x0C, 0x3F, 0x00},   // U+0031 (1)
+    { 0x1E, 0x33, 0x30, 0x1C, 0x06, 0x33, 0x3F, 0x00},   // U+0032 (2)
+    { 0x1E, 0x33, 0x30, 0x1C, 0x30, 0x33, 0x1E, 0x00},   // U+0033 (3)
+    { 0x38, 0x3C, 0x36, 0x33, 0x7F, 0x30, 0x78, 0x00},   // U+0034 (4)
+    { 0x3F, 0x03, 0x1F, 0x30, 0x30, 0x33, 0x1E, 0x00},   // U+0035 (5)
+    { 0x1C, 0x06, 0x03, 0x1F, 0x33, 0x33, 0x1E, 0x00},   // U+0036 (6)
+    { 0x3F, 0x33, 0x30, 0x18, 0x0C, 0x0C, 0x0C, 0x00},   // U+0037 (7)
+    { 0x1E, 0x33, 0x33, 0x1E, 0x33, 0x33, 0x1E, 0x00},   // U+0038 (8)
+    { 0x1E, 0x33, 0x33, 0x3E, 0x30, 0x18, 0x0E, 0x00},   // U+0039 (9)
+    { 0x00, 0x0C, 0x0C, 0x00, 0x00, 0x0C, 0x0C, 0x00},   // U+003A (:)
+    { 0x00, 0x0C, 0x0C, 0x00, 0x00, 0x0C, 0x0C, 0x06},   // U+003B (;)
+    { 0x18, 0x0C, 0x06, 0x03, 0x06, 0x0C, 0x18, 0x00},   // U+003C (<)
+    { 0x00, 0x00, 0x3F, 0x00, 0x00, 0x3F, 0x00, 0x00},   // U+003D (=)
+    { 0x06, 0x0C, 0x18, 0x30, 0x18, 0x0C, 0x06, 0x00},   // U+003E (>)
+    { 0x1E, 0x33, 0x30, 0x18, 0x0C, 0x00, 0x0C, 0x00},   // U+003F (?)
+    { 0x3E, 0x63, 0x7B, 0x7B, 0x7B, 0x03, 0x1E, 0x00},   // U+0040 (@)
+    { 0x0C, 0x1E, 0x33, 0x33, 0x3F, 0x33, 0x33, 0x00},   // U+0041 (A)
+    { 0x3F, 0x66, 0x66, 0x3E, 0x66, 0x66, 0x3F, 0x00},   // U+0042 (B)
+    { 0x3C, 0x66, 0x03, 0x03, 0x03, 0x66, 0x3C, 0x00},   // U+0043 (C)
+    { 0x1F, 0x36, 0x66, 0x66, 0x66, 0x36, 0x1F, 0x00},   // U+0044 (D)
+    { 0x7F, 0x46, 0x16, 0x1E, 0x16, 0x46, 0x7F, 0x00},   // U+0045 (E)
+    { 0x7F, 0x46, 0x16, 0x1E, 0x16, 0x06, 0x0F, 0x00},   // U+0046 (F)
+    { 0x3C, 0x66, 0x03, 0x03, 0x73, 0x66, 0x7C, 0x00},   // U+0047 (G)
+    { 0x33, 0x33, 0x33, 0x3F, 0x33, 0x33, 0x33, 0x00},   // U+0048 (H)
+    { 0x1E, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x1E, 0x00},   // U+0049 (I)
+    { 0x78, 0x30, 0x30, 0x30, 0x33, 0x33, 0x1E, 0x00},   // U+004A (J)
+    { 0x67, 0x66, 0x36, 0x1E, 0x36, 0x66, 0x67, 0x00},   // U+004B (K)
+    { 0x0F, 0x06, 0x06, 0x06, 0x46, 0x66, 0x7F, 0x00},   // U+004C (L)
+    { 0x63, 0x77, 0x7F, 0x7F, 0x6B, 0x63, 0x63, 0x00},   // U+004D (M)
+    { 0x63, 0x67, 0x6F, 0x7B, 0x73, 0x63, 0x63, 0x00},   // U+004E (N)
+    { 0x1C, 0x36, 0x63, 0x63, 0x63, 0x36, 0x1C, 0x00},   // U+004F (O)
+    { 0x3F, 0x66, 0x66, 0x3E, 0x06, 0x06, 0x0F, 0x00},   // U+0050 (P)
+    { 0x1E, 0x33, 0x33, 0x33, 0x3B, 0x1E, 0x38, 0x00},   // U+0051 (Q)
+    { 0x3F, 0x66, 0x66, 0x3E, 0x36, 0x66, 0x67, 0x00},   // U+0052 (R)
+    { 0x1E, 0x33, 0x07, 0x0E, 0x38, 0x33, 0x1E, 0x00},   // U+0053 (S)
+    { 0x3F, 0x2D, 0x0C, 0x0C, 0x0C, 0x0C, 0x1E, 0x00},   // U+0054 (T)
+    { 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x3F, 0x00},   // U+0055 (U)
+    { 0x33, 0x33, 0x33, 0x33, 0x33, 0x1E, 0x0C, 0x00},   // U+0056 (V)
+    { 0x63, 0x63, 0x63, 0x6B, 0x7F, 0x77, 0x63, 0x00},   // U+0057 (W)
+    { 0x63, 0x63, 0x36, 0x1C, 0x1C, 0x36, 0x63, 0x00},   // U+0058 (X)
+    { 0x33, 0x33, 0x33, 0x1E, 0x0C, 0x0C, 0x1E, 0x00},   // U+0059 (Y)
+    { 0x7F, 0x63, 0x31, 0x18, 0x4C, 0x66, 0x7F, 0x00},   // U+005A (Z)
+    { 0x1E, 0x06, 0x06, 0x06, 0x06, 0x06, 0x1E, 0x00},   // U+005B ([)
+    { 0x03, 0x06, 0x0C, 0x18, 0x30, 0x60, 0x40, 0x00},   // U+005C (\)
+    { 0x1E, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1E, 0x00},   // U+005D (])
+    { 0x08, 0x1C, 0x36, 0x63, 0x00, 0x00, 0x00, 0x00},   // U+005E (^)
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF},   // U+005F (_)
+    { 0x0C, 0x0C, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+0060 (`)
+    { 0x00, 0x00, 0x1E, 0x30, 0x3E, 0x33, 0x6E, 0x00},   // U+0061 (a)
+    { 0x07, 0x06, 0x06, 0x3E, 0x66, 0x66, 0x3B, 0x00},   // U+0062 (b)
+    { 0x00, 0x00, 0x1E, 0x33, 0x03, 0x33, 0x1E, 0x00},   // U+0063 (c)
+    { 0x38, 0x30, 0x30, 0x3e, 0x33, 0x33, 0x6E, 0x00},   // U+0064 (d)
+    { 0x00, 0x00, 0x1E, 0x33, 0x3f, 0x03, 0x1E, 0x00},   // U+0065 (e)
+    { 0x1C, 0x36, 0x06, 0x0f, 0x06, 0x06, 0x0F, 0x00},   // U+0066 (f)
+    { 0x00, 0x00, 0x6E, 0x33, 0x33, 0x3E, 0x30, 0x1F},   // U+0067 (g)
+    { 0x07, 0x06, 0x36, 0x6E, 0x66, 0x66, 0x67, 0x00},   // U+0068 (h)
+    { 0x0C, 0x00, 0x0E, 0x0C, 0x0C, 0x0C, 0x1E, 0x00},   // U+0069 (i)
+    { 0x30, 0x00, 0x30, 0x30, 0x30, 0x33, 0x33, 0x1E},   // U+006A (j)
+    { 0x07, 0x06, 0x66, 0x36, 0x1E, 0x36, 0x67, 0x00},   // U+006B (k)
+    { 0x0E, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x1E, 0x00},   // U+006C (l)
+    { 0x00, 0x00, 0x33, 0x7F, 0x7F, 0x6B, 0x63, 0x00},   // U+006D (m)
+    { 0x00, 0x00, 0x1F, 0x33, 0x33, 0x33, 0x33, 0x00},   // U+006E (n)
+    { 0x00, 0x00, 0x1E, 0x33, 0x33, 0x33, 0x1E, 0x00},   // U+006F (o)
+    { 0x00, 0x00, 0x3B, 0x66, 0x66, 0x3E, 0x06, 0x0F},   // U+0070 (p)
+    { 0x00, 0x00, 0x6E, 0x33, 0x33, 0x3E, 0x30, 0x78},   // U+0071 (q)
+    { 0x00, 0x00, 0x3B, 0x6E, 0x66, 0x06, 0x0F, 0x00},   // U+0072 (r)
+    { 0x00, 0x00, 0x3E, 0x03, 0x1E, 0x30, 0x1F, 0x00},   // U+0073 (s)
+    { 0x08, 0x0C, 0x3E, 0x0C, 0x0C, 0x2C, 0x18, 0x00},   // U+0074 (t)
+    { 0x00, 0x00, 0x33, 0x33, 0x33, 0x33, 0x6E, 0x00},   // U+0075 (u)
+    { 0x00, 0x00, 0x33, 0x33, 0x33, 0x1E, 0x0C, 0x00},   // U+0076 (v)
+    { 0x00, 0x00, 0x63, 0x6B, 0x7F, 0x7F, 0x36, 0x00},   // U+0077 (w)
+    { 0x00, 0x00, 0x63, 0x36, 0x1C, 0x36, 0x63, 0x00},   // U+0078 (x)
+    { 0x00, 0x00, 0x33, 0x33, 0x33, 0x3E, 0x30, 0x1F},   // U+0079 (y)
+    { 0x00, 0x00, 0x3F, 0x19, 0x0C, 0x26, 0x3F, 0x00},   // U+007A (z)
+    { 0x38, 0x0C, 0x0C, 0x07, 0x0C, 0x0C, 0x38, 0x00},   // U+007B ({)
+    { 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x00},   // U+007C (|)
+    { 0x07, 0x0C, 0x0C, 0x38, 0x0C, 0x0C, 0x07, 0x00},   // U+007D (})
+    { 0x6E, 0x3B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},   // U+007E (~)
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}    // U+007F
+};

mlpack/include/mlpack/core/data/has_serialize.hpp

@@ -20,7 +20,6 @@
 #include <type_traits>
 
 namespace mlpack {
-namespace data {
 
 // This gives us a HasSerializeCheck<T, U> type (where U is a function pointer)
 // we can use with SFINAE to catch when a type has a Serialize() function.
@@ -59,7 +58,6 @@ struct HasSerialize
   static const bool value = (sizeof(chk<T>(0)) == sizeof(yes));
 };
 
-} // namespace data
 } // namespace mlpack
 
 #endif

mlpack/include/mlpack/core/data/image_bounding_box.hpp

@@ -0,0 +1,36 @@
+/**
+ * @file core/data/image_bounding_box.hpp
+ * @author Andrew Furey
+ *
+ * Draw bounding boxes and labels onto images.
+ *
+ * mlpack is free software; you may redistribute it and/or modify it under the
+ * terms of the 3-clause BSD license.  You should have received a copy of the
+ * 3-clause BSD license along with mlpack.  If not, see
+ * http://www.opensource.org/licenses/BSD-3-Clause for more information.
+ */
+
+#ifndef MLPACK_CORE_DATA_IMAGE_BOUNDING_BOX_HPP
+#define MLPACK_CORE_DATA_IMAGE_BOUNDING_BOX_HPP
+
+#include "image_options.hpp"
+#include "font8x8_basic.h"
+
+namespace mlpack {
+
+template <typename ImageType,
+          typename BoundingBoxesType,
+          typename ColorType>
+inline void BoundingBoxImage(ImageType& src,
+  const ImageInfo& opts,
+  const BoundingBoxesType& bbox,
+  const ColorType& color,
+  const size_t borderSize = 1,
+  const std::string& className = "",
+  const size_t letterSize = 1);
+
+} // namespace mlpack
+
+#include "image_bounding_box_impl.hpp"
+
+#endif