copy of_proto_python_dir to compatible_single_client_python

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"

oneflow/compatible_single_client_python/advanced/distribute_ops.py

@@ -16,8 +16,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,
 )

oneflow/compatible_single_client_python/benchmarks/bert_benchmark/bert.py

@@ -16,8 +16,8 @@
 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):

oneflow/compatible_single_client_python/benchmarks/bert_benchmark/pretrain.py

@@ -15,7 +15,7 @@
 """
 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(

oneflow/compatible_single_client_python/benchmarks/cnn_benchmark/inceptionv3_model.py

@@ -16,7 +16,7 @@
 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(

oneflow/compatible_single_client_python/benchmarks/cnn_benchmark/vgg_model.py

@@ -16,8 +16,10 @@
 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
 
 

oneflow/compatible_single_client_python/deprecated/init_cluster_env.py

@@ -23,8 +23,10 @@
 
 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
 

oneflow/compatible_single_client_python/deprecated/initializer_util.py

@@ -15,9 +15,13 @@
 """
 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
 
 

oneflow/compatible_single_client_python/eager/boxing_middle.py

@@ -16,7 +16,9 @@
 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

oneflow/compatible_single_client_python/eager/boxing_util.py

@@ -17,9 +17,13 @@
 
 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 (
     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

oneflow/compatible_single_client_python/eager/interpreter_callback.py

@@ -17,9 +17,11 @@
 
 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 (

oneflow/compatible_single_client_python/eager/op_executor.py

@@ -15,10 +15,16 @@
 """
 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,

oneflow/compatible_single_client_python/eager/op_infer_util.py

@@ -14,7 +14,9 @@
 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,

oneflow/compatible_single_client_python/eager/symbol.py

@@ -16,7 +16,7 @@
 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
 
 

oneflow/compatible_single_client_python/experimental/indexed_slices_ops.py

@@ -17,8 +17,10 @@
 
 
 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,
 )

oneflow/compatible_single_client_python/experimental/interface_op_read_and_write.py

@@ -14,7 +14,9 @@
 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,

oneflow/compatible_single_client_python/experimental/square_sum_op.py

@@ -19,8 +19,10 @@
 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,
 )

oneflow/compatible_single_client_python/experimental/unique_op.py

@@ -18,8 +18,10 @@
 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,
 )

oneflow/compatible_single_client_python/framework/c_api_util.py

@@ -17,19 +17,25 @@
 
 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

oneflow/compatible_single_client_python/framework/check_point_v2.py

@@ -20,14 +20,16 @@
 
 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.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

oneflow/compatible_single_client_python/framework/dtype.py

@@ -16,7 +16,7 @@
 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

oneflow/compatible_single_client_python/framework/env_util.py

@@ -19,8 +19,10 @@
 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 @@
     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 (

oneflow/compatible_single_client_python/framework/input_blob_def.py

@@ -22,9 +22,13 @@
 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,

oneflow/compatible_single_client_python/framework/job_set_util.py

@@ -17,7 +17,7 @@
 
 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")

oneflow/compatible_single_client_python/framework/op_util.py

@@ -15,7 +15,7 @@
 """
 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
 
 

oneflow/compatible_single_client_python/framework/ops.py

@@ -15,9 +15,11 @@
 """
 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,
 )