[Typing] Ensure packaging tensor.pyi into wheel

python/CMakeLists.txt

@@ -160,24 +160,39 @@ else()
     add_custom_command(
       OUTPUT ${PADDLE_PYTHON_BUILD_DIR}/.timestamp_wheel
       COMMAND env ${py_env} ${PYTHON_EXECUTABLE} setup.py bdist_wheel
-      COMMENT "Packing whl packages------>>>")
+      COMMENT "Packing whl packages------>>>"
+      DEPENDS ${PADDLE_PYTHON_BUILD_DIR}/.timestamp)
   endif()
 endif()
 
 add_custom_target(paddle_python ALL
                   DEPENDS ${PADDLE_PYTHON_BUILD_DIR}/.timestamp)
+
+# -------------- Generate tensor.pyi stub file --------------
+add_custom_target(
+  paddle_stub ALL
+  # generate tensor.pyi for type hints
+  COMMAND
+    ${CMAKE_COMMAND} -E env PYTHONPATH=${PADDLE_BINARY_DIR}/python
+    ${PYTHON_EXECUTABLE} ${PADDLE_SOURCE_DIR}/tools/gen_tensor_stub.py
+    --input-file ${PADDLE_SOURCE_DIR}/python/paddle/tensor/tensor.prototype.pyi
+    --output-file ${PADDLE_BINARY_DIR}/python/paddle/tensor/tensor.pyi
+    --source-dir ${PADDLE_SOURCE_DIR} --binary-dir ${PADDLE_BINARY_DIR}
+  # copy tensor.pyi to source dir
+  COMMAND
+    ${CMAKE_COMMAND} -E copy
+    ${PADDLE_BINARY_DIR}/python/paddle/tensor/tensor.pyi
+    ${PADDLE_SOURCE_DIR}/python/paddle/tensor/tensor.pyi
+  COMMENT "Generate tensor.pyi------>>>"
+  DEPENDS ${PADDLE_PYTHON_BUILD_DIR}/.timestamp)
+
+add_dependencies(paddle_stub paddle_python copy_libpaddle)
+# -------------- End Generate tensor.pyi stub file --------------
+
 if(BUILD_WHL_PACKAGE AND NOT WITH_SETUP_INSTALL)
-  add_custom_target(
-    paddle_copy ALL
-    # generate tensor.pyi for type hints
-    COMMAND
-      ${CMAKE_COMMAND} -E env PYTHONPATH=${PADDLE_BINARY_DIR}/python
-      ${PYTHON_EXECUTABLE} ${PADDLE_SOURCE_DIR}/tools/gen_tensor_stub.py
-      --input-file
-      ${PADDLE_SOURCE_DIR}/python/paddle/tensor/tensor.prototype.pyi
-      --output-file ${PADDLE_BINARY_DIR}/python/paddle/tensor/tensor.pyi
-    DEPENDS ${PADDLE_PYTHON_BUILD_DIR}/.timestamp_wheel)
-  add_dependencies(paddle_copy paddle_python)
+  add_custom_target(paddle_copy ALL
+                    DEPENDS ${PADDLE_PYTHON_BUILD_DIR}/.timestamp_wheel)
+  add_dependencies(paddle_copy paddle_python paddle_stub)
 endif()
 
 set(PADDLE_PYTHON_PACKAGE_DIR ${CMAKE_CURRENT_BINARY_DIR}/dist/)

python/paddle/__init__.py

@@ -14,12 +14,16 @@
 
 import typing
 
+is_paddle_installed = False
 try:
     from paddle.cuda_env import *  # noqa: F403
     from paddle.version import (  # noqa: F401
         commit as __git_commit__,
         full_version as __version__,
     )
+
+    is_paddle_installed = True
+
 except ImportError:
     import sys
 
@@ -577,7 +581,7 @@
     if os.path.exists(cuh_file):
         os.environ.setdefault('runtime_include_dir', runtime_include_dir)
 
-if is_compiled_with_cuda():
+if is_paddle_installed and is_compiled_with_cuda():
     import os
     import platform
 

python/paddle/base/core.py

@@ -43,6 +43,16 @@
         # Use add_dll_directory to specify dll resolution path
         os.add_dll_directory(third_lib_path)
 
+        # todo: debug
+        import glob
+
+        sys.stderr.write('^' * 20)
+        sys.stderr.write(str(glob.glob(third_lib_path + os.sep + '*')))
+        sys.stderr.write('=' * 20)
+        sys.stderr.write(os.environ['path'])
+        sys.stderr.write('=' * 20)
+        sys.stderr.write(str(glob.glob(current_path + os.sep + '*')))
+
 except ImportError as e:
     if os.name == 'nt':
         executable_path = os.path.abspath(os.path.dirname(sys.executable))

python/paddle/base/framework.py

@@ -33,7 +33,6 @@
 import numpy as np
 
 import paddle
-import paddle.version as paddle_version
 
 from .. import pir
 from . import core, unique_name
@@ -573,10 +572,10 @@ def require_version(min_version, max_version=None):
             )
 
     version_installed = [
-        paddle_version.major,
-        paddle_version.minor,
-        paddle_version.patch,
-        paddle_version.rc,
+        paddle.version.major,
+        paddle.version.minor,
+        paddle.version.patch,
+        paddle.version.rc,
     ]
     zero_version = ["0", "0", "0", "0"]
 
@@ -591,13 +590,13 @@ def version_cmp(ver_a, ver_b):
     if version_cmp(version_installed, zero_version) == 0:
         if max_version is not None:
             warnings.warn(
-                f"PaddlePaddle version in [{min_version}, {max_version}] required, but {paddle_version.full_version} installed. "
+                f"PaddlePaddle version in [{min_version}, {max_version}] required, but {paddle.version.full_version} installed. "
                 "Maybe you are using a develop version, "
                 "please make sure the version is good with your code."
             )
         else:
             warnings.warn(
-                f"PaddlePaddle version {min_version} or higher is required, but {paddle_version.full_version} installed, "
+                f"PaddlePaddle version {min_version} or higher is required, but {paddle.version.full_version} installed, "
                 "Maybe you are using a develop version, "
                 "please make sure the version is good with your code."
             )
@@ -619,12 +618,12 @@ def version_cmp(ver_a, ver_b):
             or version_cmp(version_installed, min_version_to_check) < 0
         ):
             raise Exception(
-                f"VersionError: PaddlePaddle version in [{min_version}, {max_version}] required, but {paddle_version.full_version} installed."
+                f"VersionError: PaddlePaddle version in [{min_version}, {max_version}] required, but {paddle.version.full_version} installed."
             )
     else:
         if version_cmp(version_installed, min_version_to_check) < 0:
             raise Exception(
-                f"VersionError: PaddlePaddle version {min_version} or higher is required, but {paddle_version.full_version} installed, "
+                f"VersionError: PaddlePaddle version {min_version} or higher is required, but {paddle.version.full_version} installed, "
                 f"please upgrade your PaddlePaddle to {min_version} or other higher version."
             )
 

python/paddle/nn/quant/quantized_linear.py

@@ -12,7 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from paddle import _C_ops, version
+from paddle import _C_ops
+
+try:
+    from paddle import version
+except ImportError:
+    import sys
+
+    sys.stderr.write(
+        '''Warning with import paddle: you should not
+     import paddle from the source directory; please install paddlepaddle*.whl firstly.'''
+    )
+
 from paddle.base.data_feeder import check_dtype
 from paddle.base.framework import convert_np_dtype_to_dtype_
 from paddle.device.cuda import get_device_capability

python/paddle/tensor/tensor.prototype.pyi

@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# The `Tensor` template for `tools/gen_tensor_stub.py` generates the stub file `tensor.pyi`.
-# Add docstring, attributes, methods and alias with type annotaions for `Tensor`
+# The `Tensor` template `tensor.prototype.pyi` for `tools/gen_tensor_stub.py` to generate the stub file `tensor.pyi`.
+# Add docstring, attributes, methods and alias with type annotaions for `Tensor` in `tensor.prototype.pyi`
 # if not conveniently coding in original place (like c++ source file).
 
 from typing import Any, overload