-
Notifications
You must be signed in to change notification settings - Fork 690
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Support inplace for lazy consistent (#7112)
* Support inplace for lazy consistent * fix single client sbp hint * refine Co-authored-by: oneflow-ci-bot <69100618+oneflow-ci-bot@users.noreply.github.com>
- Loading branch information
1 parent
32ab3e3
commit f12f8f7
Showing
7 changed files
with
138 additions
and
43 deletions.
There are no files selected for viewing
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| """ | ||
| Copyright 2020 The OneFlow Authors. All rights reserved. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| """ | ||
| import os | ||
| import unittest | ||
| import numpy as np | ||
|
|
||
| import oneflow as flow | ||
| import oneflow.unittest | ||
|
|
||
|
|
||
| def _test_graph_lazy_inplace(test_case, x, y): | ||
| class LazyInplaceAdd(flow.nn.Graph): | ||
| def __init__(self): | ||
| super().__init__() | ||
|
|
||
| def build(self, x, y): | ||
| x += y | ||
| return x | ||
|
|
||
| z = LazyInplaceAdd()(x, y) | ||
| test_case.assertTrue(np.allclose(z.numpy(), (x + y).numpy(), 1e-05, 1e-05)) | ||
|
|
||
|
|
||
| @unittest.skipIf(os.getenv("ONEFLOW_TEST_CPU_ONLY"), "only test cpu cases") | ||
| @flow.unittest.skip_unless_1n1d() | ||
| class TestLocalInplace(oneflow.unittest.TestCase): | ||
| def test_graph_inplace_gpu(test_case): | ||
| x = flow.randn(10, 10, device=flow.device("cuda")) | ||
| y = flow.ones(10, device=flow.device("cuda")) | ||
| _test_graph_lazy_inplace(test_case, x, y) | ||
|
|
||
| def test_graph_inplace_cpu(test_case): | ||
| x = flow.randn(10, 10, device=flow.device("cpu")) | ||
| y = flow.ones(10, device=flow.device("cpu")) | ||
| _test_graph_lazy_inplace(test_case, x, y) | ||
|
|
||
|
|
||
| @unittest.skipIf(os.getenv("ONEFLOW_TEST_CPU_ONLY"), "only test cpu cases") | ||
| @flow.unittest.skip_unless_1n2d() | ||
| class TestConsistentInplace(oneflow.unittest.TestCase): | ||
| def test_graph_inplace_gpu(test_case): | ||
| x = flow.randn( | ||
| 10, 10, placement=flow.placement("cuda", {0: [0, 1]}), sbp=flow.sbp.split(1) | ||
| ) | ||
| y = flow.ones( | ||
| 10, placement=flow.placement("cuda", {0: [0, 1]}), sbp=flow.sbp.broadcast | ||
| ) | ||
| _test_graph_lazy_inplace(test_case, x, y) | ||
|
|
||
| def test_graph_inplace_cpu(test_case): | ||
| x = flow.randn( | ||
| 10, 10, placement=flow.placement("cpu", {0: [0, 1]}), sbp=flow.sbp.split(1) | ||
| ) | ||
| y = flow.ones( | ||
| 10, placement=flow.placement("cpu", {0: [0, 1]}), sbp=flow.sbp.broadcast | ||
| ) | ||
| _test_graph_lazy_inplace(test_case, x, y) | ||
|
|
||
|
|
||
| if __name__ == "__main__": | ||
| unittest.main() |