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.

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

Remove Single-Client API in oneflow default python #5827

Merged
merged 37 commits into from
Aug 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
7538a28
Remove single_client api files
chengtbf Aug 10, 2021
299becf
Merge branch 'master' of https://github.com/Oneflow-Inc/oneflow into …
chengtbf Aug 10, 2021
190345e
Remove Single-Client API in oneflow default python
chengtbf Aug 10, 2021
846f177
Merge branch 'master' of https://github.com/Oneflow-Inc/oneflow into …
chengtbf Aug 10, 2021
ad3697e
revert oneflow.env
chengtbf Aug 10, 2021
b09cf64
refine docs
chengtbf Aug 10, 2021
98451a3
Merge branch 'master' into dev_cc_rm_single_client_api
chengtbf Aug 10, 2021
d8a8471
Merge branch 'master' into dev_cc_rm_single_client_api
chengtbf Aug 11, 2021
8454eef
fix watcher and delete useless python callback
chengtbf Aug 11, 2021
a5b8ab7
Remove DestroyGlobalWatcher
chengtbf Aug 11, 2021
3903502
Merge branch 'master' into dev_cc_rm_single_client_api
chengtbf Aug 11, 2021
13c2841
Merge branch 'master' into dev_cc_rm_single_client_api
oneflow-ci-bot Aug 11, 2021
2e4b277
Merge branch 'master' into dev_cc_rm_single_client_api
chengtbf Aug 11, 2021
fbe1c63
Merge branch 'master' into dev_cc_rm_single_client_api
oneflow-ci-bot Aug 11, 2021
0c6d44f
Merge branch 'master' into dev_cc_rm_single_client_api
oneflow-ci-bot Aug 11, 2021
db0bc57
Merge branch 'master' into dev_cc_rm_single_client_api
oneflow-ci-bot Aug 11, 2021
b9f14ea
Merge branch 'master' into dev_cc_rm_single_client_api
oneflow-ci-bot Aug 11, 2021
69e708d
Merge branch 'master' into dev_cc_rm_single_client_api
oneflow-ci-bot Aug 11, 2021
9e7e8ef
Merge branch 'master' into dev_cc_rm_single_client_api
oneflow-ci-bot Aug 11, 2021
6d73eaa
Merge branch 'master' into dev_cc_rm_single_client_api
oneflow-ci-bot Aug 12, 2021
5474299
fix conflict
chengtbf Aug 12, 2021
ac5f19f
Merge branch 'master' into dev_cc_rm_single_client_api
oneflow-ci-bot Aug 12, 2021
6cbc02e
Revert test_deconv for CI
chengtbf Aug 12, 2021
b6bd8f5
Merge branch 'master' into dev_cc_rm_single_client_api
oneflow-ci-bot Aug 12, 2021
6351940
Merge branch 'master' into dev_cc_rm_single_client_api
oneflow-ci-bot Aug 12, 2021
96d2065
Merge branch 'master' into dev_cc_rm_single_client_api
oneflow-ci-bot Aug 12, 2021
e3dff86
Merge branch 'master' into dev_cc_rm_single_client_api
oneflow-ci-bot Aug 12, 2021
6f3a9d8
Merge branch 'master' into dev_cc_rm_single_client_api
oneflow-ci-bot Aug 12, 2021
dec8a42
Merge branch 'master' into dev_cc_rm_single_client_api
oneflow-ci-bot Aug 12, 2021
5055246
Merge branch 'master' into dev_cc_rm_single_client_api
oneflow-ci-bot Aug 12, 2021
d9ba691
Merge branch 'master' into dev_cc_rm_single_client_api
oneflow-ci-bot Aug 12, 2021
ec08c47
Merge branch 'master' into dev_cc_rm_single_client_api
oneflow-ci-bot Aug 12, 2021
badbfad
Merge branch 'master' into dev_cc_rm_single_client_api
oneflow-ci-bot Aug 13, 2021
0b10773
Merge branch 'master' into dev_cc_rm_single_client_api
oneflow-ci-bot Aug 13, 2021
f9a3925
Merge branch 'master' into dev_cc_rm_single_client_api
oneflow-ci-bot Aug 13, 2021
8bd13f9
fix test tol
chengtbf Aug 13, 2021
b499216
Merge branch 'master' into dev_cc_rm_single_client_api
oneflow-ci-bot Aug 13, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions docs/source/oneflow.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ oneflow
cosh,
diag,
div,
enable_eager_execution,
eq,
equal,
expand,
Expand All @@ -49,7 +48,6 @@ oneflow
flip,
floor,
fmod,
function_config,
gather,
gather_nd,
gelu,
Expand Down Expand Up @@ -86,7 +84,6 @@ oneflow
reciprocal,
round,
save,
saved_model,
scatter,
scatter_add,
scatter_nd,
Expand Down
1 change: 0 additions & 1 deletion oneflow/api/python/framework/framework.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ ONEFLOW_API_PYBIND11_MODULE("", m) {
m.def("RegisterGlobalForeignCallback", &RegisterGlobalForeignCallback);
m.def("DestroyGlobalForeignCallback", &DestroyGlobalForeignCallback);
m.def("RegisterGlobalWatcher", &RegisterGlobalWatcher);
m.def("DestroyGlobalWatcher", &DestroyGlobalWatcher);
m.def("LaunchJob", &LaunchJob, py::call_guard<py::gil_scoped_release>());

m.def("GetSerializedInterUserJobInfo",
Expand Down
7 changes: 0 additions & 7 deletions oneflow/api/python/framework/framework.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,6 @@ inline Maybe<void> RegisterGlobalWatcher(const std::shared_ptr<ForeignWatcher>&
return Maybe<void>::Ok();
}

inline Maybe<void> DestroyGlobalWatcher() {
if (Global<std::shared_ptr<ForeignWatcher>>::Get()) {
Global<std::shared_ptr<ForeignWatcher>>::Delete();
}
return Maybe<void>::Ok();
}

inline Maybe<void> LaunchJob(const std::shared_ptr<oneflow::JobInstance>& cb) {
CHECK_OR_RETURN(GlobalProcessCtx::IsThisProcessMaster());
CHECK_NOTNULL_OR_RETURN(Global<Oneflow>::Get());
Expand Down
2 changes: 0 additions & 2 deletions oneflow/api/python/framework/framework_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ inline void RegisterGlobalWatcher(const std::shared_ptr<oneflow::ForeignWatcher>
return oneflow::RegisterGlobalWatcher(watcher).GetOrThrow();
}

inline void DestroyGlobalWatcher() { return oneflow::DestroyGlobalWatcher().GetOrThrow(); }

inline void LaunchJob(const std::shared_ptr<oneflow::JobInstance>& cb) {
return oneflow::LaunchJob(cb).GetOrThrow();
}
Expand Down
2 changes: 1 addition & 1 deletion oneflow/user/kernels/conv_cudnn_kernels.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ class ConvBiasGradGpuKernel final : public user_op::OpKernel {
new CudnnTensorDesc(CUDNN_TENSOR_NHWC, bias_diff->data_type(), 1,
static_cast<int32_t>(bias_diff->shape().At(0)), 1, 1));
}
return std::move(state);
return state;
}

private:
Expand Down
31 changes: 11 additions & 20 deletions python/oneflow/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,6 @@ def is_deprecated(func_or_class):
)
del python_callback
del register_python_callback
from oneflow.framework import watcher

oneflow._oneflow_internal.RegisterGlobalWatcher(watcher._global_watcher)
del watcher
chengtbf marked this conversation as resolved.
Show resolved Hide resolved


def _SyncOnMasterFn():
Expand Down Expand Up @@ -147,7 +143,6 @@ def Sync():
import oneflow.nn.modules.sinh
import oneflow.nn.modules.tan
import oneflow.nn.modules.tensor_ops
import oneflow.tmp
from oneflow.framework.check_point_v2 import Load as load
from oneflow.framework.check_point_v2 import save
from oneflow.framework.dtype import convert_oneflow_dtype_to_numpy_dtype, dtypes
Expand All @@ -158,17 +153,10 @@ def Sync():
from oneflow.framework.function_util import FunctionConfig as function_config
from oneflow.framework.generator import create_generator as Generator
from oneflow.framework.generator import default_generator, manual_seed
from oneflow.framework.model import Model

# NOTE(chengcheng) oneflow.Model is unavailable now.
# from oneflow.framework.model import Model
from oneflow.framework.scope_util import api_current_scope as current_scope
from oneflow.framework.session_util import (
api_clear_default_session as clear_default_session,
)
from oneflow.framework.session_util import (
api_find_or_create_module as find_or_create_module,
)
from oneflow.framework.session_util import (
api_sync_default_session as sync_default_session,
)
from oneflow.framework.tensor import Tensor
from oneflow.framework.tensor import tensor as tensor
from oneflow.nn.modules.abs import abs_op as abs
Expand All @@ -184,8 +172,6 @@ def Sync():
from oneflow.nn.modules.activation import selu_op as selu
from oneflow.nn.modules.activation import softsign_op as softsign
from oneflow.nn.modules.activation import mish_op as mish


from oneflow.nn.modules.adaptive_pool import (
adaptive_avg_pool1d,
adaptive_avg_pool2d,
Expand Down Expand Up @@ -286,6 +272,7 @@ def Sync():
from oneflow.nn.modules.sinh import sinh_op as sinh
from oneflow.nn.modules.slice import slice_op as slice
from oneflow.nn.modules.slice import slice_update_op as slice_update
from oneflow.nn.modules.slice import logical_slice_assign_op as logical_slice_assign
from oneflow.nn.modules.softplus import softplus_op as softplus
from oneflow.nn.modules.sort import sort_op as sort
from oneflow.nn.modules.split import split_op as split
Expand All @@ -306,8 +293,8 @@ def Sync():
from oneflow.nn.modules.triu import triu_op as triu
from oneflow.nn.modules.unsqueeze import unsqueeze_op as unsqueeze
from oneflow.nn.modules.where import where_op as where
from oneflow.nn.modules.scatter import *
from oneflow.ops.builtin_ops import BuiltinOp as builtin_op
from oneflow.ops.get_variable import api_get_variable as get_variable
from oneflow.ops.initializer_util import constant_initializer, empty_initializer
from oneflow.ops.initializer_util import glorot_normal_initializer
from oneflow.ops.initializer_util import (
Expand All @@ -326,8 +313,12 @@ def Sync():
variance_scaling_initializer,
zeros_initializer,
)
from oneflow.nn.modules.scatter import *

from . import autograd, distributed, linalg, optim, saved_model
from . import (
autograd,
distributed,
linalg,
optim,
) # , saved_model NOTE(chengcheng): unavailable now
import oneflow.utils.data
import oneflow.utils.vision
21 changes: 0 additions & 21 deletions python/oneflow/advanced/__init__.py

This file was deleted.

211 changes: 0 additions & 211 deletions python/oneflow/advanced/distribute_ops.py

This file was deleted.