update ipu related cmake (PaddlePaddle#406)

* update ipu related cmake

* up0

Author: gglin001

paddle/fluid/operators/jit/CMakeLists.txt

@@ -21,14 +21,8 @@ if(WITH_XBYAK)
     add_subdirectory(gen)
 endif()
 
-if(WITH_IPU)
-    set(JIT_IPU_DEPS ipu_backend)
-elseif(WITH_IPU)
-    set(JIT_IPU_DEPS "")
-endif()
-
-cc_library(jit_kernel_helper INTERFACE SRCS ${jit_kernel_cc_srcs} DEPS jit_kernel_base ${JIT_KERNEL_DEPS} ${JIT_IPU_DEPS})
-cc_test(jit_kernel_test SRCS test.cc DEPS jit_kernel_helper ${JIT_IPU_DEPS})
+cc_library(jit_kernel_helper INTERFACE SRCS ${jit_kernel_cc_srcs} DEPS jit_kernel_base ${JIT_KERNEL_DEPS})
+cc_test(jit_kernel_test SRCS test.cc DEPS jit_kernel_helper)
 if(NOT WIN32)
     cc_binary(jit_kernel_benchmark SRCS benchmark.cc DEPS jit_kernel_helper device_tracer tensor)
 endif()

paddle/fluid/platform/CMakeLists.txt

@@ -75,7 +75,7 @@ IF(WITH_GPU OR WITH_ROCM)
 ENDIF()
 
 IF(WITH_IPU)
-    set(IPU_CTX_DEPS ipu_backend)
+    set(IPU_CTX_DEPS ipu_info)
 ELSE()
     set(IPU_CTX_DEPS)
 ENDIF(WITH_IPU)

paddle/fluid/platform/device/ipu/CMakeLists.txt

@@ -1,19 +1,22 @@
 IF(WITH_IPU)
   FILE(GLOB POPART_CANONICALIZATION_SRC ${PADDLE_SOURCE_DIR}/paddle/fluid/platform/device/ipu/popart_canonicalization/*.cc)
   list(APPEND PADDLE_IPU_SRC ${POPART_CANONICALIZATION_SRC})
-  set(PADDLE_IPU_LIB "${CMAKE_CURRENT_BINARY_DIR}/libpaddle_ipu.so" CACHE STRING "")
-  set(PADDLE_IPU_LIB_DIR "${CMAKE_CURRENT_BINARY_DIR}" CACHE STRING "")
   set(IPU_BACKEND_SRC
-    "ipu_device.cc"
     "ipu_strategy.cc"
     "ipu_executor.cc"
     "ipu_compiler.cc"
     "ipu_backend.cc"
     "ipu_utils.cc"
   )
+  set(IPU_INFO_SRC
+    "ipu_info.cc"
+    "ipu_device.cc"
+  )
 
-  cc_library(ipu_backend SRCS ${IPU_BACKEND_SRC} DEPS popart graph framework_proto enforce graph_helper timer)
-  cc_library(ipu_info SRCS ipu_info.cc DEPS ipu_backend)
-  cc_library(paddle_ipu SHARED SRCS ${PADDLE_IPU_SRC} DEPS popart)
+  cc_library(ipu_backend SRCS ${IPU_BACKEND_SRC} DEPS popart graph graph_helper)
+  cc_library(ipu_info SRCS ${IPU_INFO_SRC} DEPS popart enforce)
+  cc_library(paddle_ipu SHARED SRCS ${PADDLE_IPU_SRC} DEPS popart graph_helper)
   add_dependencies(paddle_ipu ipu_backend)
+  set(PADDLE_IPU_LIB "${CMAKE_CURRENT_BINARY_DIR}/libpaddle_ipu.so" CACHE STRING "")
+  set(PADDLE_IPU_LIB_DIR "${CMAKE_CURRENT_BINARY_DIR}" CACHE STRING "")
 ENDIF()

paddle/fluid/platform/device/ipu/ipu_device.cc

@@ -13,12 +13,26 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include "paddle/fluid/platform/device/ipu/ipu_device.h"
-#include "paddle/fluid/platform/device/ipu/ipu_utils.h"
+#include "paddle/fluid/platform/enforce.h"
 
 namespace paddle {
 namespace platform {
 namespace ipu {
 
+// TODO(alleng) merge with ipu_utils
+static bool GetBoolEnv(std::string str) {
+  char* str_val = getenv(str.c_str());
+  if (str_val == NULL) {
+    return false;
+  } else {
+    bool val = false;
+    if (strcmp(str_val, "1") == 0 || strcmp(str_val, "true") == 0 ||
+        strcmp(str_val, "True") == 0 || strcmp(str_val, "TRUE") == 0)
+      val = true;
+    return val;
+  }
+}
+
 int GetNumDevices() {
   bool ipu_model = GetBoolEnv("POPLAR_IPUMODEL");
   if (ipu_model) {

paddle/fluid/platform/device/ipu/ipu_device.h

@@ -15,7 +15,6 @@ limitations under the License. */
 #pragma once
 
 #include <popart/devicemanager.hpp>
-#include "paddle/fluid/platform/enforce.h"
 
 namespace paddle {
 namespace platform {

paddle/fluid/platform/device/ipu/ipu_info.cc

@@ -16,12 +16,10 @@ namespace paddle {
 namespace platform {
 
 //! Get a list of device ids from environment variable or use all.
-std::vector<int> GetSelectedIPUDevices() {
-  return platform::ipu::GetDeviceIds();
-}
+std::vector<int> GetSelectedIPUDevices() { return ipu::GetDeviceIds(); }
 
 //! Get the total number of IPU devices in system.
-int GetIPUDeviceCount() { return platform::ipu::GetNumDevices(); }
+int GetIPUDeviceCount() { return ipu::GetNumDevices(); }
 
 }  // namespace platform
 }  // namespace paddle

python/paddle/fluid/tests/unittests/CMakeLists.txt

@@ -806,10 +806,6 @@ if (WITH_MKLDNN)
     add_subdirectory(mkldnn)
 endif()
 
-if (WITH_IPU)
-    add_subdirectory(ipu)
-endif()
-
 if (WITH_MLU)
     add_subdirectory(mlu)
 endif()