Merge commit '89244b4aec1f229b9ba1378389d4dea697389666'

subtree/rabit/rabit-learn/io/io-inl.h

@@ -9,10 +9,13 @@
 #include <cstring>
 
 #include "./io.h"
+
+#if RABIT_USE_WORMHOLE == 0
 #if RABIT_USE_HDFS
 #include "./hdfs-inl.h"
 #endif
 #include "./file-inl.h"
+#endif
 
 namespace rabit {
 namespace io {
@@ -25,6 +28,9 @@ namespace io {
 inline InputSplit *CreateInputSplit(const char *uri,
                                     unsigned part,
                                     unsigned nsplit) {
+#if RABIT_USE_WORMHOLE
+  return dmlc::InputSplit::Create(uri, part, nsplit);
+#else
   using namespace std;
   if (!strcmp(uri, "stdin")) {
     return new SingleFileSplit(uri);
@@ -40,7 +46,28 @@ inline InputSplit *CreateInputSplit(const char *uri,
 #endif
   }
   return new LineSplitter(new FileProvider(uri), part, nsplit);
+#endif
 }
+
+template<typename TStream>
+class StreamAdapter : public IStream {
+ public:
+  explicit StreamAdapter(TStream *stream)
+      : stream_(stream) {
+  }
+  virtual ~StreamAdapter(void) {
+    delete stream_;
+  }
+  virtual size_t Read(void *ptr, size_t size) {
+    return stream_->Read(ptr, size);
+  }
+  virtual void Write(const void *ptr, size_t size) {
+    stream_->Write(ptr, size);
+  }  
+ private:
+  TStream *stream_;
+};
+
 /*!
  * \brief create an stream, the stream must be able to close
  *    the underlying resources(files) when deleted
@@ -49,6 +76,9 @@ inline InputSplit *CreateInputSplit(const char *uri,
  * \param mode can be 'w' or 'r' for read or write
  */
 inline IStream *CreateStream(const char *uri, const char *mode) {
+#if RABIT_USE_WORMHOLE
+  return new StreamAdapter<dmlc::IStream>(dmlc::IStream::Create(uri, mode));
+#else
   using namespace std;
   if (!strncmp(uri, "file://", 7)) {
     return new FileStream(uri + 7, mode);
@@ -62,6 +92,7 @@ inline IStream *CreateStream(const char *uri, const char *mode) {
 #endif
   }
   return new FileStream(uri, mode);
+#endif
 }
 }  // namespace io
 }  // namespace rabit

subtree/rabit/rabit-learn/io/io.h

@@ -13,6 +13,13 @@
 #define RABIT_USE_HDFS 0
 #endif
 
+#ifndef RABIT_USE_WORMHOLE
+#define RABIT_USE_WORMHOLE 0
+#endif
+
+#if RABIT_USE_WORMHOLE
+#include <dmlc/io.h>
+#endif
 /*! \brief io interface */
 namespace rabit {
 /*!
@@ -20,6 +27,10 @@ namespace rabit {
  */
 namespace io {
 /*! \brief reused ISeekStream's definition */
+#if RABIT_USE_WORMHOLE
+typedef dmlc::ISeekStream ISeekStream;
+typedef dmlc::InputSplit InputSplit;
+#else
 typedef utils::ISeekStream ISeekStream;
 /*!
  * \brief user facing input split helper,
@@ -33,10 +44,11 @@ class InputSplit {
    *        \n is not included
    * \return true of next line was found, false if we read all the lines
    */
-  virtual bool NextLine(std::string *out_data) = 0;
+  virtual bool ReadLine(std::string *out_data) = 0;
   /*! \brief destructor*/
   virtual ~InputSplit(void) {}
 };
+#endif
 /*!
  * \brief create input split given a uri
  * \param uri the uri of the input, can contain hdfs prefix

subtree/rabit/rabit-learn/io/line_split-inl.h

@@ -51,7 +51,7 @@ class LineSplitter : public InputSplit {
     delete provider_;
   }
   // get next line
-  virtual bool NextLine(std::string *out_data) {
+  virtual bool ReadLine(std::string *out_data) {
     if (file_ptr_ >= file_ptr_end_ &&
         offset_curr_ >= offset_end_) return false;
     out_data->clear();
@@ -178,7 +178,7 @@ class SingleFileSplit : public InputSplit {
   virtual ~SingleFileSplit(void) {
     if (!use_stdin_) std::fclose(fp_);
   }
-  virtual bool NextLine(std::string *out_data) {
+  virtual bool ReadLine(std::string *out_data) {
     if (end_of_file_) return false;
     out_data->clear();
     while (true) {