From 488a2dd2e8d04ffe746c3cb866b7c8bd4df393c3 Mon Sep 17 00:00:00 2001
From: dzhwinter <dzhwinter@gmail.com>
Date: Sat, 25 Aug 2018 10:37:38 +0800
Subject: [PATCH] with ir node

---
 paddle/fluid/inference/analysis/argument.h |  2 +-
 paddle/fluid/inference/analysis/helper.h   | 26 +----------
 paddle/fluid/operators/CMakeLists.txt      |  2 +
 paddle/fluid/platform/port.h               | 52 ++++++++++++++++++++--
 4 files changed, 53 insertions(+), 29 deletions(-)

diff --git a/paddle/fluid/inference/analysis/argument.h b/paddle/fluid/inference/analysis/argument.h
index a17d6281a29..25787321db2 100644
--- a/paddle/fluid/inference/analysis/argument.h
+++ b/paddle/fluid/inference/analysis/argument.h
@@ -26,6 +26,7 @@
 #include <string>
 #include "paddle/fluid/framework/program_desc.h"
 #include "paddle/fluid/inference/analysis/data_flow_graph.h"
+#include "paddle/fluid/platform/enforce.h"
 
 namespace paddle {
 namespace inference {
@@ -60,7 +61,6 @@ struct Argument {
   std::unique_ptr<std::string> model_output_store_path;
 };
 
-#define UNLIKELY(condition) __builtin_expect(static_cast<bool>(condition), 0)
 #define ANALYSIS_ARGUMENT_CHECK_FIELD(field__)               \
   if (UNLIKELY(!(field__))) {                                \
     LOG(ERROR) << "field " << #field__ << " should be set."; \
diff --git a/paddle/fluid/inference/analysis/helper.h b/paddle/fluid/inference/analysis/helper.h
index 5151e2b69ac..e20ddfa24fc 100644
--- a/paddle/fluid/inference/analysis/helper.h
+++ b/paddle/fluid/inference/analysis/helper.h
@@ -14,7 +14,6 @@ limitations under the License. */
 
 #pragma once
 
-#include <sys/stat.h>
 #include <cstdio>
 #include <fstream>
 #include <string>
@@ -26,6 +25,7 @@ limitations under the License. */
 #include "paddle/fluid/framework/scope.h"
 #include "paddle/fluid/framework/variable.h"
 #include "paddle/fluid/platform/enforce.h"
+#include "paddle/fluid/platform/port.h"
 
 namespace paddle {
 namespace inference {
@@ -124,20 +124,6 @@ T &GetFromScope(const framework::Scope &scope, const std::string &name) {
   return *var->GetMutable<T>();
 }
 
-static void ExecShellCommand(const std::string &cmd, std::string *message) {
-  char buffer[128];
-  std::shared_ptr<FILE> pipe(popen(cmd.c_str(), "r"), pclose);
-  if (!pipe) {
-    LOG(ERROR) << "error running command: " << cmd;
-    return;
-  }
-  while (!feof(pipe.get())) {
-    if (fgets(buffer, 128, pipe.get()) != nullptr) {
-      *message += buffer;
-    }
-  }
-}
-
 static framework::proto::ProgramDesc LoadProgramDesc(
     const std::string &model_path) {
   std::ifstream fin(model_path, std::ios::in | std::ios::binary);
@@ -159,16 +145,6 @@ static bool FileExists(const std::string &filepath) {
   return exists;
 }
 
-static bool PathExists(const std::string &path) {
-  struct stat statbuf;
-  if (stat(path.c_str(), &statbuf) != -1) {
-    if (S_ISDIR(statbuf.st_mode)) {
-      return true;
-    }
-  }
-  return false;
-}
-
 }  // namespace analysis
 }  // namespace inference
 }  // namespace paddle
diff --git a/paddle/fluid/operators/CMakeLists.txt b/paddle/fluid/operators/CMakeLists.txt
index 8da0aaaafeb..343aeaf13f8 100644
--- a/paddle/fluid/operators/CMakeLists.txt
+++ b/paddle/fluid/operators/CMakeLists.txt
@@ -307,10 +307,12 @@ op_library(save_combine_op DEPS lod_tensor)
 op_library(load_combine_op DEPS lod_tensor)
 op_library(concat_op DEPS concat)
 
+if (NOT WIN32)
 # FIXME(thuan): Move CSP operators to paddle/fluid/framework/operators/concurrency
 add_subdirectory(concurrency)
 op_library(channel_send_op DEPS concurrency)
 op_library(channel_recv_op DEPS concurrency)
+endif(NOT WIN32)
 
 list(REMOVE_ITEM GENERAL_OPS ${DEPS_OPS})
 
diff --git a/paddle/fluid/platform/port.h b/paddle/fluid/platform/port.h
index a0a2d29500e..b701bd729a9 100644
--- a/paddle/fluid/platform/port.h
+++ b/paddle/fluid/platform/port.h
@@ -14,15 +14,22 @@
 
 #pragma once
 
+#include <cstdio>
 #include <stdexcept>
+
 #include <string>
 
 #if !defined(_WIN32)
 #include <dlfcn.h>     // for dladdr
 #include <execinfo.h>  // for backtrace
+#include <sys/stat.h>
 #else
-#include <Shlwapi.h>
-#include <Windows.h>
+#include <io.h>  // _popen, _pclose
+#include <windows.h>
+
+#ifndef S_ISDIR  // windows port for sys/stat.h
+#define S_ISDIR(mode) (((mode)&S_IFMT) == S_IFDIR)
+#endif
 
 static void* dlsym(void* handle, const char* symbol_name) {
   FARPROC found_symbol;
@@ -34,4 +41,43 @@ static void* dlsym(void* handle, const char* symbol_name) {
   return reinterpret_cast<void*>(found_symbol);
 }
 
-#endif
+#endif  // !_WIN32
+
+static void ExecShellCommand(const std::string &cmd, std::string *message) {
+  char buffer[128];
+#if !defined(_WIN32)
+  std::shared_ptr<FILE> pipe(popen(cmd.c_str(), "r"), pclose);
+#else
+  std::shared_ptr<FILE> pipe(_popen(cmd.c_str(), "r"), _pclose);
+#endif  // _WIN32
+  if (!pipe) {
+    LOG(ERROR) << "error running command: " << cmd;
+    return;
+  }
+  while (!feof(pipe.get())) {
+    if (fgets(buffer, 128, pipe.get()) != nullptr) {
+      *message += buffer;
+    }
+  }
+}
+
+static bool PathExists(const std::string &path) {
+#if !defined(_WIN32)
+  struct stat statbuf;
+  if (stat(path.c_str(), &statbuf) != -1) {
+    if (S_ISDIR(statbuf.st_mode)) {
+      return true;
+    }
+  }
+#else
+  struct _stat statbuf;
+  if (_stat(path.c_str(), &statbuf) != -1) {
+    if (S_ISDIR(statbuf.st_mode)) {
+      return true;
+    }
+  }
+#endif  // !_WIN32
+  return false;
+}
+
+static FILE
-- 
GitLab