New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MetaSchedule][M3a] SearchStrategy #9132

Merged

junrushao merged 8 commits into apache:main from zxybazh:tensorir-infra/upstream/2021-09-23/search-strategy

Sep 29, 2021

Member

zxybazh commented Sep 26, 2021 •

edited

Loading

This PR is part of the stage M3a of the meta schedule project (#8473).

The architecture is re-designed by Junru and Xiyou. SearchStrategy is designed to generate measure candidates, i.e., schedules and corresponding argument information for later profiling. Apart from the c++ side implementation, we also include python-side customizable search strategy class PySearchStrategy and trace replaying based search strategy class, i.e., generating schedule from a trace and random arguments, ReplayTrace. Unit tests are also included.

For usage of related class, we introduced MeasureCandidate class to store search strategy's result and RunnerResult class to store results from runner. We also adjusted some sampling primitives for usage in meta schedule.

Co-authored-by: Junru Shao <junrushao1994@gmail.com>
Co-authored-by: Bohan Hou <32121147+spectrometerHBH@users.noreply.github.com>
Co-authored-by: Ruihang Lai <lairuihangdongdong@qq.com>
Co-authored-by: Hongyi Jin <3231950289@qq.com>
Co-authored-by: Wuwei Lin <wuwei@apache.org>
Co-authored-by: Siyuan Feng <Hzfengsy@sjtu.edu.cn>

zxybazh requested review from areusch, comaniac, Hzfengsy, jroesch, junrushao, kparzysz-quic, masahi, merrymercy, tqchen, vinx13, yzhliu, zhiics and ZihengJiang as code owners

September 26, 2021 22:16

junrushao mentioned this pull request

[RFC][Tracking Issue] Meta Schedule (AutoTIR) #8473

Closed

62 tasks

Member

junrushao commented Sep 27, 2021

@zxybazh please fix the lint :-)

junrushao reviewed

View reviewed changes

include/tvm/meta_schedule/search_strategy.h Outdated Show resolved Hide resolved

tkonolige reviewed

View reviewed changes

Contributor

tkonolige left a comment

Overall structure of this looks good to me. I would like to a see a little more documentation around SearchStrategy as it is a core interface in tuning.

src/meta_schedule/search_strategy/replay_trace.cc Outdated Show resolved Hide resolved

src/meta_schedule/search_strategy/replay_trace.cc Outdated Show resolved Hide resolved

src/meta_schedule/utils.h Outdated Show resolved Hide resolved

include/tvm/meta_schedule/search_strategy.h Outdated Show resolved Hide resolved

include/tvm/meta_schedule/search_strategy.h Outdated Show resolved Hide resolved

include/tvm/meta_schedule/search_strategy.h Outdated Show resolved Hide resolved

include/tvm/meta_schedule/runner.h Outdated Show resolved Hide resolved

include/tvm/meta_schedule/runner.h Outdated Show resolved Hide resolved

include/tvm/meta_schedule/search_strategy.h Outdated Show resolved Hide resolved

include/tvm/meta_schedule/search_strategy.h Show resolved Hide resolved

Member

junrushao commented Sep 28, 2021

Yeah I agree with @tkonolige that we need a high-level description of how the SearchStrategy object is expected to work, like, when each method is called and what are the expected inputs/outputs, etc

Member Author

zxybazh commented Sep 28, 2021

Fixed docs and added some interesting figure. Ready for another round of review.

junrushao reviewed

View reviewed changes

include/tvm/meta_schedule/search_strategy.h Outdated Show resolved Hide resolved

junrushao reviewed

View reviewed changes

include/tvm/meta_schedule/search_strategy.h Show resolved Hide resolved

junrushao reviewed

View reviewed changes

include/tvm/meta_schedule/search_strategy.h Show resolved Hide resolved

junrushao reviewed

View reviewed changes

include/tvm/meta_schedule/space_generator.h Show resolved Hide resolved

junrushao reviewed

View reviewed changes

Member

junrushao left a comment

Overall I believe this PR is in pretty good state. Will merge it in after some minor nitpicks are addressed. Thanks @zxybazh!

zxybazh and others added 6 commits

September 28, 2021 10:45


          Add c++ side SearchStrategy.

c3bdf42

Co-authored-by: Junru Shao <junrushao1994@gmail.com>
Co-authored-by: Bohan Hou <32121147+spectrometerHBH@users.noreply.github.com>
Co-authored-by: Ruihang Lai <lairuihangdongdong@qq.com>
Co-authored-by: Hongyi Jin <3231950289@qq.com>
Co-authored-by: Wuwei Lin <wuwei@apache.org>
Co-authored-by: Siyuan Feng <Hzfengsy@sjtu.edu.cn>


          Add python-side code & test.

580545c

Co-authored-by: Junru Shao <junrushao1994@gmail.com>
Co-authored-by: Bohan Hou <32121147+spectrometerHBH@users.noreply.github.com>
Co-authored-by: Ruihang Lai <lairuihangdongdong@qq.com>
Co-authored-by: Hongyi Jin <3231950289@qq.com>
Co-authored-by: Wuwei Lin <wuwei@apache.org>
Co-authored-by: Siyuan Feng <Hzfengsy@sjtu.edu.cn>


          Add docs.

11570e5


          Minor fix.

9affcfb


          Add workflow.

62b9545


          Add docs.

aadb218


          Fix docs.

4d95b27

zxybazh force-pushed the tensorir-infra/upstream/2021-09-23/search-strategy branch from d16d672 to 4d95b27 Compare

September 28, 2021 17:50

junrushao approved these changes

View reviewed changes

tkonolige reviewed

View reviewed changes

include/tvm/meta_schedule/search_strategy.h Show resolved Hide resolved

include/tvm/meta_schedule/search_strategy.h Show resolved Hide resolved


          Add notes.

jcf94 approved these changes

View reviewed changes

Member Author

zxybazh commented Sep 29, 2021

Let's get it merged if there are no further issues.

junrushao merged commit a16ccf4 into apache:main

AndrewZhaoLuo added a commit to AndrewZhaoLuo/tvm that referenced this pull request


          Merge branch 'main' into aluo/onnx/support-nllloss-tests

6f5aeb1

* main:
  Fix flaky NMS test by making sure scores are unique (apache#9140)
  [Relay] Merge analysis/context_analysis.cc and transforms/device_annotation.cc (apache#9038)
  [LLVM] Make changes needed for opaque pointers (apache#9138)
  Arm(R) Ethos(TM)-U NPU codegen integration (apache#8849)
  [CI] Split Integration tests out of first phase of pipeline (apache#9128)
  [Meta Schedule][M3b] Runner (apache#9111)
  Fix Google Mock differences between Ubuntu 18.04 and 16.04 (apache#9141)
  [TIR] add loop partition hint pragma (apache#9121)
  fix things (apache#9146)
  [Meta Schedule][M3a] SearchStrategy (apache#9132)
  [Frontend][PyTorch] support for quantized conv_transpose2d op (apache#9133)
  [UnitTest] Parametrized test_conv2d_int8_intrinsics (apache#9143)
  [OpenCL] Remove redundant visit statement in CodeGen. (apache#9144)
  [BYOC] support arbitrary input dims for add/mul/relu of dnnl c_src codegen (apache#9127)
  [Relay][ConvertLayout] Support for qnn.conv2d_transpose (apache#9139)
  add nn.global_avgpool to fq2i (apache#9137)
  [UnitTests] Enable minimum testing on Vulkan target in CI (apache#9093)
  [Torch] Support returning quantized weights and bias for BYOC use cases (apache#9135)
  [Relay] Prepare for new plan_devices.cc (part II) (apache#9130)
  [microTVM][Zephyr] Add MIMXRT1050 board support (apache#9068)

AndrewZhaoLuo added a commit to AndrewZhaoLuo/tvm that referenced this pull request


          Merge branch 'main' into aluo/support-negative-indices

c9b4589

* main: (80 commits)
  Introduce centralised name transformation functions (apache#9088)
  [OpenCL] Add vectorization to cuda conv2d_nhwc schedule (apache#8636)
  [6/6] Arm(R) Ethos(TM)-U NPU codegen integration with `tvmc` (apache#8854)
  [microTVM] Add wrapper for creating project using a MLF (apache#9090)
  Fix typo (apache#9156)
  [Hotfix][Testing] Wait for RPCServer to be established (apache#9150)
  Update find cublas so it search default path if needed. (apache#9149)
  [TIR][LowerMatchBuffer] Fix lowering strides when source region has higher dimension than the buffer (apache#9145)
  Fix flaky NMS test by making sure scores are unique (apache#9140)
  [Relay] Merge analysis/context_analysis.cc and transforms/device_annotation.cc (apache#9038)
  [LLVM] Make changes needed for opaque pointers (apache#9138)
  Arm(R) Ethos(TM)-U NPU codegen integration (apache#8849)
  [CI] Split Integration tests out of first phase of pipeline (apache#9128)
  [Meta Schedule][M3b] Runner (apache#9111)
  Fix Google Mock differences between Ubuntu 18.04 and 16.04 (apache#9141)
  [TIR] add loop partition hint pragma (apache#9121)
  fix things (apache#9146)
  [Meta Schedule][M3a] SearchStrategy (apache#9132)
  [Frontend][PyTorch] support for quantized conv_transpose2d op (apache#9133)
  [UnitTest] Parametrized test_conv2d_int8_intrinsics (apache#9143)
  ...

junrushao mentioned this pull request

Apache TVM v0.8 Release Note Candidate #9416

Closed

ylc pushed a commit to ylc/tvm that referenced this pull request


          [Meta Schedule][M3a] SearchStrategy (apache#9132)

e4fba79

* Add c++ side SearchStrategy.

Co-authored-by: Junru Shao <junrushao1994@gmail.com>
Co-authored-by: Bohan Hou <32121147+spectrometerHBH@users.noreply.github.com>
Co-authored-by: Ruihang Lai <lairuihangdongdong@qq.com>
Co-authored-by: Hongyi Jin <3231950289@qq.com>
Co-authored-by: Wuwei Lin <wuwei@apache.org>
Co-authored-by: Siyuan Feng <Hzfengsy@sjtu.edu.cn>

* Add python-side code & test.

Co-authored-by: Junru Shao <junrushao1994@gmail.com>
Co-authored-by: Bohan Hou <32121147+spectrometerHBH@users.noreply.github.com>
Co-authored-by: Ruihang Lai <lairuihangdongdong@qq.com>
Co-authored-by: Hongyi Jin <3231950289@qq.com>
Co-authored-by: Wuwei Lin <wuwei@apache.org>
Co-authored-by: Siyuan Feng <Hzfengsy@sjtu.edu.cn>

* Add docs.

* Minor fix.

* Add workflow.

* Add docs.

* Fix docs.

* Add notes.

Co-authored-by: Junru Shao <junrushao1994@gmail.com>
Co-authored-by: Bohan Hou <32121147+spectrometerHBH@users.noreply.github.com>
Co-authored-by: Ruihang Lai <lairuihangdongdong@qq.com>
Co-authored-by: Hongyi Jin <3231950289@qq.com>
Co-authored-by: Wuwei Lin <wuwei@apache.org>
Co-authored-by: Siyuan Feng <Hzfengsy@sjtu.edu.cn>

ylc pushed a commit to ylc/tvm that referenced this pull request


          [Meta Schedule][M3a] SearchStrategy (apache#9132)

c62c379

* Add c++ side SearchStrategy.

Co-authored-by: Junru Shao <junrushao1994@gmail.com>
Co-authored-by: Bohan Hou <32121147+spectrometerHBH@users.noreply.github.com>
Co-authored-by: Ruihang Lai <lairuihangdongdong@qq.com>
Co-authored-by: Hongyi Jin <3231950289@qq.com>
Co-authored-by: Wuwei Lin <wuwei@apache.org>
Co-authored-by: Siyuan Feng <Hzfengsy@sjtu.edu.cn>

* Add python-side code & test.

Co-authored-by: Junru Shao <junrushao1994@gmail.com>
Co-authored-by: Bohan Hou <32121147+spectrometerHBH@users.noreply.github.com>
Co-authored-by: Ruihang Lai <lairuihangdongdong@qq.com>
Co-authored-by: Hongyi Jin <3231950289@qq.com>
Co-authored-by: Wuwei Lin <wuwei@apache.org>
Co-authored-by: Siyuan Feng <Hzfengsy@sjtu.edu.cn>

* Add docs.

* Minor fix.

* Add workflow.

* Add docs.

* Fix docs.

* Add notes.

Co-authored-by: Junru Shao <junrushao1994@gmail.com>
Co-authored-by: Bohan Hou <32121147+spectrometerHBH@users.noreply.github.com>
Co-authored-by: Ruihang Lai <lairuihangdongdong@qq.com>
Co-authored-by: Hongyi Jin <3231950289@qq.com>
Co-authored-by: Wuwei Lin <wuwei@apache.org>
Co-authored-by: Siyuan Feng <Hzfengsy@sjtu.edu.cn>

junrushao changed the title ~~[Meta Schedule][M3a] SearchStrategy~~ [MetaSchedule][M3a] SearchStrategy

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

tkonolige tkonolige left review comments

jcf94 jcf94 approved these changes

junrushao junrushao approved these changes

areusch Awaiting requested review from areusch

comaniac Awaiting requested review from comaniac

Hzfengsy Awaiting requested review from Hzfengsy

jroesch Awaiting requested review from jroesch

kparzysz-quic Awaiting requested review from kparzysz-quic

masahi Awaiting requested review from masahi

merrymercy Awaiting requested review from merrymercy

tqchen Awaiting requested review from tqchen

vinx13 Awaiting requested review from vinx13

yzhliu Awaiting requested review from yzhliu

zhiics Awaiting requested review from zhiics

ZihengJiang Awaiting requested review from ZihengJiang

Labels

None yet