Dev logical_xor module #5694

zfu82 · 2021-08-02T09:37:43Z

CLAassistant · 2021-08-02T09:37:48Z

All committers have signed the CLA.

python/oneflow/test/modules/test_logical_xor.py

python/oneflow/nn/modules/logical_xor.py

oneflow/core/ndarray/binary_func.h

hengzi

添加API文档截图，参考 #5636

python/oneflow/nn/modules/logical_xor.py

…st case,

hengzi · 2021-08-06T02:25:21Z

python/oneflow/compatible/single_client/nn/modules/logical_xor.py

+    logical_and() -> Tensor
+
+    See :func:`oneflow.logical_and`


logical_and -> logical_xor

hengzi · 2021-08-06T02:27:49Z

python/oneflow/compatible/single_client/nn/modules/logical_xor.py

+
+        >>> input1 = flow.Tensor(np.array([1, 0, 1]).astype(np.float32), dtype=flow.float32)
+        >>> input2 = flow.Tensor(np.array([1, 1, 0]).astype(np.float32), dtype=flow.float32)
+        >>> out = flow.logical_and(input1, input2)


logical_and -> logical_xor
运行这个文件看下是否有报错

hengzi · 2021-08-06T02:36:04Z

python/oneflow/nn/modules/logical_xor.py

+def logical_or_op_tensor(input, other):
+    """
+    logical_or() -> Tensor


logical_or -> logical_xor

doombeaker · 2021-08-06T07:26:48Z

python/oneflow/compatible/single_client/nn/modules/logical_xor.py

+    See :func:`oneflow.logical_xor`
+
+    """
+    return LogicalXor()(input, other)


之前因为功能的局限，才不得不用实例化 Module 的方式调用。现在有了 flow.F 下的 functional call，尽量直接调用。
可以参考这个PR 进行修改 #5754

doombeaker · 2021-08-06T07:31:53Z

python/oneflow/compatible/single_client/__init__.py

@@ -128,6 +128,7 @@ def custom_exit(returncode):
 import oneflow.compatible.single_client.nn.modules.greater_equal


single_client 下的文件不用修改，都复原吧。

…der single_client folder

doombeaker · 2021-08-06T10:32:32Z

oneflow/core/ndarray/binary_func.h

+template<typename T>
+struct BinaryFuncOR final {
+  static OF_DEVICE_FUNC const int8_t Invoke(const T x, const T y) { return x || y; }
+};
 template<typename T>
 struct BinaryFuncAny final {


这个 struct 是不是不需要了

这里是从上面移到下面了，还是需要的

doombeaker · 2021-08-06T10:37:49Z

python/oneflow/__init__.py

@@ -141,6 +141,7 @@ def Sync():
 import oneflow.nn.modules.greater_equal
 import oneflow.nn.modules.logical_and
 import oneflow.nn.modules.logical_or
+import oneflow.nn.modules.logical_xor


这个是当作 package 导入，没有必要，顺便把上面的 logical_and，logical_or，logical_xor 也给删了吧。

doombeaker · 2021-08-06T11:05:43Z

python/oneflow/nn/modules/logical_xor.py

+
+    """
+    if other.dtype != input.dtype:
+        other = flow.cast(other, input.dtype)


在这里加个以shape 的检查吧。类似

assert input.shape == other.shape, "shape of input and other should be same"

因为你这个算子内部是支持 broadcast 的，但是文档和 pytorch 对齐，是element-wise的。

或者，如果想作为 pytorch 超集，就在文档钟说明支持 broadcast。并且在 doctest、test 里添加相关的例子。

github-actions · 2021-08-11T04:22:47Z

Speed stats:

GPU Name: GeForce GTX 1080 

PyTorch resnet50 time: 138.5ms (= 6927.0ms / 50, input_shape=[16, 3, 224, 224], backward is enabled)
OneFlow resnet50 time: 125.9ms (= 6296.8ms / 50, input_shape=[16, 3, 224, 224], backward is enabled)
Relative speed: 1.10 (= 138.5ms / 125.9ms)

PyTorch resnet50 time: 82.1ms (= 4106.6ms / 50, input_shape=[8, 3, 224, 224], backward is enabled)
OneFlow resnet50 time: 73.0ms (= 3651.0ms / 50, input_shape=[8, 3, 224, 224], backward is enabled)
Relative speed: 1.12 (= 82.1ms / 73.0ms)

PyTorch resnet50 time: 57.1ms (= 2852.6ms / 50, input_shape=[4, 3, 224, 224], backward is enabled)
OneFlow resnet50 time: 51.4ms (= 2570.8ms / 50, input_shape=[4, 3, 224, 224], backward is enabled)
Relative speed: 1.11 (= 57.1ms / 51.4ms)

PyTorch resnet50 time: 47.8ms (= 2388.8ms / 50, input_shape=[2, 3, 224, 224], backward is enabled)
OneFlow resnet50 time: 42.0ms (= 2102.2ms / 50, input_shape=[2, 3, 224, 224], backward is enabled)
Relative speed: 1.14 (= 47.8ms / 42.0ms)

PyTorch resnet50 time: 42.5ms (= 2126.7ms / 50, input_shape=[1, 3, 224, 224], backward is enabled)
OneFlow resnet50 time: 41.3ms (= 2064.7ms / 50, input_shape=[1, 3, 224, 224], backward is enabled)
Relative speed: 1.03 (= 42.5ms / 41.3ms)

Dev logical_xor module

776fe0b

zfu82 added enhancement interface op labels Aug 2, 2021

hengzi reviewed Aug 3, 2021

View reviewed changes

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

python/oneflow/nn/modules/logical_xor.py Outdated Show resolved Hide resolved

oneflow/core/ndarray/binary_func.h Outdated Show resolved Hide resolved

hengzi mentioned this pull request Aug 3, 2021

OneFlow 算子对齐 PyTorch 完备计划推进表 #4936

Closed

hengzi reviewed Aug 4, 2021

View reviewed changes

python/oneflow/nn/modules/logical_xor.py Show resolved Hide resolved

hengzi and others added 8 commits August 4, 2021 15:11

Merge branch 'master' into dev_logical_xor_module

167adc4

Merge branch 'master' into dev_logical_xor_module

0263a02

Add single_client api, modify logical_xor implementation, add more te…

5eaf74c

…st case,

Merge branch 'master' into dev_logical_xor_module

47fdc93

Update binary_func.h

01548a1

Update tensor.rst

7dee4c1

Update logical_xor.py

1f6aa59

Update binary_func.h

66d2579

hengzi added fmt-only and removed fmt-only labels Aug 5, 2021

zfu82 added 4 commits August 5, 2021 11:58

make of_format

ed31aa1

add pytorch auto test

cb75795

remove float test

5b2d887

add test case

0bda818

zfu82 marked this pull request as ready for review August 5, 2021 07:40

zfu82 added 2 commits August 5, 2021 17:16

test modified

a8c9fa8

delete help.py

fd3e020

hengzi reviewed Aug 6, 2021

View reviewed changes

zfu82 added 3 commits August 6, 2021 13:40

modify name

7a5948f

make of_format

30f73e2

modify single-client example result

62d37f8

doombeaker reviewed Aug 6, 2021

View reviewed changes

remove module not required,call function directly. restore changes un…

779fb42

…der single_client folder

doombeaker requested changes Aug 6, 2021

View reviewed changes

remove unnecessary nn module package, add shape test of logical_xor

88fff2c

doombeaker approved these changes Aug 10, 2021

View reviewed changes

Merge branch 'master' into dev_logical_xor_module

6c72413

doombeaker added the automerge label Aug 10, 2021

doombeaker requested a review from oneflow-ci-bot August 10, 2021 14:30

oneflow-ci-bot and others added 2 commits August 10, 2021 14:36

auto format by CI

7e7e6a2

Merge branch 'master' into dev_logical_xor_module

f66b9f7

oneflow-ci-bot requested review from oneflow-ci-bot and removed request for oneflow-ci-bot August 10, 2021 16:29

Merge branch 'master' into dev_logical_xor_module

d4b7f91

oneflow-ci-bot requested review from oneflow-ci-bot and removed request for oneflow-ci-bot August 10, 2021 17:50

Merge branch 'master' into dev_logical_xor_module

2cae3fa

oneflow-ci-bot self-requested a review August 10, 2021 19:16

Merge branch 'master' into dev_logical_xor_module

90b0bef

oneflow-ci-bot requested review from oneflow-ci-bot and removed request for oneflow-ci-bot August 10, 2021 23:43

Merge branch 'master' into dev_logical_xor_module

dc02f9b

oneflow-ci-bot requested review from oneflow-ci-bot and removed request for oneflow-ci-bot August 11, 2021 01:12

Merge branch 'master' into dev_logical_xor_module

2d210a0

oneflow-ci-bot self-requested a review August 11, 2021 02:48

oneflow-ci-bot merged commit 6e18a5f into master Aug 11, 2021

oneflow-ci-bot deleted the dev_logical_xor_module branch August 11, 2021 04:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Dev logical_xor module #5694

Dev logical_xor module #5694

zfu82 commented Aug 2, 2021 •

edited

Loading

CLAassistant commented Aug 2, 2021 •

edited

Loading

hengzi left a comment

hengzi Aug 6, 2021

hengzi Aug 6, 2021

hengzi Aug 6, 2021

doombeaker Aug 6, 2021

doombeaker Aug 6, 2021

doombeaker Aug 6, 2021

hengzi Aug 9, 2021

doombeaker Aug 6, 2021

doombeaker Aug 6, 2021

github-actions bot commented Aug 11, 2021

		@@ -128,6 +128,7 @@ def custom_exit(returncode):
		import oneflow.compatible.single_client.nn.modules.greater_equal

Dev logical_xor module #5694

Dev logical_xor module #5694

Conversation

zfu82 commented Aug 2, 2021 • edited Loading

CLAassistant commented Aug 2, 2021 • edited Loading

hengzi left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Aug 11, 2021

zfu82 commented Aug 2, 2021 •

edited

Loading

CLAassistant commented Aug 2, 2021 •

edited

Loading