merge develop branch

CMakeLists.txt

@@ -207,11 +207,6 @@ endif()
 
 include(external/threadpool)
 
-include(flags)              # set paddle compile flags
-include(cudnn)              # set cudnn libraries, must before configure
-include(cupti)
-include(configure)          # add paddle env configuration
-
 if(WITH_GPU)
     include(cuda)
     include(tensorrt)

paddle/fluid/framework/CMakeLists.txt

@@ -114,10 +114,19 @@ else()
   cc_library(executor SRCS executor.cc DEPS op_registry device_context scope framework_proto glog lod_rank_table feed_fetch_method)
 endif()
 
+<<<<<<< HEAD
 
 
 if (NOT WIN32)
 cc_library(parallel_executor SRCS parallel_executor.cc DEPS threaded_ssa_graph_executor scope_buffered_ssa_graph_executor graph graph_viz_pass multi_devices_graph_pass multi_devices_graph_print_pass multi_devices_graph_check_pass)
+=======
+if (NOT WIN32)
+cc_library(parallel_executor SRCS parallel_executor.cc DEPS
+        threaded_ssa_graph_executor scope_buffered_ssa_graph_executor
+        graph graph_viz_pass multi_devices_graph_pass
+        multi_devices_graph_print_pass multi_devices_graph_check_pass
+        fast_threaded_ssa_graph_executor)
+>>>>>>> origin/develop
 endif() # NOT WIN32
 
 cc_library(prune SRCS prune.cc DEPS framework_proto)

paddle/fluid/operators/CMakeLists.txt

@@ -85,7 +85,11 @@ function(op_library TARGET)
 
     #remove windows unsupported op
     if (WIN32)
+<<<<<<< HEAD
     foreach(windows_unsupport_op "nccl_op" "gen_nccl_id_op" "warpctc_op")
+=======
+    foreach(windows_unsupport_op "nccl_op" "gen_nccl_id_op")
+>>>>>>> origin/develop
         if ("${TARGET}" STREQUAL "${windows_unsupport_op}")
           return()
         endif()

paddle/fluid/platform/dynload/cublas.h

@@ -22,7 +22,6 @@
 #include "paddle/fluid/platform/dynload/dynamic_loader.h"
 #include "paddle/fluid/platform/port.h"
 
-
 namespace paddle {
 namespace platform {
 namespace dynload {

paddle/fluid/platform/dynload/mklml.h

@@ -14,10 +14,8 @@ limitations under the License. */
 
 #pragma once
 
-
 #include <mkl.h>
 #include <mutex>  // NOLINT
-#include "paddle/fluid/platform/port.h"
 #include "paddle/fluid/platform/dynload/dynamic_loader.h"
 #include "paddle/fluid/platform/port.h"
 

paddle/fluid/platform/dynload/nccl.h

@@ -16,7 +16,6 @@ limitations under the License. */
 #include <nccl.h>
 
 #include <mutex>  // NOLINT
-#include "paddle/fluid/platform/port.h"
 #include "paddle/fluid/platform/dynload/dynamic_loader.h"
 #include "paddle/fluid/platform/port.h"
 

paddle/fluid/platform/dynload/warpctc.h

@@ -15,7 +15,6 @@ limitations under the License. */
 #pragma once
 
 #include <mutex>  // NOLINT
-#include "paddle/fluid/platform/port.h"
 #include "paddle/fluid/platform/dynload/dynamic_loader.h"
 #include "paddle/fluid/platform/port.h"
 #include "warpctc/include/ctc.h"

paddle/fluid/platform/port.h

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #pragma once
 
 #include <string>
@@ -23,4 +24,43 @@ static void* dlsym(void *handle, const char* symbol_name) {
 }
 } // namespace anoymous
 
-#endif
+#endif
+=======
+// Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
+//
+// 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
+//
+//     http://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.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <stdexcept>
+#include <string>
+
+#if !defined(_WIN32)
+#include <dlfcn.h>     // for dladdr
+#include <execinfo.h>  // for backtrace
+#else
+#include <Shlwapi.h>
+#include <Windows.h>
+
+static void* dlsym(void* handle, const char* symbol_name) {
+  FARPROC found_symbol;
+  found_symbol = GetProcAddress((HMODULE)handle, symbol_name);
+
+  if (found_symbol == NULL) {
+    throw std::runtime_error(std::string(symbol_name) + " not found.");
+  }
+  return reinterpret_cast<void*>(found_symbol);
+}
+
+#endif
+>>>>>>> origin/develop

paddle/fluid/pybind/CMakeLists.txt

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 set(PYBIND_DEPS pybind python proto_desc memory executor prune  feed_fetch_method)
 set(PYBIND_SRCS pybind.cc exception.cc protobuf.cc const_value.cc)
 if(NOT WIN32)
@@ -7,12 +8,20 @@ endif()
 if(WITH_PYTHON)
   if(WITH_AMD_GPU)
     hip_library(paddle_pybind SHARED
+<<<<<<< HEAD
       SRCS ${PYBIND_SRCS}
+=======
+      SRCS pybind.cc exception.cc protobuf.cc const_value.cc recordio.cc
+>>>>>>> origin/develop
       DEPS ${PYBIND_DEPS}
       ${GLOB_OP_LIB})
   else()
     cc_library(paddle_pybind SHARED
+<<<<<<< HEAD
       SRCS ${PYBIND_SRCS}
+=======
+      SRCS pybind.cc exception.cc protobuf.cc const_value.cc recordio.cc
+>>>>>>> origin/develop
       DEPS ${PYBIND_DEPS}
       ${GLOB_OP_LIB})
     if(NOT APPLE AND NOT ANDROID AND NOT WIN32)