Add init interface for customize devices. #10167

wanghaoshuang · 2018-04-24T05:52:40Z

在当前单测实现逻辑中，RUN_ALL_TESTS()前需要初始化所有device，这与"初始化部分devices"的单测有所冲突，所以这个pr没有对void InitDevices(bool init_p2p, const std::vector<int> devices)进行单测。

在线下，通过注释掉这句，通过了以下单测：

 TEST(InitDevices, single_CUDA) {
    using paddle::framework::Init;
    using paddle::platform::DeviceContextPool;
 
  #ifdef PADDLE_WITH_CUDA
    int count = paddle::platform::GetCUDADeviceCount();
    std::vector<char*> argvs;
    argvs.push_back(strdup("--devices=0,1"));
    int argc = static_cast<int>(argvs.size());
    char** argv = argvs.data();
    Init(&argc, &argv);
    DeviceContextPool& pool = DeviceContextPool::Instance();
    ASSERT_EQ(pool.size(), 3U);
  #endif
  }

Xreki · 2018-04-24T06:05:08Z

paddle/fluid/inference/io.h

@@ -27,6 +27,8 @@ namespace inference {

 void Init(bool init_p2p);


这个Init接口可以删掉了。

Xreki · 2018-04-24T06:09:04Z

paddle/fluid/framework/init.cc

+#endif
+
+  for (size_t i = 0; i < devices.size(); ++i) {
+    if (devices[i] >= count) {


devices[i]必须：

> 0

不能重复
这个能不能保证下？

@Xreki DeviceContextPool有对places去重，而且CUDAPlace按device_id判断是否相等：https://github.com/PaddlePaddle/Paddle/blob/develop/paddle/fluid/platform/place.h#L41
所以，我们不用在这里check是否重复

Xreki · 2018-04-24T06:18:38Z

paddle/fluid/framework/init.cc

+
+void Init(int argc, char **argv) {
+  std::call_once(gflags_init_flag,
+                 [&]() { google::ParseCommandLineFlags(&argc, &argv, true); });


这里调用InitGflags，然后修复下IntiGflags的问题？

Xreki · 2018-04-24T06:19:27Z

paddle/fluid/framework/init.cc


 #include "paddle/fluid/framework/init.h"
 #include "paddle/fluid/framework/operator.h"
 #include "paddle/fluid/platform/device_context.h"
+#include "paddle/fluid/platform/device_context.h"


头文件重复了？

qingqing01 · 2018-04-24T06:44:00Z

paddle/fluid/framework/init.cc

@@ -64,6 +85,30 @@ void InitP2P(int count) {
 #endif
 }

+void InitP2P(std::vector<int> devices) {


line67行的InitP2P函数，可以直接调用该函数吧

我的意思是：void InitP2P(int count) 和你新加的 InitP2P(std::vector<int> devices) 内部实现几乎一样，可以先把 std::vector<int> devices构造出来，直接调用新增的这个。或者上面那个还有必要存在吗？

@qingqing01 明白了，我改成在InitDevices(bool initP2P) 里调用InitDevices(bool initP2P, vector<int> devices), 然后void InitP2P(int count)也就没用了，已将其删除。

… fluid_init

qingqing01 · 2018-04-24T09:55:39Z

paddle/fluid/inference/io.h

@@ -25,7 +25,7 @@ limitations under the License. */
 namespace paddle {
 namespace inference {

-void Init(bool init_p2p);
+void Init(const std::vector<std::string> argv);


Why there are two Init interfaces, one in paddle/fluid/inference/io.h, another in paddle/fluid/framework/init.h ?

paddle/fluid/framework/init.h中的init确实多余，也没有被其它地方用到，已经将其删除。

@qingqing01 @wanghaoshuang

Paddle/paddle/fluid/inference/io.cc

Lines 27 to 29 in c6a7042

// Temporarily add this function for exposing framework::InitDevices() when

// linking the inference shared library.

void Init(bool init_p2p) { framework::InitDevices(init_p2p); }

这里有注释。因为当前libpaddle_fluid.so不再使用whole-archive链接，而framework/init.h中的函数，没有被Fluid其他的C++代码调用到，在链接生成libpaddle_fluid.so的时候，framework/init.h里面的符号就没有链接进来。用户inference代码里面需要显式调用paddle::framework::InitDevices，在使用libpaddle_fluid.so的时候，会出现undefined symbols paddle::framework::InitDevices的错误。

Xreki · 2018-04-24T12:15:30Z

paddle/fluid/framework/init.cc

@@ -31,6 +30,7 @@ std::once_flag p2p_init_flag;

 void InitGflags(std::vector<std::string> argv) {
  std::call_once(gflags_init_flag, [&]() {
+    argv.push_back("dummy");


这里是不是应该插入到argv[0]之前？

是的，感谢提醒。

qingqing01 · 2018-04-26T01:40:57Z

paddle/fluid/inference/io.cc

 #include "paddle/fluid/framework/block_desc.h"
 #include "paddle/fluid/framework/feed_fetch_type.h"
 #include "paddle/fluid/framework/op_registry.h"
 #include "paddle/fluid/pybind/pybind.h"

+DEFINE_string(devices, "", "The devices to be used.");


注释里需要说明分割符是什么

qingqing01 · 2018-04-26T02:16:25Z

paddle/fluid/inference/io.cc

 #include "paddle/fluid/framework/block_desc.h"
 #include "paddle/fluid/framework/feed_fetch_type.h"
 #include "paddle/fluid/framework/op_registry.h"
 #include "paddle/fluid/pybind/pybind.h"

+DEFINE_string(devices, "", "The devices to be used.");
+DEFINE_bool(init_p2p, true, "Whether to init p2p.");


默认是False吧，单机单卡的行为不需要p2p吧。

qingqing01

LGTM. But @Xreki please have a look again.

Xreki

LGTM and thanks very much.

Add init interface for customize devices.

1bdea0a

wanghaoshuang requested review from Xreki and qingqing01 April 24, 2018 05:53

Xreki reviewed Apr 24, 2018

View reviewed changes

qingqing01 reviewed Apr 24, 2018

View reviewed changes

Refine code.

48b7b54

Xreki added the 预测原名Inference，包含Capi预测问题等 label Apr 24, 2018

wanghaoshuang added 3 commits April 24, 2018 16:14

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

f31bb14

… fluid_init

Reuse 'initP2P(bool, std::vector)' in 'initP2P(bool)'

a0b2582

Fix cpplint format.

e470856

qingqing01 reviewed Apr 24, 2018

View reviewed changes

Remove initP2P(bool) and init function in framework.

a4b452a

Xreki reviewed Apr 24, 2018

View reviewed changes

wanghaoshuang added 2 commits April 24, 2018 21:01

Fix InitGflags.

3d96b38

Fix devices 'not undefined' error.

ad3f6f4

qingqing01 reviewed Apr 26, 2018

View reviewed changes

Fix comments.

848fb00

qingqing01 reviewed Apr 26, 2018

View reviewed changes

Xreki approved these changes Apr 26, 2018

View reviewed changes

wanghaoshuang merged commit 2f9fa9b into PaddlePaddle:develop Apr 27, 2018

wanghaoshuang deleted the fluid_init branch May 20, 2022 03:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add init interface for customize devices. #10167

Add init interface for customize devices. #10167

wanghaoshuang commented Apr 24, 2018 •

edited

Loading

Xreki Apr 24, 2018

wanghaoshuang Apr 24, 2018

Xreki Apr 24, 2018

wanghaoshuang Apr 24, 2018

Xreki Apr 24, 2018

wanghaoshuang Apr 24, 2018

Xreki Apr 24, 2018

wanghaoshuang Apr 24, 2018

qingqing01 Apr 24, 2018

wanghaoshuang Apr 24, 2018

qingqing01 Apr 24, 2018

wanghaoshuang Apr 24, 2018

qingqing01 Apr 24, 2018

wanghaoshuang Apr 24, 2018 •

edited

Loading

Xreki Apr 24, 2018

Xreki Apr 24, 2018

wanghaoshuang Apr 24, 2018

qingqing01 Apr 26, 2018 •

edited

Loading

qingqing01 Apr 26, 2018

qingqing01 left a comment

Xreki left a comment

		@@ -27,6 +27,8 @@ namespace inference {

		void Init(bool init_p2p);

	// Temporarily add this function for exposing framework::InitDevices() when
	// linking the inference shared library.
	void Init(bool init_p2p) { framework::InitDevices(init_p2p); }

Add init interface for customize devices. #10167

Add init interface for customize devices. #10167

Conversation

wanghaoshuang commented Apr 24, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

wanghaoshuang Apr 24, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

qingqing01 Apr 26, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

qingqing01 left a comment

Choose a reason for hiding this comment

Xreki left a comment

Choose a reason for hiding this comment

wanghaoshuang commented Apr 24, 2018 •

edited

Loading

wanghaoshuang Apr 24, 2018 •

edited

Loading

qingqing01 Apr 26, 2018 •

edited

Loading