Refactor scope #3652
Merged
Refactor scope #3652
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lixinqi
commented
Oct 6, 2020
ci/test/1node_op_test.sh
Outdated
Comment on lines
15
to
18
| true \ | ||
| && ONEFLOW_TEST_DEVICE_NUM=1 python3 -m unittest --failfast --verbose \ | ||
| && ONEFLOW_TEST_DEVICE_NUM=2 python3 -m unittest --failfast --verbose \ | ||
| && ONEFLOW_TEST_DEVICE_NUM=4 python3 -m unittest --failfast --verbose |
There was a problem hiding this comment.
什么意思，这个脚本已经加了 set -ex，出错就退出了，不需要加&吧
There was a problem hiding this comment.
@jackalcooper bash -e 对 && || 的处理比较坑，https://stackoverflow.com/questions/41760057/bash-e-flag-and-list-command ，只有最后一个子命令出错才会退出
| @@ -0,0 +1,129 @@ | |||
| """ | |||
There was a problem hiding this comment.
这就是旧的scope_util.py，原来名字不太好。
| return scope | ||
|
|
||
|
|
||
| def MakeInitialScope(job_conf, device_tag, machine_device_ids, is_mirrored): |
There was a problem hiding this comment.
这个函数是从compiler.py移动过来的，其他都是从Session类里移动过来的。
| return scope | ||
|
|
||
|
|
||
| def InitScopeStack(): |
| @@ -70,13 +70,11 @@ def __init__(self): | |||
| self.interface_op_name2op_attr_ = {} | |||
| self.interface_op_name2job_name_ = {} | |||
| self.job_name2name_scope_stack_ = {} | |||
| self.job_name2current_scope_ = {} | |||
There was a problem hiding this comment.
Scope不需要特别强调是属于哪个job的scope，它都不是Session的成员。
jackalcooper
approved these changes
Oct 6, 2020
liujuncheng
pushed a commit
that referenced
this pull request
Jun 3, 2021
* refactor Session.job_name2current_scope_ to Session.scope_stack_ * Seperate scope related functions from Session to scope_util.py * revert change Co-authored-by: Shenghang Tsai <jackalcooper@gmail.com> Former-commit-id: 278b50a
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
将Scope相关的函数从Session移动到新文件scope_util.py，原来scope_util.py被重命名为scope_symbol.py