提交 6e9a104d 编写于 作者: M Megvii Engine Team 提交者: Xinran Xu

fix(mge/cmake): fix cmake for opencl and add some minor fixes

GitOrigin-RevId: 9ea1c814078306ebcba769cedbbd172089590af4
上级 9a42c636
...@@ -122,7 +122,7 @@ struct InputVisitor { ...@@ -122,7 +122,7 @@ struct InputVisitor {
size_t IC; size_t IC;
InputVisitor(size_t IC) : IC(IC) {} InputVisitor(size_t IC) : IC(IC) {}
size_t get(size_t alpha, size_t ic, size_t IH, size_t IW, size_t ih, size_t get(size_t /*alpha*/, size_t ic, size_t IH, size_t IW, size_t ih,
size_t iw) { size_t iw) {
constexpr size_t input_pack_size = layout_pack_size(layout); constexpr size_t input_pack_size = layout_pack_size(layout);
size_t icb_layout = ic / input_pack_size; size_t icb_layout = ic / input_pack_size;
......
...@@ -25,13 +25,6 @@ ...@@ -25,13 +25,6 @@
using namespace mgb; using namespace mgb;
namespace mgb {
static inline std::ostream& operator << (std::ostream &os,
const CompNode::Locator &l) {
return os << l.to_string();
}
}
TEST(TestCompNode, Parse) { TEST(TestCompNode, Parse) {
using L = CompNode::Locator; using L = CompNode::Locator;
using D = CompNode::DeviceType; using D = CompNode::DeviceType;
...@@ -49,13 +42,13 @@ TEST(TestCompNode, Parse) { ...@@ -49,13 +42,13 @@ TEST(TestCompNode, Parse) {
ASSERT_EQ(L::parse("cpu2:23"), make_lc(D::CPU, 2, 23)); ASSERT_EQ(L::parse("cpu2:23"), make_lc(D::CPU, 2, 23));
ASSERT_EQ(L::parse("cpu21:23"), make_lc(D::CPU, 21, 23)); ASSERT_EQ(L::parse("cpu21:23"), make_lc(D::CPU, 21, 23));
ASSERT_EQ(L::parse("xpu"), make_lc(D::UNSPEC, -1, 0)); ASSERT_EQ(L::parse("xpu"), make_lc(D::UNSPEC, -1, 0));
ASSERT_EQ(L::parse("xpux"), make_lc(D::UNSPEC, -1, 0)); ASSERT_EQ(L::parse("xpux"), make_lc(D::UNSPEC, -1, 0));
ASSERT_EQ(L::parse("xpu23"), make_lc(D::UNSPEC, 23, 0)); ASSERT_EQ(L::parse("xpu23"), make_lc(D::UNSPEC, 23, 0));
ASSERT_EQ(L::parse("xpu23:1"), make_lc(D::UNSPEC, 23, 1)); ASSERT_EQ(L::parse("xpu23:1"), make_lc(D::UNSPEC, 23, 1));
ASSERT_EQ(L::parse("cpu:default"), make_lc(D::CPU, L::DEVICE_CPU_DEFAULT, 0)); ASSERT_EQ(L::parse("cpu:default"),
make_lc(D::CPU, L::DEVICE_CPU_DEFAULT, 0));
ASSERT_EQ(L::parse("multithread0:2"), make_lc(D::MULTITHREAD, 0, 2)); ASSERT_EQ(L::parse("multithread0:2"), make_lc(D::MULTITHREAD, 0, 2));
ASSERT_EQ(L::parse("multithread1:3"), make_lc(D::MULTITHREAD, 1, 3)); ASSERT_EQ(L::parse("multithread1:3"), make_lc(D::MULTITHREAD, 1, 3));
ASSERT_EQ(L::parse("multithread:default:2"), ASSERT_EQ(L::parse("multithread:default:2"),
...@@ -198,18 +191,18 @@ TEST(TestCompNodeCPU, CoreAffinity) { ...@@ -198,18 +191,18 @@ TEST(TestCompNodeCPU, CoreAffinity) {
auto empty_task = []() {}; auto empty_task = []() {};
auto cn0 = CompNode::load("cpu:default"), cn1 = CompNode::load("cpu0"), auto cn0 = CompNode::load("cpu:default"), cn1 = CompNode::load("cpu0"),
cn2 = CompNode::load("multithread0:2"); cn2 = CompNode::load("multithread0:2");
auto binding0 = [&](size_t thread_id) { data0 = 10; }; auto binding0 = [&](size_t) { data0 = 10; };
CompNodeEnv::from_comp_node(cn0).cpu_env().set_affinity(binding0); CompNodeEnv::from_comp_node(cn0).cpu_env().set_affinity(binding0);
CompNodeEnv::from_comp_node(cn0).cpu_env().dispatch(empty_task); CompNodeEnv::from_comp_node(cn0).cpu_env().dispatch(empty_task);
cn0.sync(); cn0.sync();
auto binding1 = [&](size_t thread_id) { data1 = 20; }; auto binding1 = [&](size_t) { data1 = 20; };
CompNodeEnv::from_comp_node(cn1).cpu_env().set_affinity(binding1); CompNodeEnv::from_comp_node(cn1).cpu_env().set_affinity(binding1);
CompNodeEnv::from_comp_node(cn1).cpu_env().dispatch(empty_task); CompNodeEnv::from_comp_node(cn1).cpu_env().dispatch(empty_task);
cn1.sync(); cn1.sync();
auto binding2 = [&](size_t thread_id) { data_v[thread_id] = 30; }; auto binding2 = [&](size_t thread_id) { data_v[thread_id] = 30; };
auto temp_task = [](size_t index, size_t thread_id) {}; auto temp_task = [](size_t, size_t) {};
CompNodeEnv::from_comp_node(cn2).cpu_env().set_affinity(binding2); CompNodeEnv::from_comp_node(cn2).cpu_env().set_affinity(binding2);
CompNodeEnv::from_comp_node(cn2).cpu_env().dispatch(temp_task, 40u); CompNodeEnv::from_comp_node(cn2).cpu_env().dispatch(temp_task, 40u);
cn2.sync(); cn2.sync();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册