From 335398f18b5066c77f5104664a1db1c0b38f2b93 Mon Sep 17 00:00:00 2001
From: dzhwinter <dzhwinter@gmail.com>
Date: Fri, 17 Aug 2018 07:27:46 +0000
Subject: [PATCH] dlfnh

---
 paddle/fluid/platform/dynload/cublas.h  | 3 ++-
 paddle/fluid/platform/dynload/cudnn.h   | 2 +-
 paddle/fluid/platform/dynload/cupti.h   | 2 +-
 paddle/fluid/platform/dynload/curand.h  | 2 +-
 paddle/fluid/platform/dynload/mklml.h   | 3 ++-
 paddle/fluid/platform/dynload/nccl.h    | 3 +--
 paddle/fluid/platform/dynload/warpctc.h | 3 +--
 paddle/fluid/platform/enforce.h         | 4 +---
 paddle/fluid/platform/port.h            | 6 ++++++
 9 files changed, 16 insertions(+), 12 deletions(-)
 create mode 100644 paddle/fluid/platform/port.h

diff --git a/paddle/fluid/platform/dynload/cublas.h b/paddle/fluid/platform/dynload/cublas.h
index 25bcda7eed..963cbf896e 100644
--- a/paddle/fluid/platform/dynload/cublas.h
+++ b/paddle/fluid/platform/dynload/cublas.h
@@ -17,10 +17,11 @@
 #include <cublasXt.h>
 #include <cublas_v2.h>
 #include <cuda.h>
-#include <dlfcn.h>
 #include <mutex>  // NOLINT
 #include <type_traits>
 #include "paddle/fluid/platform/dynload/dynamic_loader.h"
+#include "paddle/fluid/platform/port.h"
+
 
 namespace paddle {
 namespace platform {
diff --git a/paddle/fluid/platform/dynload/cudnn.h b/paddle/fluid/platform/dynload/cudnn.h
index 77e46fa768..0103e7a3ac 100644
--- a/paddle/fluid/platform/dynload/cudnn.h
+++ b/paddle/fluid/platform/dynload/cudnn.h
@@ -15,9 +15,9 @@ limitations under the License. */
 #pragma once
 
 #include <cudnn.h>
-#include <dlfcn.h>
 #include <mutex>  // NOLINT
 #include "paddle/fluid/platform/dynload/dynamic_loader.h"
+#include "paddle/fluid/platform/port.h"
 
 namespace paddle {
 namespace platform {
diff --git a/paddle/fluid/platform/dynload/cupti.h b/paddle/fluid/platform/dynload/cupti.h
index e8f4a82ef1..b946f46e82 100644
--- a/paddle/fluid/platform/dynload/cupti.h
+++ b/paddle/fluid/platform/dynload/cupti.h
@@ -17,10 +17,10 @@ limitations under the License. */
 
 #include <cuda.h>
 #include <cupti.h>
-#include <dlfcn.h>
 #include <mutex>  // NOLINT
 
 #include "paddle/fluid/platform/dynload/dynamic_loader.h"
+#include "paddle/fluid/platform/port.h"
 
 namespace paddle {
 namespace platform {
diff --git a/paddle/fluid/platform/dynload/curand.h b/paddle/fluid/platform/dynload/curand.h
index 5b9e0820e0..2daf1b4215 100644
--- a/paddle/fluid/platform/dynload/curand.h
+++ b/paddle/fluid/platform/dynload/curand.h
@@ -14,9 +14,9 @@ limitations under the License. */
 #pragma once
 
 #include <curand.h>
-#include <dlfcn.h>
 
 #include <mutex>  // NOLINT
+#include "paddle/fluid/platform/port.h"
 
 #include "paddle/fluid/platform/dynload/dynamic_loader.h"
 
diff --git a/paddle/fluid/platform/dynload/mklml.h b/paddle/fluid/platform/dynload/mklml.h
index 9e7a616094..0150501418 100644
--- a/paddle/fluid/platform/dynload/mklml.h
+++ b/paddle/fluid/platform/dynload/mklml.h
@@ -14,9 +14,10 @@ limitations under the License. */
 
 #pragma once
 
-#include <dlfcn.h>
+
 #include <mkl.h>
 #include <mutex>  // NOLINT
+#include "paddle/fluid/platform/port.h"
 #include "paddle/fluid/platform/dynload/dynamic_loader.h"
 
 namespace paddle {
diff --git a/paddle/fluid/platform/dynload/nccl.h b/paddle/fluid/platform/dynload/nccl.h
index 575516f818..e0f756c409 100644
--- a/paddle/fluid/platform/dynload/nccl.h
+++ b/paddle/fluid/platform/dynload/nccl.h
@@ -13,11 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 #pragma once
 
-#include <dlfcn.h>
 #include <nccl.h>
 
 #include <mutex>  // NOLINT
-
+#include "paddle/fluid/platform/port.h"
 #include "paddle/fluid/platform/dynload/dynamic_loader.h"
 
 namespace paddle {
diff --git a/paddle/fluid/platform/dynload/warpctc.h b/paddle/fluid/platform/dynload/warpctc.h
index d157c1fda7..b46d41d1d3 100644
--- a/paddle/fluid/platform/dynload/warpctc.h
+++ b/paddle/fluid/platform/dynload/warpctc.h
@@ -14,9 +14,8 @@ limitations under the License. */
 
 #pragma once
 
-#include <dlfcn.h>
 #include <mutex>  // NOLINT
-
+#include "paddle/fluid/platform/port.h"
 #include "paddle/fluid/platform/dynload/dynamic_loader.h"
 #include "warpctc/include/ctc.h"
 
diff --git a/paddle/fluid/platform/enforce.h b/paddle/fluid/platform/enforce.h
index 81b5359b40..182a18f3e1 100644
--- a/paddle/fluid/platform/enforce.h
+++ b/paddle/fluid/platform/enforce.h
@@ -14,9 +14,6 @@ limitations under the License. */
 
 #pragma once
 
-#include <dlfcn.h>     // for dladdr
-#include <execinfo.h>  // for backtrace
-
 #ifdef __GNUC__
 #include <cxxabi.h>  // for __cxa_demangle
 #endif               // __GNUC__
@@ -36,6 +33,7 @@ limitations under the License. */
 #include <string>
 
 #include "glog/logging.h"
+#include "paddle/fluid/platform/port.h"
 #include "paddle/fluid/platform/macros.h"
 #include "paddle/fluid/string/printf.h"
 #include "paddle/fluid/string/to_string.h"
diff --git a/paddle/fluid/platform/port.h b/paddle/fluid/platform/port.h
new file mode 100644
index 0000000000..df88270694
--- /dev/null
+++ b/paddle/fluid/platform/port.h
@@ -0,0 +1,6 @@
+#pragma once
+
+#if !define(WIN32)
+#include <dlfcn.h>     // for dladdr
+#include <execinfo.h>  // for backtrace
+#endif
\ No newline at end of file
-- 
GitLab