From 73dd59d624bb0a612b32fedc3aaf310d1c0520f5 Mon Sep 17 00:00:00 2001
From: binbinHan <han_binbin@163.com>
Date: Tue, 20 Jul 2021 10:02:41 +0800
Subject: [PATCH] copy of_proto_python_dir to compatible_single_client_python
(#5539)
Co-authored-by: oneflow-ci-bot <69100618+oneflow-ci-bot@users.noreply.github.com>
---
cmake/oneflow.cmake | 2 ++
.../advanced/distribute_ops.py | 6 ++--
.../benchmarks/bert_benchmark/bert.py | 4 +--
.../benchmarks/bert_benchmark/pretrain.py | 2 +-
.../cnn_benchmark/inceptionv3_model.py | 2 +-
.../benchmarks/cnn_benchmark/vgg_model.py | 6 ++--
.../deprecated/init_cluster_env.py | 6 ++--
.../deprecated/initializer_util.py | 10 ++++--
.../eager/boxing_middle.py | 4 ++-
.../eager/boxing_util.py | 14 +++++---
.../eager/interpreter_callback.py | 8 +++--
.../eager/op_executor.py | 14 +++++---
.../eager/op_infer_util.py | 4 ++-
.../eager/symbol.py | 2 +-
.../experimental/indexed_slices_ops.py | 6 ++--
.../interface_op_read_and_write.py | 4 ++-
.../experimental/square_sum_op.py | 6 ++--
.../experimental/unique_op.py | 6 ++--
.../framework/c_api_util.py | 32 +++++++++++--------
.../framework/check_point_v2.py | 18 ++++++++---
.../framework/dtype.py | 2 +-
.../framework/env_util.py | 8 +++--
.../framework/input_blob_def.py | 10 ++++--
.../framework/job_set_util.py | 2 +-
.../framework/op_util.py | 2 +-
.../framework/ops.py | 8 +++--
.../framework/placement_context.py | 2 +-
.../framework/push_util.py | 6 ++--
.../framework/remote_blob.py | 4 ++-
.../framework/session_util.py | 6 ++--
.../framework/tensor.py | 4 ++-
.../framework/unittest.py | 2 +-
.../framework/watcher.py | 2 +-
.../ops/__init__.py | 6 ++--
.../ops/array_ops.py | 6 ++--
.../ops/assign_op.py | 6 ++--
.../ops/combined_margin_loss.py | 6 ++--
.../ops/constant_op.py | 6 ++--
.../ops/count_not_finite.py | 6 ++--
.../ops/data_ops.py | 10 ++++--
.../ops/get_variable.py | 14 +++++---
.../ops/initializer_util.py | 6 ++--
.../ops/layers.py | 10 ++++--
.../ops/linalg.py | 6 ++--
.../ops/math_ops.py | 6 ++--
.../ops/math_unary_elementwise_ops.py | 6 ++--
.../ops/nn_ops.py | 6 ++--
.../ops/one_hot.py | 6 ++--
.../ops/partial_fc_sample.py | 6 ++--
.../ops/prelu.py | 10 ++++--
.../ops/reduce_mean.py | 6 ++--
.../ops/reduce_ops.py | 6 ++--
.../ops/regularizer_util.py | 6 ++--
.../ops/user_op_builder.py | 14 +++++---
.../ops/watch.py | 6 ++--
.../serving/inference_session.py | 10 ++++--
.../serving/saved_model_builder.py | 18 ++++++++---
.../summary/summary_graph.py | 2 +-
.../summary/summary_hparams.py | 12 ++++---
.../summary/summary_projector.py | 2 +-
.../test/models/alexnet.py | 6 ++--
.../test/models/alexnet_with_unpack.py | 6 ++--
.../test/models/bert.py | 4 +--
.../test/models/inceptionv3.py | 2 +-
.../test/models/pretrain.py | 2 +-
.../test/models/resnet50.py | 2 +-
.../test/models/test_alexnet_model.py | 6 ++--
.../test/models/vgg16.py | 6 ++--
.../test/serving/insightface_resnet100.py | 2 +-
.../test/serving/ofrecord_dataset.py | 2 +-
.../serving/test_alexnet_save_and_load.py | 4 ++-
.../test/serving/test_resnet_save_and_load.py | 4 ++-
72 files changed, 307 insertions(+), 157 deletions(-)
diff --git a/cmake/oneflow.cmake b/cmake/oneflow.cmake
index 15bc67304..8989a2d7e 100644
--- a/cmake/oneflow.cmake
+++ b/cmake/oneflow.cmake
@@ -309,6 +309,8 @@ add_custom_target(of_pyscript_copy ALL
COMMAND ${CMAKE_COMMAND} -E create_symlink "${PROJECT_SOURCE_DIR}/oneflow/python/distributed/launch.py" "${of_pyscript_dir}/oneflow/distributed/launch.py"
COMMAND ${CMAKE_COMMAND} -E copy_directory "${of_proto_python_dir}/oneflow/core" "${of_pyscript_dir}/oneflow/core"
COMMAND ${CMAKE_COMMAND} -E touch "${of_pyscript_dir}/oneflow/core/__init__.py"
+ COMMAND ${CMAKE_COMMAND} -E copy_directory "${of_proto_python_dir}/oneflow/core" "${of_pyscript_dir}/oneflow/compatible/single_client/core"
+ COMMAND ${CMAKE_COMMAND} -E touch "${of_pyscript_dir}/oneflow/compatible/single_client/core/__init__.py"
COMMAND ${CMAKE_COMMAND} -E make_directory "${of_pyscript_dir}/oneflow/F"
COMMAND ${CMAKE_COMMAND} -E touch "${of_pyscript_dir}/oneflow/F/__init__.py"
COMMAND ${CMAKE_COMMAND} -E make_directory "${of_pyscript_dir}/oneflow/compatible/single_client/F"
diff --git a/oneflow/compatible_single_client_python/advanced/distribute_ops.py b/oneflow/compatible_single_client_python/advanced/distribute_ops.py
index 0c2e7fcd3..09d61c6a7 100644
--- a/oneflow/compatible_single_client_python/advanced/distribute_ops.py
+++ b/oneflow/compatible_single_client_python/advanced/distribute_ops.py
@@ -16,8 +16,10 @@ limitations under the License.
from __future__ import absolute_import
from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.register import (
+ logical_blob_id_pb2 as logical_blob_id_util,
+)
from oneflow.compatible_single_client_python.framework import (
interpret_util as interpret_util,
)
diff --git a/oneflow/compatible_single_client_python/benchmarks/bert_benchmark/bert.py b/oneflow/compatible_single_client_python/benchmarks/bert_benchmark/bert.py
index 5b7503f6b..951fcdf8f 100755
--- a/oneflow/compatible_single_client_python/benchmarks/bert_benchmark/bert.py
+++ b/oneflow/compatible_single_client_python/benchmarks/bert_benchmark/bert.py
@@ -16,8 +16,8 @@ limitations under the License.
import math
from oneflow.compatible import single_client as flow
-from oneflow.core.common import data_type_pb2 as data_type_util
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.common import data_type_pb2 as data_type_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
class BertBackbone(object):
diff --git a/oneflow/compatible_single_client_python/benchmarks/bert_benchmark/pretrain.py b/oneflow/compatible_single_client_python/benchmarks/bert_benchmark/pretrain.py
index 235e4d553..0befc1686 100755
--- a/oneflow/compatible_single_client_python/benchmarks/bert_benchmark/pretrain.py
+++ b/oneflow/compatible_single_client_python/benchmarks/bert_benchmark/pretrain.py
@@ -15,7 +15,7 @@ limitations under the License.
"""
import bert as bert_util
from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
def PreTrain(
diff --git a/oneflow/compatible_single_client_python/benchmarks/cnn_benchmark/inceptionv3_model.py b/oneflow/compatible_single_client_python/benchmarks/cnn_benchmark/inceptionv3_model.py
index 8ba267c6c..df8bc9774 100644
--- a/oneflow/compatible_single_client_python/benchmarks/cnn_benchmark/inceptionv3_model.py
+++ b/oneflow/compatible_single_client_python/benchmarks/cnn_benchmark/inceptionv3_model.py
@@ -16,7 +16,7 @@ limitations under the License.
from __future__ import absolute_import, division, print_function
from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
def _conv2d_layer(
diff --git a/oneflow/compatible_single_client_python/benchmarks/cnn_benchmark/vgg_model.py b/oneflow/compatible_single_client_python/benchmarks/cnn_benchmark/vgg_model.py
index 257c30ad5..a5fb81847 100755
--- a/oneflow/compatible_single_client_python/benchmarks/cnn_benchmark/vgg_model.py
+++ b/oneflow/compatible_single_client_python/benchmarks/cnn_benchmark/vgg_model.py
@@ -16,8 +16,10 @@ limitations under the License.
from __future__ import absolute_import, division, print_function
from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.job import initializer_conf_pb2 as initializer_conf_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.job import (
+ initializer_conf_pb2 as initializer_conf_util,
+)
from model_util import conv2d_layer
diff --git a/oneflow/compatible_single_client_python/deprecated/init_cluster_env.py b/oneflow/compatible_single_client_python/deprecated/init_cluster_env.py
index 9bcb94e21..c668eadb8 100644
--- a/oneflow/compatible_single_client_python/deprecated/init_cluster_env.py
+++ b/oneflow/compatible_single_client_python/deprecated/init_cluster_env.py
@@ -23,8 +23,10 @@ from tempfile import NamedTemporaryFile
from google.protobuf import text_format as pbtxt
from oneflow.compatible_single_client_python.framework import env_util as env_util
-from oneflow.core.job.env_pb2 import EnvProto
-from oneflow.core.control.ctrl_bootstrap_pb2 import BootstrapConf
+from oneflow.compatible.single_client.core.job.env_pb2 import EnvProto
+from oneflow.compatible.single_client.core.control.ctrl_bootstrap_pb2 import (
+ BootstrapConf,
+)
from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
import subprocess
diff --git a/oneflow/compatible_single_client_python/deprecated/initializer_util.py b/oneflow/compatible_single_client_python/deprecated/initializer_util.py
index e33384f1b..33b434f2c 100644
--- a/oneflow/compatible_single_client_python/deprecated/initializer_util.py
+++ b/oneflow/compatible_single_client_python/deprecated/initializer_util.py
@@ -15,9 +15,13 @@ limitations under the License.
"""
from __future__ import absolute_import
-from oneflow.core.common import data_type_pb2 as data_type_conf_util
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.job import initializer_conf_pb2 as initializer_conf_util
+from oneflow.compatible.single_client.core.common import (
+ data_type_pb2 as data_type_conf_util,
+)
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.job import (
+ initializer_conf_pb2 as initializer_conf_util,
+)
from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
diff --git a/oneflow/compatible_single_client_python/eager/boxing_middle.py b/oneflow/compatible_single_client_python/eager/boxing_middle.py
index 2ddf5c823..a4586bd13 100644
--- a/oneflow/compatible_single_client_python/eager/boxing_middle.py
+++ b/oneflow/compatible_single_client_python/eager/boxing_middle.py
@@ -16,7 +16,9 @@ limitations under the License.
from __future__ import absolute_import
from oneflow.compatible_single_client_python.eager import symbol as symbol_util
-from oneflow.core.job import sbp_parallel_pb2 as sbp_parallel_pb
+from oneflow.compatible.single_client.core.job import (
+ sbp_parallel_pb2 as sbp_parallel_pb,
+)
from oneflow._oneflow_internal.oneflow.core.job import placement as placement_cfg
from oneflow._oneflow_internal.oneflow.core.common import shape as shape_proto_cfg
import oneflow._oneflow_internal
diff --git a/oneflow/compatible_single_client_python/eager/boxing_util.py b/oneflow/compatible_single_client_python/eager/boxing_util.py
index a62e020ee..0f5e5dc62 100644
--- a/oneflow/compatible_single_client_python/eager/boxing_util.py
+++ b/oneflow/compatible_single_client_python/eager/boxing_util.py
@@ -17,9 +17,13 @@ from __future__ import absolute_import
from contextlib import contextmanager
from oneflow.compatible_single_client_python.eager import symbol as symbol_util
-from oneflow.core.operator import op_conf_pb2 as op_conf_pb
-from oneflow.core.operator import op_attribute_pb2 as op_attribute_pb
-from oneflow.core.job import sbp_parallel_pb2 as sbp_parallel_pb
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_pb
+from oneflow.compatible.single_client.core.operator import (
+ op_attribute_pb2 as op_attribute_pb,
+)
+from oneflow.compatible.single_client.core.job import (
+ sbp_parallel_pb2 as sbp_parallel_pb,
+)
from oneflow.compatible_single_client_python.framework import id_util as id_util
from oneflow.compatible_single_client_python.framework import c_api_util as c_api_util
from oneflow.compatible_single_client_python.framework import (
@@ -29,7 +33,9 @@ from oneflow.compatible_single_client_python.lib.core import enable_if as enable
from oneflow.compatible_single_client_python.lib.core import (
high_order_bool as high_order_bool,
)
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+from oneflow.compatible.single_client.core.register import (
+ logical_blob_id_pb2 as logical_blob_id_util,
+)
from oneflow.compatible_single_client_python.eager import boxing_hob as boxing_hob
from oneflow.compatible_single_client_python.eager import op_infer_util as op_infer_util
from oneflow.compatible_single_client_python.eager.boxing_hob import BoxingHobContext
diff --git a/oneflow/compatible_single_client_python/eager/interpreter_callback.py b/oneflow/compatible_single_client_python/eager/interpreter_callback.py
index a5e3d115b..d387c7449 100644
--- a/oneflow/compatible_single_client_python/eager/interpreter_callback.py
+++ b/oneflow/compatible_single_client_python/eager/interpreter_callback.py
@@ -17,9 +17,11 @@ from __future__ import absolute_import
from oneflow.compatible_single_client_python.eager import gradient_util as gradient_util
from oneflow.compatible_single_client_python.eager import op_executor as op_executor
-from oneflow.core.operator import op_attribute_pb2 as op_attribute_pb
-from oneflow.core.job import scope_pb2 as scope_pb
-from oneflow.core.job import placement_pb2 as placement_pb
+from oneflow.compatible.single_client.core.operator import (
+ op_attribute_pb2 as op_attribute_pb,
+)
+from oneflow.compatible.single_client.core.job import scope_pb2 as scope_pb
+from oneflow.compatible.single_client.core.job import placement_pb2 as placement_pb
from google.protobuf import text_format
from oneflow.compatible_single_client_python.framework import scope_util as scope_util
from oneflow.compatible_single_client_python.eager import (
diff --git a/oneflow/compatible_single_client_python/eager/op_executor.py b/oneflow/compatible_single_client_python/eager/op_executor.py
index b775ed1d0..2dd4045cf 100644
--- a/oneflow/compatible_single_client_python/eager/op_executor.py
+++ b/oneflow/compatible_single_client_python/eager/op_executor.py
@@ -15,10 +15,16 @@ limitations under the License.
"""
from __future__ import absolute_import
-from oneflow.core.operator import op_node_signature_pb2 as op_node_signature_pb
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.operator import interface_blob_conf_pb2 as inter_face_blob_conf_util
+from oneflow.compatible.single_client.core.operator import (
+ op_node_signature_pb2 as op_node_signature_pb,
+)
+from oneflow.compatible.single_client.core.register import (
+ logical_blob_id_pb2 as logical_blob_id_util,
+)
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.operator import (
+ interface_blob_conf_pb2 as inter_face_blob_conf_util,
+)
from oneflow.compatible_single_client_python.eager import boxing_util as boxing_util
from oneflow.compatible_single_client_python.eager import (
blob_register as blob_register_util,
diff --git a/oneflow/compatible_single_client_python/eager/op_infer_util.py b/oneflow/compatible_single_client_python/eager/op_infer_util.py
index 061825fc8..880a1fdf0 100644
--- a/oneflow/compatible_single_client_python/eager/op_infer_util.py
+++ b/oneflow/compatible_single_client_python/eager/op_infer_util.py
@@ -14,7 +14,9 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
from __future__ import absolute_import
-from oneflow.core.operator import op_node_signature_pb2 as op_node_signature_pb
+from oneflow.compatible.single_client.core.operator import (
+ op_node_signature_pb2 as op_node_signature_pb,
+)
from oneflow.compatible_single_client_python.framework import c_api_util as c_api_util
from oneflow._oneflow_internal.oneflow.core.operator import (
op_node_signature as op_node_signature_cfg,
diff --git a/oneflow/compatible_single_client_python/eager/symbol.py b/oneflow/compatible_single_client_python/eager/symbol.py
index 0083b65a1..72a380c43 100644
--- a/oneflow/compatible_single_client_python/eager/symbol.py
+++ b/oneflow/compatible_single_client_python/eager/symbol.py
@@ -16,7 +16,7 @@ limitations under the License.
from __future__ import absolute_import
from oneflow.compatible_single_client_python.framework import c_api_util as c_api_util
-from oneflow.core.job import placement_pb2 as placement_pb
+from oneflow.compatible.single_client.core.job import placement_pb2 as placement_pb
import functools
diff --git a/oneflow/compatible_single_client_python/experimental/indexed_slices_ops.py b/oneflow/compatible_single_client_python/experimental/indexed_slices_ops.py
index 02120b238..b13eb57da 100644
--- a/oneflow/compatible_single_client_python/experimental/indexed_slices_ops.py
+++ b/oneflow/compatible_single_client_python/experimental/indexed_slices_ops.py
@@ -17,8 +17,10 @@ from __future__ import absolute_import
from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.register import (
+ logical_blob_id_pb2 as logical_blob_id_util,
+)
from oneflow.compatible_single_client_python.framework import (
interpret_util as interpret_util,
)
diff --git a/oneflow/compatible_single_client_python/experimental/interface_op_read_and_write.py b/oneflow/compatible_single_client_python/experimental/interface_op_read_and_write.py
index 7875c691c..95ac989f3 100644
--- a/oneflow/compatible_single_client_python/experimental/interface_op_read_and_write.py
+++ b/oneflow/compatible_single_client_python/experimental/interface_op_read_and_write.py
@@ -14,7 +14,9 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
from oneflow.compatible import single_client as flow
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+from oneflow.compatible.single_client.core.register import (
+ logical_blob_id_pb2 as logical_blob_id_util,
+)
from oneflow.compatible_single_client_python.lib.core import async_util as async_util
from oneflow.compatible_single_client_python.framework import (
input_blob_def as input_blob_def_util,
diff --git a/oneflow/compatible_single_client_python/experimental/square_sum_op.py b/oneflow/compatible_single_client_python/experimental/square_sum_op.py
index 47c7bc9c6..8daaa44e5 100644
--- a/oneflow/compatible_single_client_python/experimental/square_sum_op.py
+++ b/oneflow/compatible_single_client_python/experimental/square_sum_op.py
@@ -19,8 +19,10 @@ import operator
from functools import reduce
from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.register import (
+ logical_blob_id_pb2 as logical_blob_id_util,
+)
from oneflow.compatible_single_client_python.framework import (
interpret_util as interpret_util,
)
diff --git a/oneflow/compatible_single_client_python/experimental/unique_op.py b/oneflow/compatible_single_client_python/experimental/unique_op.py
index 30975b3c3..0f166dcfb 100644
--- a/oneflow/compatible_single_client_python/experimental/unique_op.py
+++ b/oneflow/compatible_single_client_python/experimental/unique_op.py
@@ -18,8 +18,10 @@ from __future__ import absolute_import
from typing import Optional, Tuple
from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.register import (
+ logical_blob_id_pb2 as logical_blob_id_util,
+)
from oneflow.compatible_single_client_python.framework import (
interpret_util as interpret_util,
)
diff --git a/oneflow/compatible_single_client_python/framework/c_api_util.py b/oneflow/compatible_single_client_python/framework/c_api_util.py
index d03da5a98..6000c53a0 100644
--- a/oneflow/compatible_single_client_python/framework/c_api_util.py
+++ b/oneflow/compatible_single_client_python/framework/c_api_util.py
@@ -17,19 +17,25 @@ from __future__ import absolute_import
from google.protobuf import text_format
-from oneflow.core.common import data_type_pb2 as dtype_util
-from oneflow.core.common import error_pb2 as error_util
-from oneflow.core.job import env_pb2 as env_pb2
-from oneflow.core.job import job_set_pb2 as job_set_pb
-from oneflow.core.job import job_pb2 as job_pb
-from oneflow.core.job import placement_pb2 as placement_pb
-from oneflow.core.job import resource_pb2 as resource_util
-from oneflow.core.operator import op_attribute_pb2 as op_attribute_pb
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.record import record_pb2 as record_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
-from oneflow.core.framework.config_def_pb2 import ConfigDef
-from oneflow.core.job.inter_user_job_info_pb2 import InterUserJobInfo
+from oneflow.compatible.single_client.core.common import data_type_pb2 as dtype_util
+from oneflow.compatible.single_client.core.common import error_pb2 as error_util
+from oneflow.compatible.single_client.core.job import env_pb2 as env_pb2
+from oneflow.compatible.single_client.core.job import job_set_pb2 as job_set_pb
+from oneflow.compatible.single_client.core.job import job_pb2 as job_pb
+from oneflow.compatible.single_client.core.job import placement_pb2 as placement_pb
+from oneflow.compatible.single_client.core.job import resource_pb2 as resource_util
+from oneflow.compatible.single_client.core.operator import (
+ op_attribute_pb2 as op_attribute_pb,
+)
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.record import record_pb2 as record_util
+from oneflow.compatible.single_client.core.register import (
+ logical_blob_id_pb2 as logical_blob_id_util,
+)
+from oneflow.compatible.single_client.core.framework.config_def_pb2 import ConfigDef
+from oneflow.compatible.single_client.core.job.inter_user_job_info_pb2 import (
+ InterUserJobInfo,
+)
# import oneflow.compatible.single_client as flow
from oneflow._oneflow_internal.oneflow.core.job import placement as placement_cfg
diff --git a/oneflow/compatible_single_client_python/framework/check_point_v2.py b/oneflow/compatible_single_client_python/framework/check_point_v2.py
index 4070286c1..0b855c031 100644
--- a/oneflow/compatible_single_client_python/framework/check_point_v2.py
+++ b/oneflow/compatible_single_client_python/framework/check_point_v2.py
@@ -20,14 +20,16 @@ from google.protobuf import text_format
from oneflow.compatible import single_client as flow
import oneflow._oneflow_internal
-from oneflow.core.operator import op_conf_pb2 as op_conf_pb
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_pb
from oneflow.compatible_single_client_python.framework import config_util as config_util
from oneflow.compatible_single_client_python.framework import dtype as dtype_util
from oneflow.compatible_single_client_python.framework import runtime_mode as rt_mode
from oneflow.compatible_single_client_python.ops import (
initializer_util as initializer_util,
)
-from oneflow.core.job import initializer_conf_pb2 as initializer_conf_util
+from oneflow.compatible.single_client.core.job import (
+ initializer_conf_pb2 as initializer_conf_util,
+)
from oneflow.compatible_single_client_python.framework import id_util as id_util
from oneflow.compatible_single_client_python.framework import (
session_context as session_ctx,
@@ -38,12 +40,18 @@ from oneflow.compatible_single_client_python.framework import (
from oneflow.compatible_single_client_python.lib.core import async_util as async_util
from oneflow.compatible_single_client_python.eager import boxing_util as boxing_util
from oneflow.compatible_single_client_python.eager import op_infer_util as op_infer_util
-from oneflow.core.framework import variable_meta_info_pb2 as variable_meta_info_pb
-from oneflow.core.framework import user_op_attr_pb2 as attr_value_pb
+from oneflow.compatible.single_client.core.framework import (
+ variable_meta_info_pb2 as variable_meta_info_pb,
+)
+from oneflow.compatible.single_client.core.framework import (
+ user_op_attr_pb2 as attr_value_pb,
+)
from oneflow.compatible_single_client_python.experimental import (
interface_op_read_and_write,
)
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+from oneflow.compatible.single_client.core.register import (
+ logical_blob_id_pb2 as logical_blob_id_util,
+)
from oneflow.compatible_single_client_python.ops import get_variable as get_variable
from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
diff --git a/oneflow/compatible_single_client_python/framework/dtype.py b/oneflow/compatible_single_client_python/framework/dtype.py
index 9c973ba71..6228e9775 100644
--- a/oneflow/compatible_single_client_python/framework/dtype.py
+++ b/oneflow/compatible_single_client_python/framework/dtype.py
@@ -16,7 +16,7 @@ limitations under the License.
from __future__ import absolute_import
import numpy as np
-from oneflow.core.common import data_type_pb2 as data_type_pb2
+from oneflow.compatible.single_client.core.common import data_type_pb2 as data_type_pb2
from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
from oneflow.compatible import single_client as flow
import oneflow._oneflow_internal
diff --git a/oneflow/compatible_single_client_python/framework/env_util.py b/oneflow/compatible_single_client_python/framework/env_util.py
index 71923f378..44f81e7ac 100644
--- a/oneflow/compatible_single_client_python/framework/env_util.py
+++ b/oneflow/compatible_single_client_python/framework/env_util.py
@@ -19,8 +19,10 @@ import socket
import os
from contextlib import closing
-from oneflow.core.control import ctrl_bootstrap_pb2 as ctrl_bootstrap_pb
-from oneflow.core.job import env_pb2 as env_pb
+from oneflow.compatible.single_client.core.control import (
+ ctrl_bootstrap_pb2 as ctrl_bootstrap_pb,
+)
+from oneflow.compatible.single_client.core.job import env_pb2 as env_pb
from oneflow.compatible_single_client_python.framework import c_api_util as c_api_util
from oneflow.compatible_single_client_python.framework import (
placement_context as placement_ctx,
@@ -29,7 +31,7 @@ from oneflow.compatible_single_client_python.framework import (
session_context as session_ctx,
)
from oneflow.compatible_single_client_python.framework import scope_util as scope_util
-from oneflow.core.job import resource_pb2 as resource_util
+from oneflow.compatible.single_client.core.job import resource_pb2 as resource_util
from oneflow.compatible_single_client_python.framework import hob as hob
from oneflow.compatible_single_client_python.lib.core import enable_if as enable_if
from oneflow.compatible_single_client_python.oneflow_export import (
diff --git a/oneflow/compatible_single_client_python/framework/input_blob_def.py b/oneflow/compatible_single_client_python/framework/input_blob_def.py
index 8137b9a4c..55c4dd60c 100644
--- a/oneflow/compatible_single_client_python/framework/input_blob_def.py
+++ b/oneflow/compatible_single_client_python/framework/input_blob_def.py
@@ -22,9 +22,13 @@ from typing import Any, Optional, Sequence, Union
import numpy as np
from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.operator import interface_blob_conf_pb2 as inter_face_blob_conf_util
-from oneflow.core.job import sbp_parallel_pb2 as sbp_parallel_pb
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.operator import (
+ interface_blob_conf_pb2 as inter_face_blob_conf_util,
+)
+from oneflow.compatible.single_client.core.job import (
+ sbp_parallel_pb2 as sbp_parallel_pb,
+)
from oneflow.compatible_single_client_python.framework import c_api_util as c_api_util
from oneflow.compatible_single_client_python.framework import (
compile_context as compile_context,
diff --git a/oneflow/compatible_single_client_python/framework/job_set_util.py b/oneflow/compatible_single_client_python/framework/job_set_util.py
index 1606d2d10..2ff851bfb 100644
--- a/oneflow/compatible_single_client_python/framework/job_set_util.py
+++ b/oneflow/compatible_single_client_python/framework/job_set_util.py
@@ -17,7 +17,7 @@ from __future__ import absolute_import
from typing import Optional, TypeVar
-from oneflow.core.job.job_set_pb2 import JobSet
+from oneflow.compatible.single_client.core.job.job_set_pb2 import JobSet
from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
_VT = TypeVar("_VT")
diff --git a/oneflow/compatible_single_client_python/framework/op_util.py b/oneflow/compatible_single_client_python/framework/op_util.py
index 8e17b9026..4a1a33ae3 100644
--- a/oneflow/compatible_single_client_python/framework/op_util.py
+++ b/oneflow/compatible_single_client_python/framework/op_util.py
@@ -15,7 +15,7 @@ limitations under the License.
"""
from __future__ import absolute_import
-from oneflow.core.operator.op_conf_pb2 import OperatorConf
+from oneflow.compatible.single_client.core.operator.op_conf_pb2 import OperatorConf
import oneflow._oneflow_internal
diff --git a/oneflow/compatible_single_client_python/framework/ops.py b/oneflow/compatible_single_client_python/framework/ops.py
index e6eff14ec..842d17be6 100644
--- a/oneflow/compatible_single_client_python/framework/ops.py
+++ b/oneflow/compatible_single_client_python/framework/ops.py
@@ -15,9 +15,11 @@ limitations under the License.
"""
from __future__ import absolute_import
-from oneflow.core.common import data_type_pb2 as data_type_util
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+from oneflow.compatible.single_client.core.common import data_type_pb2 as data_type_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.register import (
+ logical_blob_id_pb2 as logical_blob_id_util,
+)
from oneflow.compatible_single_client_python.framework import (
compile_context as compile_context,
)
diff --git a/oneflow/compatible_single_client_python/framework/placement_context.py b/oneflow/compatible_single_client_python/framework/placement_context.py
index 5e2ea7fd3..4a16e81a5 100644
--- a/oneflow/compatible_single_client_python/framework/placement_context.py
+++ b/oneflow/compatible_single_client_python/framework/placement_context.py
@@ -18,7 +18,7 @@ from __future__ import absolute_import
import collections
import re
-from oneflow.core.job import placement_pb2 as placement_pb
+from oneflow.compatible.single_client.core.job import placement_pb2 as placement_pb
from oneflow.compatible_single_client_python.framework import c_api_util as c_api_util
from oneflow.compatible_single_client_python.framework import op_util as op_util
from oneflow.compatible_single_client_python.framework import (
diff --git a/oneflow/compatible_single_client_python/framework/push_util.py b/oneflow/compatible_single_client_python/framework/push_util.py
index 445ba0bb6..a088b1e40 100644
--- a/oneflow/compatible_single_client_python/framework/push_util.py
+++ b/oneflow/compatible_single_client_python/framework/push_util.py
@@ -31,8 +31,10 @@ from oneflow.compatible_single_client_python.framework import (
)
from oneflow.compatible_single_client_python.framework import id_util as id_util
from oneflow.compatible_single_client_python.eager import boxing_util as boxing_util
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.register import (
+ logical_blob_id_pb2 as logical_blob_id_util,
+)
from oneflow._oneflow_internal.oneflow.core.register import logical_blob_id as lbi_util
import oneflow._oneflow_internal
import numpy
diff --git a/oneflow/compatible_single_client_python/framework/remote_blob.py b/oneflow/compatible_single_client_python/framework/remote_blob.py
index b78a1b611..5795f5163 100644
--- a/oneflow/compatible_single_client_python/framework/remote_blob.py
+++ b/oneflow/compatible_single_client_python/framework/remote_blob.py
@@ -16,7 +16,9 @@ limitations under the License.
from __future__ import absolute_import
from oneflow.compatible import single_client as flow
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+from oneflow.compatible.single_client.core.register import (
+ logical_blob_id_pb2 as logical_blob_id_util,
+)
from oneflow.compatible_single_client_python.framework import c_api_util as c_api_util
from oneflow.compatible_single_client_python.framework import id_util as id_util
from oneflow.compatible_single_client_python.framework import (
diff --git a/oneflow/compatible_single_client_python/framework/session_util.py b/oneflow/compatible_single_client_python/framework/session_util.py
index 7d928ba66..9e21cee90 100644
--- a/oneflow/compatible_single_client_python/framework/session_util.py
+++ b/oneflow/compatible_single_client_python/framework/session_util.py
@@ -16,8 +16,8 @@ limitations under the License.
from __future__ import absolute_import
import threading
-from oneflow.core.job.job_set_pb2 import ConfigProto
-from oneflow.core.job import job_set_pb2 as job_set_util
+from oneflow.compatible.single_client.core.job.job_set_pb2 import ConfigProto
+from oneflow.compatible.single_client.core.job import job_set_pb2 as job_set_util
from oneflow.compatible_single_client_python.framework import c_api_util as c_api_util
from oneflow.compatible_single_client_python.framework import compiler as compiler
from oneflow.compatible_single_client_python.framework import config_util as config_util
@@ -36,7 +36,7 @@ from oneflow.compatible_single_client_python.eager import op_executor as op_exec
from oneflow.compatible_single_client_python.experimental import (
interface_op_read_and_write,
)
-from oneflow.core.job.job_set_pb2 import ConfigProto
+from oneflow.compatible.single_client.core.job.job_set_pb2 import ConfigProto
from oneflow.compatible_single_client_python.framework.function_desc import FunctionDesc
from oneflow.compatible_single_client_python.framework import module as module_util
from oneflow.compatible_single_client_python.framework.pull_util import (
diff --git a/oneflow/compatible_single_client_python/framework/tensor.py b/oneflow/compatible_single_client_python/framework/tensor.py
index 405e27a08..e18381355 100644
--- a/oneflow/compatible_single_client_python/framework/tensor.py
+++ b/oneflow/compatible_single_client_python/framework/tensor.py
@@ -13,7 +13,9 @@ 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.
"""
-from oneflow.core.job import initializer_conf_pb2 as initializer_conf_util
+from oneflow.compatible.single_client.core.job import (
+ initializer_conf_pb2 as initializer_conf_util,
+)
from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
from oneflow.compatible_single_client_python.framework import (
remote_blob as remote_blob_util,
diff --git a/oneflow/compatible_single_client_python/framework/unittest.py b/oneflow/compatible_single_client_python/framework/unittest.py
index b77398e97..d478c0449 100644
--- a/oneflow/compatible_single_client_python/framework/unittest.py
+++ b/oneflow/compatible_single_client_python/framework/unittest.py
@@ -27,7 +27,7 @@ from tempfile import NamedTemporaryFile
from google.protobuf import text_format as pbtxt
from oneflow.compatible import single_client as flow
from oneflow.compatible_single_client_python.framework import env_util as env_util
-from oneflow.core.job.env_pb2 import EnvProto
+from oneflow.compatible.single_client.core.job.env_pb2 import EnvProto
from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
from typing import Any, Dict, Callable
import subprocess
diff --git a/oneflow/compatible_single_client_python/framework/watcher.py b/oneflow/compatible_single_client_python/framework/watcher.py
index 20a1a779c..52841516d 100644
--- a/oneflow/compatible_single_client_python/framework/watcher.py
+++ b/oneflow/compatible_single_client_python/framework/watcher.py
@@ -17,7 +17,7 @@ from __future__ import absolute_import
import traceback
-from oneflow.core.record import record_pb2 as record_util
+from oneflow.compatible.single_client.core.record import record_pb2 as record_util
from oneflow.compatible_single_client_python.framework import (
local_blob as local_blob_util,
)
diff --git a/oneflow/compatible_single_client_python/ops/__init__.py b/oneflow/compatible_single_client_python/ops/__init__.py
index 71766feff..a9917a263 100644
--- a/oneflow/compatible_single_client_python/ops/__init__.py
+++ b/oneflow/compatible_single_client_python/ops/__init__.py
@@ -17,8 +17,10 @@ from __future__ import absolute_import
import re
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.register import (
+ logical_blob_id_pb2 as logical_blob_id_util,
+)
from oneflow.compatible_single_client_python.framework import c_api_util as c_api_util
from oneflow.compatible_single_client_python.framework import (
compile_context as compile_context,
diff --git a/oneflow/compatible_single_client_python/ops/array_ops.py b/oneflow/compatible_single_client_python/ops/array_ops.py
index d8e00ab7c..e7f9805ae 100644
--- a/oneflow/compatible_single_client_python/ops/array_ops.py
+++ b/oneflow/compatible_single_client_python/ops/array_ops.py
@@ -24,8 +24,10 @@ from oneflow.compatible_single_client_python.oneflow_export import (
import numpy as np
import operator
from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.register import (
+ logical_blob_id_pb2 as logical_blob_id_util,
+)
from oneflow.compatible_single_client_python.framework import (
interpret_util as interpret_util,
)
diff --git a/oneflow/compatible_single_client_python/ops/assign_op.py b/oneflow/compatible_single_client_python/ops/assign_op.py
index 81897d93e..e60bf3352 100644
--- a/oneflow/compatible_single_client_python/ops/assign_op.py
+++ b/oneflow/compatible_single_client_python/ops/assign_op.py
@@ -18,8 +18,10 @@ from __future__ import absolute_import
import os
from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.register import (
+ logical_blob_id_pb2 as logical_blob_id_util,
+)
from oneflow.compatible_single_client_python.eager import boxing_util as boxing_util
from oneflow.compatible_single_client_python.framework import (
interpret_util as interpret_util,
diff --git a/oneflow/compatible_single_client_python/ops/combined_margin_loss.py b/oneflow/compatible_single_client_python/ops/combined_margin_loss.py
index 57aa99a0e..58586fddf 100644
--- a/oneflow/compatible_single_client_python/ops/combined_margin_loss.py
+++ b/oneflow/compatible_single_client_python/ops/combined_margin_loss.py
@@ -20,8 +20,10 @@ import os
from typing import Union, Optional, Sequence
from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.register import (
+ logical_blob_id_pb2 as logical_blob_id_util,
+)
from oneflow.compatible_single_client_python.framework import (
interpret_util as interpret_util,
)
diff --git a/oneflow/compatible_single_client_python/ops/constant_op.py b/oneflow/compatible_single_client_python/ops/constant_op.py
index 17a5e0039..81ded7d15 100644
--- a/oneflow/compatible_single_client_python/ops/constant_op.py
+++ b/oneflow/compatible_single_client_python/ops/constant_op.py
@@ -19,8 +19,10 @@ import os
from typing import Optional, Sequence, Union
from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.register import (
+ logical_blob_id_pb2 as logical_blob_id_util,
+)
from oneflow.compatible_single_client_python.framework import (
interpret_util as interpret_util,
)
diff --git a/oneflow/compatible_single_client_python/ops/count_not_finite.py b/oneflow/compatible_single_client_python/ops/count_not_finite.py
index 042c5ff39..81ff5beab 100644
--- a/oneflow/compatible_single_client_python/ops/count_not_finite.py
+++ b/oneflow/compatible_single_client_python/ops/count_not_finite.py
@@ -18,8 +18,10 @@ from __future__ import absolute_import
import os
from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.register import (
+ logical_blob_id_pb2 as logical_blob_id_util,
+)
from oneflow.compatible_single_client_python.framework import (
distribute as distribute_util,
)
diff --git a/oneflow/compatible_single_client_python/ops/data_ops.py b/oneflow/compatible_single_client_python/ops/data_ops.py
index 527d58567..013ca86a3 100644
--- a/oneflow/compatible_single_client_python/ops/data_ops.py
+++ b/oneflow/compatible_single_client_python/ops/data_ops.py
@@ -18,9 +18,13 @@ from __future__ import absolute_import
from typing import Optional, Sequence, Tuple, Union, List
from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.job import initializer_conf_pb2 as initializer_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.job import (
+ initializer_conf_pb2 as initializer_conf_util,
+)
+from oneflow.compatible.single_client.core.register import (
+ logical_blob_id_pb2 as logical_blob_id_util,
+)
from oneflow.compatible_single_client_python.framework import id_util as id_util
from oneflow.compatible_single_client_python.framework import (
interpret_util as interpret_util,
diff --git a/oneflow/compatible_single_client_python/ops/get_variable.py b/oneflow/compatible_single_client_python/ops/get_variable.py
index 099afd31a..039db439e 100644
--- a/oneflow/compatible_single_client_python/ops/get_variable.py
+++ b/oneflow/compatible_single_client_python/ops/get_variable.py
@@ -33,10 +33,16 @@ from oneflow.compatible_single_client_python.framework import (
from oneflow.compatible_single_client_python.experimental import (
name_scope as name_scope,
)
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.job import initializer_conf_pb2 as initializer_conf_util
-from oneflow.core.job import regularizer_conf_pb2 as regularizer_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.job import (
+ initializer_conf_pb2 as initializer_conf_util,
+)
+from oneflow.compatible.single_client.core.job import (
+ regularizer_conf_pb2 as regularizer_conf_util,
+)
+from oneflow.compatible.single_client.core.register import (
+ logical_blob_id_pb2 as logical_blob_id_util,
+)
from oneflow.compatible_single_client_python.framework import hob as hob
from oneflow.compatible_single_client_python.eager import boxing_util as boxing_util
from oneflow.compatible_single_client_python.eager import gradient_util as gradient_util
diff --git a/oneflow/compatible_single_client_python/ops/initializer_util.py b/oneflow/compatible_single_client_python/ops/initializer_util.py
index 1e8b9c972..7061b76af 100644
--- a/oneflow/compatible_single_client_python/ops/initializer_util.py
+++ b/oneflow/compatible_single_client_python/ops/initializer_util.py
@@ -21,8 +21,10 @@ import math
import numpy as np
from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.job import initializer_conf_pb2 as initializer_conf_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.job import (
+ initializer_conf_pb2 as initializer_conf_util,
+)
from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
from typing import Optional, Sequence, Union
diff --git a/oneflow/compatible_single_client_python/ops/layers.py b/oneflow/compatible_single_client_python/ops/layers.py
index 1b42ce272..0ae6c4e16 100644
--- a/oneflow/compatible_single_client_python/ops/layers.py
+++ b/oneflow/compatible_single_client_python/ops/layers.py
@@ -18,9 +18,13 @@ from typing import Callable, Optional, Union, Tuple, Sequence
from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.job import initializer_conf_pb2 as initializer_conf_util
-from oneflow.core.job import regularizer_conf_pb2 as regularizer_conf_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.job import (
+ initializer_conf_pb2 as initializer_conf_util,
+)
+from oneflow.compatible.single_client.core.job import (
+ regularizer_conf_pb2 as regularizer_conf_util,
+)
from oneflow.compatible_single_client_python.framework import (
distribute as distribute_util,
)
diff --git a/oneflow/compatible_single_client_python/ops/linalg.py b/oneflow/compatible_single_client_python/ops/linalg.py
index 92ec74c3d..97719ef63 100644
--- a/oneflow/compatible_single_client_python/ops/linalg.py
+++ b/oneflow/compatible_single_client_python/ops/linalg.py
@@ -18,8 +18,10 @@ from __future__ import absolute_import
import os
from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.register import (
+ logical_blob_id_pb2 as logical_blob_id_util,
+)
from oneflow.compatible_single_client_python.framework import (
interpret_util as interpret_util,
)
diff --git a/oneflow/compatible_single_client_python/ops/math_ops.py b/oneflow/compatible_single_client_python/ops/math_ops.py
index d6f350064..9f1bb6e24 100644
--- a/oneflow/compatible_single_client_python/ops/math_ops.py
+++ b/oneflow/compatible_single_client_python/ops/math_ops.py
@@ -19,8 +19,10 @@ import os
from typing import Union, Optional, Sequence, List, Tuple
from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.register import (
+ logical_blob_id_pb2 as logical_blob_id_util,
+)
from oneflow.compatible_single_client_python.framework import (
interpret_util as interpret_util,
)
diff --git a/oneflow/compatible_single_client_python/ops/math_unary_elementwise_ops.py b/oneflow/compatible_single_client_python/ops/math_unary_elementwise_ops.py
index b44d299c1..0682e1c12 100644
--- a/oneflow/compatible_single_client_python/ops/math_unary_elementwise_ops.py
+++ b/oneflow/compatible_single_client_python/ops/math_unary_elementwise_ops.py
@@ -20,8 +20,10 @@ import traceback
from typing import Optional
from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.register import (
+ logical_blob_id_pb2 as logical_blob_id_util,
+)
from oneflow.compatible_single_client_python.framework import id_util as id_util
from oneflow.compatible_single_client_python.framework import (
interpret_util as interpret_util,
diff --git a/oneflow/compatible_single_client_python/ops/nn_ops.py b/oneflow/compatible_single_client_python/ops/nn_ops.py
index 68657ddb4..111fbb9e3 100644
--- a/oneflow/compatible_single_client_python/ops/nn_ops.py
+++ b/oneflow/compatible_single_client_python/ops/nn_ops.py
@@ -21,8 +21,10 @@ import sys
import random
from typing import Union, Optional, Sequence, Tuple, List
from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.register import (
+ logical_blob_id_pb2 as logical_blob_id_util,
+)
from oneflow.compatible_single_client_python.framework import (
interpret_util as interpret_util,
)
diff --git a/oneflow/compatible_single_client_python/ops/one_hot.py b/oneflow/compatible_single_client_python/ops/one_hot.py
index 0a8ecc919..3fa6a0b1c 100644
--- a/oneflow/compatible_single_client_python/ops/one_hot.py
+++ b/oneflow/compatible_single_client_python/ops/one_hot.py
@@ -18,8 +18,10 @@ from __future__ import absolute_import
import os
from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.register import (
+ logical_blob_id_pb2 as logical_blob_id_util,
+)
from oneflow.compatible_single_client_python.framework import (
distribute as distribute_util,
)
diff --git a/oneflow/compatible_single_client_python/ops/partial_fc_sample.py b/oneflow/compatible_single_client_python/ops/partial_fc_sample.py
index 510f77b74..269321c71 100644
--- a/oneflow/compatible_single_client_python/ops/partial_fc_sample.py
+++ b/oneflow/compatible_single_client_python/ops/partial_fc_sample.py
@@ -18,8 +18,10 @@ from __future__ import absolute_import
import os
from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.register import (
+ logical_blob_id_pb2 as logical_blob_id_util,
+)
from oneflow.compatible_single_client_python.framework import (
distribute as distribute_util,
)
diff --git a/oneflow/compatible_single_client_python/ops/prelu.py b/oneflow/compatible_single_client_python/ops/prelu.py
index 0916c1267..9963d0a97 100644
--- a/oneflow/compatible_single_client_python/ops/prelu.py
+++ b/oneflow/compatible_single_client_python/ops/prelu.py
@@ -18,9 +18,13 @@ from typing import Optional, Sequence
from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.job import initializer_conf_pb2 as initializer_conf_util
-from oneflow.core.job import regularizer_conf_pb2 as regularizer_conf_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.job import (
+ initializer_conf_pb2 as initializer_conf_util,
+)
+from oneflow.compatible.single_client.core.job import (
+ regularizer_conf_pb2 as regularizer_conf_util,
+)
from oneflow.compatible_single_client_python.framework import (
distribute as distribute_util,
)
diff --git a/oneflow/compatible_single_client_python/ops/reduce_mean.py b/oneflow/compatible_single_client_python/ops/reduce_mean.py
index d44107646..d37b4bbbe 100644
--- a/oneflow/compatible_single_client_python/ops/reduce_mean.py
+++ b/oneflow/compatible_single_client_python/ops/reduce_mean.py
@@ -19,8 +19,10 @@ import collections
from typing import Optional, Union
from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.register import (
+ logical_blob_id_pb2 as logical_blob_id_util,
+)
from oneflow.compatible_single_client_python.framework import id_util as id_util
from oneflow.compatible_single_client_python.framework import (
remote_blob as remote_blob_util,
diff --git a/oneflow/compatible_single_client_python/ops/reduce_ops.py b/oneflow/compatible_single_client_python/ops/reduce_ops.py
index 49204c4eb..7956c4811 100644
--- a/oneflow/compatible_single_client_python/ops/reduce_ops.py
+++ b/oneflow/compatible_single_client_python/ops/reduce_ops.py
@@ -17,8 +17,10 @@ import os
from typing import Optional, Sequence, Sized, Union
from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.register import (
+ logical_blob_id_pb2 as logical_blob_id_util,
+)
from oneflow.compatible_single_client_python.framework import id_util as id_util
from oneflow.compatible_single_client_python.framework import (
interpret_util as interpret_util,
diff --git a/oneflow/compatible_single_client_python/ops/regularizer_util.py b/oneflow/compatible_single_client_python/ops/regularizer_util.py
index fe36aed18..5043db3e3 100644
--- a/oneflow/compatible_single_client_python/ops/regularizer_util.py
+++ b/oneflow/compatible_single_client_python/ops/regularizer_util.py
@@ -15,8 +15,10 @@ limitations under the License.
"""
from __future__ import absolute_import
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.job import regularizer_conf_pb2 as regularizer_conf_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.job import (
+ regularizer_conf_pb2 as regularizer_conf_util,
+)
from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
diff --git a/oneflow/compatible_single_client_python/ops/user_op_builder.py b/oneflow/compatible_single_client_python/ops/user_op_builder.py
index 94c38b6ed..9c4433a6f 100644
--- a/oneflow/compatible_single_client_python/ops/user_op_builder.py
+++ b/oneflow/compatible_single_client_python/ops/user_op_builder.py
@@ -29,12 +29,16 @@ from oneflow.compatible_single_client_python.framework import (
remote_blob as remote_blob_util,
)
from oneflow.compatible_single_client_python.lib.core import enable_if as enable_if
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.framework import user_op_attr_pb2 as attr_value_pb
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.framework import (
+ user_op_attr_pb2 as attr_value_pb,
+)
from oneflow._oneflow_internal.oneflow.core.framework import (
user_op_attr as user_op_attr_cfg,
)
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+from oneflow.compatible.single_client.core.register import (
+ logical_blob_id_pb2 as logical_blob_id_util,
+)
from oneflow._oneflow_internal.oneflow.core.common import shape as shape_cfg
from oneflow._oneflow_internal.oneflow.core.common import data_type as data_type_cfg
from oneflow.compatible import single_client as flow
@@ -43,7 +47,9 @@ from oneflow.compatible_single_client_python.framework import hob as hob
from oneflow.compatible_single_client_python.experimental import (
name_scope as name_scope,
)
-from oneflow.core.eager import eager_symbol_pb2 as eager_symbol_util
+from oneflow.compatible.single_client.core.eager import (
+ eager_symbol_pb2 as eager_symbol_util,
+)
from oneflow.compatible_single_client_python.eager import (
eager_blob_util as eager_blob_util,
)
diff --git a/oneflow/compatible_single_client_python/ops/watch.py b/oneflow/compatible_single_client_python/ops/watch.py
index 2c9a47d06..8476b7c3a 100644
--- a/oneflow/compatible_single_client_python/ops/watch.py
+++ b/oneflow/compatible_single_client_python/ops/watch.py
@@ -18,7 +18,7 @@ from __future__ import absolute_import
import uuid
from typing import Callable, Optional, Union
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
from oneflow.compatible_single_client_python.framework import c_api_util as c_api_util
from oneflow.compatible_single_client_python.framework import (
session_context as session_ctx,
@@ -38,7 +38,9 @@ from oneflow.compatible_single_client_python.framework import typing as oft
from oneflow.compatible_single_client_python.framework import typing_util as oft_util
from oneflow.compatible_single_client_python.lib.core import enable_if as enable_if
from oneflow.compatible_single_client_python.framework import hob as hob
-from oneflow.core.job.lbi_diff_watcher_info_pb2 import LbiAndDiffWatcherUuidPair
+from oneflow.compatible.single_client.core.job.lbi_diff_watcher_info_pb2 import (
+ LbiAndDiffWatcherUuidPair,
+)
from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
from oneflow.compatible_single_client_python import eager as eager_util
from oneflow.compatible import single_client as flow
diff --git a/oneflow/compatible_single_client_python/serving/inference_session.py b/oneflow/compatible_single_client_python/serving/inference_session.py
index 14e8a5ab7..d902fabfa 100644
--- a/oneflow/compatible_single_client_python/serving/inference_session.py
+++ b/oneflow/compatible_single_client_python/serving/inference_session.py
@@ -31,9 +31,13 @@ from oneflow._oneflow_internal.oneflow.core.operator import (
from oneflow._oneflow_internal.oneflow.core.common import shape as shape_proto_cfg
from oneflow._oneflow_internal.oneflow.core.common import data_type as dtype_proto_cfg
from oneflow._oneflow_internal.oneflow.core.job import sbp_parallel as sbp_parallel_cfg
-from oneflow.core.job import job_conf_pb2 as job_conf_proto
-from oneflow.core.operator import interface_blob_conf_pb2 as interface_blob_conf_proto
-from oneflow.core.serving import saved_model_pb2 as saved_model_pb
+from oneflow.compatible.single_client.core.job import job_conf_pb2 as job_conf_proto
+from oneflow.compatible.single_client.core.operator import (
+ interface_blob_conf_pb2 as interface_blob_conf_proto,
+)
+from oneflow.compatible.single_client.core.serving import (
+ saved_model_pb2 as saved_model_pb,
+)
from oneflow.compatible_single_client_python.framework import c_api_util as c_api_util
from oneflow.compatible_single_client_python.framework import (
compile_context as compile_ctx,
diff --git a/oneflow/compatible_single_client_python/serving/saved_model_builder.py b/oneflow/compatible_single_client_python/serving/saved_model_builder.py
index e615732ae..aeb82f062 100644
--- a/oneflow/compatible_single_client_python/serving/saved_model_builder.py
+++ b/oneflow/compatible_single_client_python/serving/saved_model_builder.py
@@ -24,11 +24,19 @@ from oneflow.compatible_single_client_python.framework import c_api_util as c_ap
from oneflow.compatible_single_client_python.framework import (
session_context as session_ctx,
)
-from oneflow.core.serving import saved_model_pb2 as saved_model_pb
-from oneflow.core.job import job_conf_pb2 as job_conf_pb
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_pb
-from oneflow.core.operator import interface_blob_conf_pb2 as interface_blob_conf_pb
-from oneflow.core.job import sbp_parallel_pb2 as sbp_parallel_pb
+from oneflow.compatible.single_client.core.serving import (
+ saved_model_pb2 as saved_model_pb,
+)
+from oneflow.compatible.single_client.core.job import job_conf_pb2 as job_conf_pb
+from oneflow.compatible.single_client.core.register import (
+ logical_blob_id_pb2 as logical_blob_id_pb,
+)
+from oneflow.compatible.single_client.core.operator import (
+ interface_blob_conf_pb2 as interface_blob_conf_pb,
+)
+from oneflow.compatible.single_client.core.job import (
+ sbp_parallel_pb2 as sbp_parallel_pb,
+)
from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
diff --git a/oneflow/compatible_single_client_python/summary/summary_graph.py b/oneflow/compatible_single_client_python/summary/summary_graph.py
index 507619dae..93b83c130 100644
--- a/oneflow/compatible_single_client_python/summary/summary_graph.py
+++ b/oneflow/compatible_single_client_python/summary/summary_graph.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
import os
-from oneflow.core.summary import projector_pb2 as projector_pb2
+from oneflow.compatible.single_client.core.summary import projector_pb2 as projector_pb2
from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
import oneflow._oneflow_internal
import time
diff --git a/oneflow/compatible_single_client_python/summary/summary_hparams.py b/oneflow/compatible_single_client_python/summary/summary_hparams.py
index 23b9b7a19..1d6355645 100644
--- a/oneflow/compatible_single_client_python/summary/summary_hparams.py
+++ b/oneflow/compatible_single_client_python/summary/summary_hparams.py
@@ -23,11 +23,13 @@ import hashlib
import json
import time
-from oneflow.core.summary import plugin_data_pb2 as plugin_data_pb2
-from oneflow.core.summary import summary_pb2 as summary_pb2
-from oneflow.core.summary import event_pb2 as event_pb2
-from oneflow.core.summary import tensor_pb2 as tensor_pb2
-from oneflow.core.summary import projector_pb2 as projector_pb2
+from oneflow.compatible.single_client.core.summary import (
+ plugin_data_pb2 as plugin_data_pb2,
+)
+from oneflow.compatible.single_client.core.summary import summary_pb2 as summary_pb2
+from oneflow.compatible.single_client.core.summary import event_pb2 as event_pb2
+from oneflow.compatible.single_client.core.summary import tensor_pb2 as tensor_pb2
+from oneflow.compatible.single_client.core.summary import projector_pb2 as projector_pb2
from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
diff --git a/oneflow/compatible_single_client_python/summary/summary_projector.py b/oneflow/compatible_single_client_python/summary/summary_projector.py
index 1ce6b9bed..0cbcfbf72 100644
--- a/oneflow/compatible_single_client_python/summary/summary_projector.py
+++ b/oneflow/compatible_single_client_python/summary/summary_projector.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
import os
-from oneflow.core.summary import projector_pb2 as projector_pb2
+from oneflow.compatible.single_client.core.summary import projector_pb2 as projector_pb2
from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
import time
diff --git a/oneflow/compatible_single_client_python/test/models/alexnet.py b/oneflow/compatible_single_client_python/test/models/alexnet.py
index f83d952da..b3ca0f9fe 100644
--- a/oneflow/compatible_single_client_python/test/models/alexnet.py
+++ b/oneflow/compatible_single_client_python/test/models/alexnet.py
@@ -19,8 +19,10 @@ from datetime import datetime
import numpy
from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.job import initializer_conf_pb2 as initializer_conf_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.job import (
+ initializer_conf_pb2 as initializer_conf_util,
+)
# _DATA_DIR = "/dataset/imagenet_227/train/32"
_DATA_DIR = "/dataset/PNGS/PNG227/of_record_repeated"
diff --git a/oneflow/compatible_single_client_python/test/models/alexnet_with_unpack.py b/oneflow/compatible_single_client_python/test/models/alexnet_with_unpack.py
index a7b81e29a..a0f0eedf1 100644
--- a/oneflow/compatible_single_client_python/test/models/alexnet_with_unpack.py
+++ b/oneflow/compatible_single_client_python/test/models/alexnet_with_unpack.py
@@ -19,8 +19,10 @@ from datetime import datetime
import numpy
from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.job import initializer_conf_pb2 as initializer_conf_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.job import (
+ initializer_conf_pb2 as initializer_conf_util,
+)
# _DATA_DIR = "/dataset/imagenet_227/train/32"
_DATA_DIR = "/dataset/PNGS/PNG227/of_record_repeated"
diff --git a/oneflow/compatible_single_client_python/test/models/bert.py b/oneflow/compatible_single_client_python/test/models/bert.py
index 0b88309d4..2616bb1b1 100644
--- a/oneflow/compatible_single_client_python/test/models/bert.py
+++ b/oneflow/compatible_single_client_python/test/models/bert.py
@@ -16,8 +16,8 @@ limitations under the License.
import math
from oneflow.compatible import single_client as flow
-from oneflow.core.common import data_type_pb2 as data_type_util
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.common import data_type_pb2 as data_type_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
class BertBackbone(object):
diff --git a/oneflow/compatible_single_client_python/test/models/inceptionv3.py b/oneflow/compatible_single_client_python/test/models/inceptionv3.py
index 47cfebe60..8d988c79b 100644
--- a/oneflow/compatible_single_client_python/test/models/inceptionv3.py
+++ b/oneflow/compatible_single_client_python/test/models/inceptionv3.py
@@ -19,7 +19,7 @@ from datetime import datetime
import numpy
from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
_DATA_DIR = "/dataset/PNGS/PNG299/of_record_repeated"
_EVAL_DIR = _DATA_DIR
diff --git a/oneflow/compatible_single_client_python/test/models/pretrain.py b/oneflow/compatible_single_client_python/test/models/pretrain.py
index 421cdac3b..e50192767 100644
--- a/oneflow/compatible_single_client_python/test/models/pretrain.py
+++ b/oneflow/compatible_single_client_python/test/models/pretrain.py
@@ -15,7 +15,7 @@ limitations under the License.
"""
import bert as bert_util
from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
def PreTrain(
diff --git a/oneflow/compatible_single_client_python/test/models/resnet50.py b/oneflow/compatible_single_client_python/test/models/resnet50.py
index f325c7847..20bcd612b 100644
--- a/oneflow/compatible_single_client_python/test/models/resnet50.py
+++ b/oneflow/compatible_single_client_python/test/models/resnet50.py
@@ -19,7 +19,7 @@ from datetime import datetime
import numpy
from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
# import hook
diff --git a/oneflow/compatible_single_client_python/test/models/test_alexnet_model.py b/oneflow/compatible_single_client_python/test/models/test_alexnet_model.py
index 776e9e11a..f373a456e 100644
--- a/oneflow/compatible_single_client_python/test/models/test_alexnet_model.py
+++ b/oneflow/compatible_single_client_python/test/models/test_alexnet_model.py
@@ -18,8 +18,10 @@ from datetime import datetime
import unittest
from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.job import initializer_conf_pb2 as initializer_conf_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.job import (
+ initializer_conf_pb2 as initializer_conf_util,
+)
_DATA_DIR = "/dataset/PNGS/PNG227/of_record_repeated"
diff --git a/oneflow/compatible_single_client_python/test/models/vgg16.py b/oneflow/compatible_single_client_python/test/models/vgg16.py
index 30d13b2b1..c6035043f 100644
--- a/oneflow/compatible_single_client_python/test/models/vgg16.py
+++ b/oneflow/compatible_single_client_python/test/models/vgg16.py
@@ -19,8 +19,10 @@ from datetime import datetime
import numpy
from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.job import initializer_conf_pb2 as initializer_conf_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.job import (
+ initializer_conf_pb2 as initializer_conf_util,
+)
_DATA_DIR = "/dataset/PNGS/PNG224/of_record_repeated"
_SINGLE_DATA_DIR = "/dataset/PNGS/PNG224/of_record"
diff --git a/oneflow/compatible_single_client_python/test/serving/insightface_resnet100.py b/oneflow/compatible_single_client_python/test/serving/insightface_resnet100.py
index 8b75bc6ae..682cb45ad 100644
--- a/oneflow/compatible_single_client_python/test/serving/insightface_resnet100.py
+++ b/oneflow/compatible_single_client_python/test/serving/insightface_resnet100.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
def _get_initializer():
diff --git a/oneflow/compatible_single_client_python/test/serving/ofrecord_dataset.py b/oneflow/compatible_single_client_python/test/serving/ofrecord_dataset.py
index ebf6f84a6..dd2754b79 100644
--- a/oneflow/compatible_single_client_python/test/serving/ofrecord_dataset.py
+++ b/oneflow/compatible_single_client_python/test/serving/ofrecord_dataset.py
@@ -18,7 +18,7 @@ import os
import struct
import cv2
import numpy as np
-from oneflow.core.record import record_pb2 as record_pb
+from oneflow.compatible.single_client.core.record import record_pb2 as record_pb
class OFRecordDataset(object):
diff --git a/oneflow/compatible_single_client_python/test/serving/test_alexnet_save_and_load.py b/oneflow/compatible_single_client_python/test/serving/test_alexnet_save_and_load.py
index 4f5288e9b..b025ae63f 100644
--- a/oneflow/compatible_single_client_python/test/serving/test_alexnet_save_and_load.py
+++ b/oneflow/compatible_single_client_python/test/serving/test_alexnet_save_and_load.py
@@ -20,7 +20,9 @@ import numpy as np
from google.protobuf import text_format as text_format
from oneflow.compatible import single_client as flow
-from oneflow.core.serving import saved_model_pb2 as saved_model_pb
+from oneflow.compatible.single_client.core.serving import (
+ saved_model_pb2 as saved_model_pb,
+)
from alexnet import load_data, alexnet
from ofrecord_dataset import ImageNetRecordDataset
diff --git a/oneflow/compatible_single_client_python/test/serving/test_resnet_save_and_load.py b/oneflow/compatible_single_client_python/test/serving/test_resnet_save_and_load.py
index 281a09d5d..bed8e43f2 100644
--- a/oneflow/compatible_single_client_python/test/serving/test_resnet_save_and_load.py
+++ b/oneflow/compatible_single_client_python/test/serving/test_resnet_save_and_load.py
@@ -20,7 +20,9 @@ import shutil
import unittest
from google.protobuf import text_format as text_format
from oneflow.compatible import single_client as flow
-from oneflow.core.serving import saved_model_pb2 as saved_model_pb
+from oneflow.compatible.single_client.core.serving import (
+ saved_model_pb2 as saved_model_pb,
+)
from resnet_model import resnet50
from ofrecord_dataset import ImageNetRecordDataset
--
GitLab