floor mode for div tensors finished #8987

doombeaker · 2022-08-23T08:19:02Z

给 flow.div 接口添加 rounding_mode keyword 参数

div(tensor x, tensor y, rounding_mode)
div(scalar x, tensor y, rounding_mode)
div(tensor x, scalar y, rounding_mode)

doombeaker · 2022-10-24T09:58:44Z

oneflow/core/functional/functional_api.yaml

+      "Tensor (Tensor input, Tensor other, *, String rounding_mode=None) => DivMode",
+      "Tensor (Tensor input, Scalar other, *, String rounding_mode=None) => ScalarDivMode",
+      "Tensor (Scalar input, Tensor other, *, String rounding_mode=None) => ScalarDivMode",


因为 oneflow 内部比较多的地方使用了 functional::Div, functional::ScalarDiv 等，所以不改以前的接口，直接增加接口。

python/oneflow/test/modules/test_div.py

…low into fix_div_print_inalgined

shangguanshiyuan · 2022-10-25T01:36:02Z

python/oneflow/test/modules/test_div.py

+        dim1 = random(low=1, high=4).to(int)
+        x = random_tensor(ndim=2, dim0=dim0, dim1=dim1).to(device)
+        y = random_tensor(ndim=2, dim0=dim0, dim1=dim1).to(device)
+        z = torch.div(x, y, rounding_mode="floor")


torch.div(torch.tensor(-1), torch.tensor(2), rounding_mode="floor")
tensor(-1)

oneflow.floor_divide(oneflow.tensor(-1), oneflow.tensor(2))
tensor(0, dtype=oneflow.int64)

oneflow.floor_divide的错误，发生在整形且两个输入的符号不同时
这个测试用例里只测了float，可以加一个整形的测试

test_div.py完善了以后，test_trunc_divide.py就可以废弃了

这个问题是存在的，会在另外外的 PR 解决。

shangguanshiyuan · 2022-10-25T01:37:36Z

python/oneflow/test/modules/test_div.py

+        device = random_device()
+        x1 = random(low=1, high=5).to(float)
+        x2 = random_tensor(2, 2, 3).to(device)
+        y = torch.div(x1, x2, rounding_mode="floor")


标量除法也可以加一个整形的测试

torch.div(torch.tensor(1).cpu(), torch.randn(2).cuda(), rounding_mode="floor")
torch支持这种行为，这个pr是否支持这种行为，如果支持的话可以加上这个测试

这个修改会在另外的 PR 解决。

oneflow/core/functional/impl/binary_functor.cpp

github-actions · 2023-01-09T17:19:54Z

Speed stats:

github-actions · 2023-01-09T17:21:04Z

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

github-actions · 2023-01-09T18:16:40Z

Speed stats:

GPU Name: GeForce GTX 1080 









❌ OneFlow resnet50 time: 139.5ms (= 13945.3ms / 100, input_shape=[16, 3, 224, 224], ddp, world size=2)
PyTorch resnet50 time: 159.9ms (= 15992.5ms / 100, input_shape=[16, 3, 224, 224], ddp, world size=2)
✔️ Relative speed: 1.15 (= 159.9ms / 139.5ms)

OneFlow resnet50 time: 84.7ms (= 8472.8ms / 100, input_shape=[8, 3, 224, 224], ddp, world size=2)
PyTorch resnet50 time: 110.4ms (= 11036.6ms / 100, input_shape=[8, 3, 224, 224], ddp, world size=2)
✔️ Relative speed: 1.30 (= 110.4ms / 84.7ms)

OneFlow resnet50 time: 57.5ms (= 11497.3ms / 200, input_shape=[4, 3, 224, 224], ddp, world size=2)
PyTorch resnet50 time: 78.6ms (= 15726.0ms / 200, input_shape=[4, 3, 224, 224], ddp, world size=2)
✔️ Relative speed: 1.37 (= 78.6ms / 57.5ms)

OneFlow resnet50 time: 45.4ms (= 9079.6ms / 200, input_shape=[2, 3, 224, 224], ddp, world size=2)
PyTorch resnet50 time: 65.2ms (= 13031.3ms / 200, input_shape=[2, 3, 224, 224], ddp, world size=2)
✔️ Relative speed: 1.44 (= 65.2ms / 45.4ms)

OneFlow resnet50 time: 40.6ms (= 8116.7ms / 200, input_shape=[1, 3, 224, 224], ddp, world size=2)
PyTorch resnet50 time: 69.2ms (= 13836.0ms / 200, input_shape=[1, 3, 224, 224], ddp, world size=2)
✔️ Relative speed: 1.70 (= 69.2ms / 40.6ms)

github-actions · 2023-01-09T18:20:43Z

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

github-actions · 2023-01-09T19:24:01Z

CI failed when running job: cuda-misc. PR label automerge has been removed

github-actions · 2023-01-16T04:53:36Z

Speed stats:

GPU Name: GeForce GTX 1080 









❌ OneFlow resnet50 time: 140.1ms (= 14007.4ms / 100, input_shape=[16, 3, 224, 224], ddp, world size=2)
PyTorch resnet50 time: 160.7ms (= 16065.7ms / 100, input_shape=[16, 3, 224, 224], ddp, world size=2)
✔️ Relative speed: 1.15 (= 160.7ms / 140.1ms)

OneFlow resnet50 time: 84.8ms (= 8477.8ms / 100, input_shape=[8, 3, 224, 224], ddp, world size=2)
PyTorch resnet50 time: 102.8ms (= 10278.0ms / 100, input_shape=[8, 3, 224, 224], ddp, world size=2)
✔️ Relative speed: 1.21 (= 102.8ms / 84.8ms)

OneFlow resnet50 time: 57.7ms (= 11536.3ms / 200, input_shape=[4, 3, 224, 224], ddp, world size=2)
PyTorch resnet50 time: 87.2ms (= 17447.4ms / 200, input_shape=[4, 3, 224, 224], ddp, world size=2)
✔️ Relative speed: 1.51 (= 87.2ms / 57.7ms)

OneFlow resnet50 time: 44.1ms (= 8827.0ms / 200, input_shape=[2, 3, 224, 224], ddp, world size=2)
PyTorch resnet50 time: 70.9ms (= 14180.5ms / 200, input_shape=[2, 3, 224, 224], ddp, world size=2)
✔️ Relative speed: 1.61 (= 70.9ms / 44.1ms)

OneFlow resnet50 time: 42.1ms (= 8425.7ms / 200, input_shape=[1, 3, 224, 224], ddp, world size=2)
PyTorch resnet50 time: 64.3ms (= 12851.9ms / 200, input_shape=[1, 3, 224, 224], ddp, world size=2)
✔️ Relative speed: 1.53 (= 64.3ms / 42.1ms)

github-actions · 2023-01-16T04:57:01Z

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

github-actions · 2023-01-16T09:20:21Z

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

github-actions · 2023-01-16T09:21:11Z

Speed stats:

github-actions · 2023-01-17T06:22:41Z

Speed stats:

GPU Name: GeForce GTX 1080 









❌ OneFlow resnet50 time: 139.9ms (= 13985.7ms / 100, input_shape=[16, 3, 224, 224], ddp, world size=2)
PyTorch resnet50 time: 161.7ms (= 16168.5ms / 100, input_shape=[16, 3, 224, 224], ddp, world size=2)
✔️ Relative speed: 1.16 (= 161.7ms / 139.9ms)

OneFlow resnet50 time: 87.3ms (= 8732.7ms / 100, input_shape=[8, 3, 224, 224], ddp, world size=2)
PyTorch resnet50 time: 102.2ms (= 10217.2ms / 100, input_shape=[8, 3, 224, 224], ddp, world size=2)
✔️ Relative speed: 1.17 (= 102.2ms / 87.3ms)

OneFlow resnet50 time: 59.7ms (= 11944.7ms / 200, input_shape=[4, 3, 224, 224], ddp, world size=2)
PyTorch resnet50 time: 76.3ms (= 15256.2ms / 200, input_shape=[4, 3, 224, 224], ddp, world size=2)
✔️ Relative speed: 1.28 (= 76.3ms / 59.7ms)

OneFlow resnet50 time: 48.0ms (= 9605.6ms / 200, input_shape=[2, 3, 224, 224], ddp, world size=2)
PyTorch resnet50 time: 67.3ms (= 13451.8ms / 200, input_shape=[2, 3, 224, 224], ddp, world size=2)
✔️ Relative speed: 1.40 (= 67.3ms / 48.0ms)

OneFlow resnet50 time: 44.3ms (= 8855.2ms / 200, input_shape=[1, 3, 224, 224], ddp, world size=2)
PyTorch resnet50 time: 57.7ms (= 11537.8ms / 200, input_shape=[1, 3, 224, 224], ddp, world size=2)
✔️ Relative speed: 1.30 (= 57.7ms / 44.3ms)

github-actions · 2023-01-17T06:27:06Z

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

doombeaker added 7 commits August 23, 2022 16:16

floor mode for div tensors finished

578425e

refine

edf9070

Merge branch 'master' into fix_div_print_inalgined

f41d051

Merge branch 'master' into fix_div_print_inalgined

619bfbd

divfunctor mode

7591082

add rounding_mode for div(testcased left to be added)

7093d4d

add test case

6ccc71c

doombeaker marked this pull request as ready for review October 24, 2022 09:55

doombeaker requested review from hjchen2, BBuf, daquexian and jackalcooper as code owners October 24, 2022 09:55

Merge branch 'master' into fix_div_print_inalgined

aafc12b

doombeaker added op feature labels Oct 24, 2022

doombeaker commented Oct 24, 2022

View reviewed changes

refine

417eeef

doombeaker commented Oct 24, 2022

View reviewed changes

python/oneflow/test/modules/test_div.py Outdated Show resolved Hide resolved

Merge branch 'fix_div_print_inalgined' of github.com:Oneflow-Inc/onef…

1fd259a

…low into fix_div_print_inalgined

doombeaker requested a review from shangguanshiyuan October 24, 2022 10:02

doombeaker added 2 commits October 24, 2022 18:29

refine according to shiyuan's advice

c359d0b

refine according to shiyuan's advice

147dced

shangguanshiyuan reviewed Oct 25, 2022

View reviewed changes

shangguanshiyuan approved these changes Dec 8, 2022

View reviewed changes

BBuf reviewed Dec 9, 2022

View reviewed changes

oneflow/core/functional/impl/binary_functor.cpp Show resolved Hide resolved

BBuf approved these changes Dec 9, 2022

View reviewed changes

Merge branch 'master' into fix_div_print_inalgined

8987f04

doombeaker added the automerge label Dec 9, 2022

doombeaker requested a review from oneflow-ci-bot December 9, 2022 03:17

Merge branch 'master' into fix_div_print_inalgined

50646b5

mergify bot added 2 commits January 9, 2023 13:14

Merge branch 'master' into fix_div_print_inalgined

5b6b680

Merge branch 'master' into fix_div_print_inalgined

ef8746a

github-actions bot removed the automerge label Jan 9, 2023

Merge branch 'master' into fix_div_print_inalgined

2ea2ed3

doombeaker requested review from oneflow-ci-bot and removed request for oneflow-ci-bot January 16, 2023 02:36

doombeaker added the automerge label Jan 16, 2023

doombeaker requested review from oneflow-ci-bot and removed request for oneflow-ci-bot January 16, 2023 06:18

doombeaker and others added 2 commits January 16, 2023 14:19

Merge branch 'master' into fix_div_print_inalgined

25ab77b

Merge branch 'master' into fix_div_print_inalgined

6bd7fe2

github-actions bot removed the automerge label Jan 16, 2023

Merge branch 'master' into fix_div_print_inalgined

0f8237a

doombeaker requested review from oneflow-ci-bot and removed request for oneflow-ci-bot January 17, 2023 03:25

doombeaker added the automerge label Jan 17, 2023

Merge branch 'master' into fix_div_print_inalgined

9eab7ad

mergify bot merged commit 6c723ab into master Jan 17, 2023

mergify bot deleted the fix_div_print_inalgined branch January 17, 2023 07:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

floor mode for div tensors finished #8987

floor mode for div tensors finished #8987

doombeaker commented Aug 23, 2022 •

edited

Loading

doombeaker Oct 24, 2022

shangguanshiyuan Oct 25, 2022

shangguanshiyuan Oct 25, 2022

doombeaker Dec 8, 2022

shangguanshiyuan Oct 25, 2022

shangguanshiyuan Oct 25, 2022

doombeaker Dec 8, 2022

github-actions bot commented Jan 9, 2023

github-actions bot commented Jan 9, 2023

github-actions bot commented Jan 9, 2023

github-actions bot commented Jan 9, 2023

github-actions bot commented Jan 9, 2023

github-actions bot commented Jan 16, 2023

github-actions bot commented Jan 16, 2023

github-actions bot commented Jan 16, 2023

github-actions bot commented Jan 16, 2023

github-actions bot commented Jan 17, 2023

github-actions bot commented Jan 17, 2023

floor mode for div tensors finished #8987

floor mode for div tensors finished #8987

Conversation

doombeaker commented Aug 23, 2022 • edited Loading

doombeaker Oct 24, 2022

Choose a reason for hiding this comment

shangguanshiyuan Oct 25, 2022

Choose a reason for hiding this comment

shangguanshiyuan Oct 25, 2022

Choose a reason for hiding this comment

doombeaker Dec 8, 2022

Choose a reason for hiding this comment

shangguanshiyuan Oct 25, 2022

Choose a reason for hiding this comment

shangguanshiyuan Oct 25, 2022

Choose a reason for hiding this comment

doombeaker Dec 8, 2022

Choose a reason for hiding this comment

github-actions bot commented Jan 9, 2023

github-actions bot commented Jan 9, 2023

github-actions bot commented Jan 9, 2023

github-actions bot commented Jan 9, 2023

github-actions bot commented Jan 9, 2023

github-actions bot commented Jan 16, 2023

github-actions bot commented Jan 16, 2023

github-actions bot commented Jan 16, 2023

github-actions bot commented Jan 16, 2023

github-actions bot commented Jan 17, 2023

github-actions bot commented Jan 17, 2023

doombeaker commented Aug 23, 2022 •

edited

Loading