Skip to content
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

Update mock behaviour #10207

Merged
merged 8 commits into from
Apr 28, 2023
Merged

Update mock behaviour #10207

merged 8 commits into from
Apr 28, 2023

Conversation

Hank0626
Copy link
Contributor

  • 解决了DummyModule在isinstance因为是实例而会报错的问题
  • 为其增加__enter__和__exit__的报错
  • 完成以上的unittest

@Hank0626 Hank0626 requested a review from daquexian April 27, 2023 01:55
@Hank0626 Hank0626 requested a review from BBuf as a code owner April 27, 2023 01:55
@Hank0626 Hank0626 requested a review from oneflow-ci-bot April 27, 2023 02:15
@github-actions
Copy link
Contributor

Static analysis with clang failed. PR label automerge has been removed

@Hank0626 Hank0626 removed the request for review from oneflow-ci-bot April 27, 2023 03:05
@Hank0626 Hank0626 requested a review from oneflow-ci-bot April 27, 2023 03:05
@github-actions
Copy link
Contributor

Static analysis with clang failed. PR label automerge has been removed

@github-actions
Copy link
Contributor

CI failed when running job: Build cpu. PR label automerge has been removed

@github-actions
Copy link
Contributor

CI failed when running job: Build cpu. PR label automerge has been removed

@github-actions
Copy link
Contributor

View latest API docs preview at: https://staging.oneflow.info/docs/Oneflow-Inc/oneflow/pr/10207/

@github-actions
Copy link
Contributor

Speed stats: 
GPU Name: NVIDIA GeForce RTX 3080 Ti 

❌ OneFlow resnet50 time: 43.1ms (= 4307.3ms / 100, input_shape=[16, 3, 224, 224])
PyTorch resnet50 time: 63.9ms (= 6385.2ms / 100, input_shape=[16, 3, 224, 224])
✔️ Relative speed: 1.48 (= 63.9ms / 43.1ms)

OneFlow resnet50 time: 26.3ms (= 2629.7ms / 100, input_shape=[8, 3, 224, 224])
PyTorch resnet50 time: 37.4ms (= 3739.0ms / 100, input_shape=[8, 3, 224, 224])
✔️ Relative speed: 1.42 (= 37.4ms / 26.3ms)

OneFlow resnet50 time: 18.6ms (= 3715.3ms / 200, input_shape=[4, 3, 224, 224])
PyTorch resnet50 time: 34.7ms (= 6933.1ms / 200, input_shape=[4, 3, 224, 224])
✔️ Relative speed: 1.87 (= 34.7ms / 18.6ms)

OneFlow resnet50 time: 17.7ms (= 3541.8ms / 200, input_shape=[2, 3, 224, 224])
PyTorch resnet50 time: 30.4ms (= 6087.4ms / 200, input_shape=[2, 3, 224, 224])
✔️ Relative speed: 1.72 (= 30.4ms / 17.7ms)

OneFlow resnet50 time: 16.7ms (= 3342.0ms / 200, input_shape=[1, 3, 224, 224])
PyTorch resnet50 time: 30.6ms (= 6118.4ms / 200, input_shape=[1, 3, 224, 224])
✔️ Relative speed: 1.83 (= 30.6ms / 16.7ms)

OneFlow swin dataloader time: 0.202s (= 40.303s / 200, num_workers=1)
PyTorch swin dataloader time: 0.129s (= 25.891s / 200, num_workers=1)
Relative speed: 0.642 (= 0.129s / 0.202s)

OneFlow swin dataloader time: 0.056s (= 11.201s / 200, num_workers=4)
PyTorch swin dataloader time: 0.033s (= 6.607s / 200, num_workers=4)
Relative speed: 0.590 (= 0.033s / 0.056s)

OneFlow swin dataloader time: 0.031s (= 6.262s / 200, num_workers=8)
PyTorch swin dataloader time: 0.017s (= 3.346s / 200, num_workers=8)
Relative speed: 0.534 (= 0.017s / 0.031s)

❌ OneFlow resnet50 time: 47.4ms (= 4739.5ms / 100, input_shape=[16, 3, 224, 224], ddp, world size=2)
PyTorch resnet50 time: 63.0ms (= 6303.2ms / 100, input_shape=[16, 3, 224, 224], ddp, world size=2)
✔️ Relative speed: 1.33 (= 63.0ms / 47.4ms)

OneFlow resnet50 time: 30.7ms (= 3065.5ms / 100, input_shape=[8, 3, 224, 224], ddp, world size=2)
PyTorch resnet50 time: 43.5ms (= 4347.0ms / 100, input_shape=[8, 3, 224, 224], ddp, world size=2)
✔️ Relative speed: 1.42 (= 43.5ms / 30.7ms)

OneFlow resnet50 time: 23.8ms (= 4752.5ms / 200, input_shape=[4, 3, 224, 224], ddp, world size=2)
PyTorch resnet50 time: 40.2ms (= 8033.3ms / 200, input_shape=[4, 3, 224, 224], ddp, world size=2)
✔️ Relative speed: 1.69 (= 40.2ms / 23.8ms)

OneFlow resnet50 time: 21.1ms (= 4210.3ms / 200, input_shape=[2, 3, 224, 224], ddp, world size=2)
PyTorch resnet50 time: 36.7ms (= 7339.2ms / 200, input_shape=[2, 3, 224, 224], ddp, world size=2)
✔️ Relative speed: 1.74 (= 36.7ms / 21.1ms)

OneFlow resnet50 time: 19.5ms (= 3893.5ms / 200, input_shape=[1, 3, 224, 224], ddp, world size=2)
PyTorch resnet50 time: 33.9ms (= 6786.5ms / 200, input_shape=[1, 3, 224, 224], ddp, world size=2)
✔️ Relative speed: 1.74 (= 33.9ms / 19.5ms)

@Hank0626 Hank0626 enabled auto-merge (squash) April 27, 2023 13:19
@github-actions
Copy link
Contributor

View latest API docs preview at: https://staging.oneflow.info/docs/Oneflow-Inc/oneflow/pr/10207/

@github-actions
Copy link
Contributor

Speed stats: 
GPU Name: NVIDIA GeForce RTX 3090 

❌ OneFlow resnet50 time: 42.9ms (= 4294.4ms / 100, input_shape=[16, 3, 224, 224])
PyTorch resnet50 time: 57.7ms (= 5771.6ms / 100, input_shape=[16, 3, 224, 224])
✔️ Relative speed: 1.34 (= 57.7ms / 42.9ms)

OneFlow resnet50 time: 26.0ms (= 2599.2ms / 100, input_shape=[8, 3, 224, 224])
PyTorch resnet50 time: 37.7ms (= 3770.5ms / 100, input_shape=[8, 3, 224, 224])
✔️ Relative speed: 1.45 (= 37.7ms / 26.0ms)

OneFlow resnet50 time: 20.1ms (= 4023.7ms / 200, input_shape=[4, 3, 224, 224])
PyTorch resnet50 time: 35.3ms (= 7056.0ms / 200, input_shape=[4, 3, 224, 224])
✔️ Relative speed: 1.75 (= 35.3ms / 20.1ms)

OneFlow resnet50 time: 19.1ms (= 3824.0ms / 200, input_shape=[2, 3, 224, 224])
PyTorch resnet50 time: 33.1ms (= 6611.1ms / 200, input_shape=[2, 3, 224, 224])
✔️ Relative speed: 1.73 (= 33.1ms / 19.1ms)

OneFlow resnet50 time: 17.5ms (= 3496.1ms / 200, input_shape=[1, 3, 224, 224])
PyTorch resnet50 time: 29.2ms (= 5832.7ms / 200, input_shape=[1, 3, 224, 224])
✔️ Relative speed: 1.67 (= 29.2ms / 17.5ms)

OneFlow swin dataloader time: 0.202s (= 40.437s / 200, num_workers=1)
PyTorch swin dataloader time: 0.129s (= 25.833s / 200, num_workers=1)
Relative speed: 0.639 (= 0.129s / 0.202s)

OneFlow swin dataloader time: 0.053s (= 10.669s / 200, num_workers=4)
PyTorch swin dataloader time: 0.033s (= 6.514s / 200, num_workers=4)
Relative speed: 0.611 (= 0.033s / 0.053s)

OneFlow swin dataloader time: 0.030s (= 6.030s / 200, num_workers=8)
PyTorch swin dataloader time: 0.017s (= 3.315s / 200, num_workers=8)
Relative speed: 0.550 (= 0.017s / 0.030s)

❌ OneFlow resnet50 time: 48.6ms (= 4861.1ms / 100, input_shape=[16, 3, 224, 224], ddp, world size=2)
PyTorch resnet50 time: 65.8ms (= 6578.4ms / 100, input_shape=[16, 3, 224, 224], ddp, world size=2)
✔️ Relative speed: 1.35 (= 65.8ms / 48.6ms)

OneFlow resnet50 time: 36.6ms (= 3656.8ms / 100, input_shape=[8, 3, 224, 224], ddp, world size=2)
PyTorch resnet50 time: 48.0ms (= 4803.7ms / 100, input_shape=[8, 3, 224, 224], ddp, world size=2)
✔️ Relative speed: 1.31 (= 48.0ms / 36.6ms)

OneFlow resnet50 time: 28.3ms (= 5668.9ms / 200, input_shape=[4, 3, 224, 224], ddp, world size=2)
PyTorch resnet50 time: 41.8ms (= 8364.6ms / 200, input_shape=[4, 3, 224, 224], ddp, world size=2)
✔️ Relative speed: 1.48 (= 41.8ms / 28.3ms)

OneFlow resnet50 time: 25.5ms (= 5100.4ms / 200, input_shape=[2, 3, 224, 224], ddp, world size=2)
PyTorch resnet50 time: 39.7ms (= 7941.3ms / 200, input_shape=[2, 3, 224, 224], ddp, world size=2)
✔️ Relative speed: 1.56 (= 39.7ms / 25.5ms)

OneFlow resnet50 time: 24.6ms (= 4911.1ms / 200, input_shape=[1, 3, 224, 224], ddp, world size=2)
PyTorch resnet50 time: 35.9ms (= 7175.1ms / 200, input_shape=[1, 3, 224, 224], ddp, world size=2)
✔️ Relative speed: 1.46 (= 35.9ms / 24.6ms)

@github-actions
Copy link
Contributor

View latest API docs preview at: https://staging.oneflow.info/docs/Oneflow-Inc/oneflow/pr/10207/

@Hank0626 Hank0626 disabled auto-merge April 28, 2023 01:41
@github-actions
Copy link
Contributor

View latest API docs preview at: https://staging.oneflow.info/docs/Oneflow-Inc/oneflow/pr/10207/

@github-actions
Copy link
Contributor

Speed stats: 
GPU Name: NVIDIA GeForce RTX 3080 Ti 

❌ OneFlow resnet50 time: 43.3ms (= 4331.1ms / 100, input_shape=[16, 3, 224, 224])
PyTorch resnet50 time: 57.6ms (= 5755.1ms / 100, input_shape=[16, 3, 224, 224])
✔️ Relative speed: 1.33 (= 57.6ms / 43.3ms)

OneFlow resnet50 time: 26.3ms (= 2628.7ms / 100, input_shape=[8, 3, 224, 224])
PyTorch resnet50 time: 37.3ms (= 3728.5ms / 100, input_shape=[8, 3, 224, 224])
✔️ Relative speed: 1.42 (= 37.3ms / 26.3ms)

OneFlow resnet50 time: 18.8ms (= 3761.2ms / 200, input_shape=[4, 3, 224, 224])
PyTorch resnet50 time: 36.0ms (= 7199.9ms / 200, input_shape=[4, 3, 224, 224])
✔️ Relative speed: 1.91 (= 36.0ms / 18.8ms)

OneFlow resnet50 time: 18.6ms (= 3727.2ms / 200, input_shape=[2, 3, 224, 224])
PyTorch resnet50 time: 31.9ms (= 6373.5ms / 200, input_shape=[2, 3, 224, 224])
✔️ Relative speed: 1.71 (= 31.9ms / 18.6ms)

OneFlow resnet50 time: 17.9ms (= 3584.5ms / 200, input_shape=[1, 3, 224, 224])
PyTorch resnet50 time: 29.3ms (= 5859.2ms / 200, input_shape=[1, 3, 224, 224])
✔️ Relative speed: 1.63 (= 29.3ms / 17.9ms)

OneFlow swin dataloader time: 0.201s (= 40.262s / 200, num_workers=1)
PyTorch swin dataloader time: 0.129s (= 25.838s / 200, num_workers=1)
Relative speed: 0.642 (= 0.129s / 0.201s)

OneFlow swin dataloader time: 0.054s (= 10.863s / 200, num_workers=4)
PyTorch swin dataloader time: 0.032s (= 6.424s / 200, num_workers=4)
Relative speed: 0.591 (= 0.032s / 0.054s)

OneFlow swin dataloader time: 0.031s (= 6.136s / 200, num_workers=8)
PyTorch swin dataloader time: 0.017s (= 3.347s / 200, num_workers=8)
Relative speed: 0.546 (= 0.017s / 0.031s)

❌ OneFlow resnet50 time: 47.7ms (= 4772.2ms / 100, input_shape=[16, 3, 224, 224], ddp, world size=2)
PyTorch resnet50 time: 64.8ms (= 6479.1ms / 100, input_shape=[16, 3, 224, 224], ddp, world size=2)
✔️ Relative speed: 1.36 (= 64.8ms / 47.7ms)

OneFlow resnet50 time: 30.8ms (= 3079.3ms / 100, input_shape=[8, 3, 224, 224], ddp, world size=2)
PyTorch resnet50 time: 44.6ms (= 4458.4ms / 100, input_shape=[8, 3, 224, 224], ddp, world size=2)
✔️ Relative speed: 1.45 (= 44.6ms / 30.8ms)

OneFlow resnet50 time: 24.2ms (= 4840.2ms / 200, input_shape=[4, 3, 224, 224], ddp, world size=2)
PyTorch resnet50 time: 41.6ms (= 8326.3ms / 200, input_shape=[4, 3, 224, 224], ddp, world size=2)
✔️ Relative speed: 1.72 (= 41.6ms / 24.2ms)

OneFlow resnet50 time: 23.2ms (= 4631.4ms / 200, input_shape=[2, 3, 224, 224], ddp, world size=2)
PyTorch resnet50 time: 37.6ms (= 7527.9ms / 200, input_shape=[2, 3, 224, 224], ddp, world size=2)
✔️ Relative speed: 1.63 (= 37.6ms / 23.2ms)

OneFlow resnet50 time: 21.4ms (= 4275.2ms / 200, input_shape=[1, 3, 224, 224], ddp, world size=2)
PyTorch resnet50 time: 35.3ms (= 7069.3ms / 200, input_shape=[1, 3, 224, 224], ddp, world size=2)
✔️ Relative speed: 1.65 (= 35.3ms / 21.4ms)

@mergify mergify bot merged commit d1a9e41 into master Apr 28, 2023
@mergify mergify bot deleted the update_mock_behaviour branch April 28, 2023 02:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@daquexian daquexian daquexian approved these changes

@BBuf BBuf BBuf approved these changes

@oneflow-ci-bot oneflow-ci-bot Awaiting requested review from oneflow-ci-bot

Assignees
No one assigned
Labels
automerge bug python
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Hank0626 @daquexian @BBuf