pydevd-pycharm 252.23892.439__tar.gz → 252.25557.35__tar.gz

{pydevd_pycharm-252.23892.439/pydevd_pycharm.egg-info → pydevd_pycharm-252.25557.35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pydevd-pycharm
-Version: 252.23892.439
+Version: 252.25557.35
 Summary: PyCharm Debugger (used in PyCharm and PyDev)
 Home-page: https://github.com/JetBrains/intellij-community
 Author: JetBrains, Fabio Zadrozny and others

pydevd_pycharm-252.25557.35/VERSION

@@ -0,0 +1 @@
+252.25557.35

{pydevd_pycharm-252.23892.439 → pydevd_pycharm-252.25557.35}/_pydevd_bundle/pydevd_comm.py

@@ -151,7 +151,7 @@ from _pydevd_bundle.pydevd_comm_constants import (
 MAX_IO_MSG_SIZE = 1000  #if the io is too big, we'll not send all (could make the debugger too non-responsive)
 #this number can be changed if there's need to do so
 
-VERSION_STRING = "252.23892.439"
+VERSION_STRING = "252.25557.35"
 
 from _pydev_bundle._pydev_filesystem_encoding import getfilesystemencoding
 file_system_encoding = getfilesystemencoding()

{pydevd_pycharm-252.23892.439 → pydevd_pycharm-252.25557.35}/_pydevd_bundle/pydevd_thrift.py

@@ -15,7 +15,8 @@ from _pydevd_bundle.pydevd_constants import dict_iter_items, dict_keys, IS_PY3K,
     GET_FRAME_RETURN_GROUP
 from _pydevd_bundle.pydevd_extension_api import TypeResolveProvider, StrPresentationProvider
 from _pydevd_bundle.pydevd_user_type_renderers_utils import try_get_type_renderer_for_var
-from _pydevd_bundle.pydevd_utils import  is_string, should_evaluate_full_value, should_evaluate_shape
+from _pydevd_bundle.pydevd_utils import is_string, should_evaluate_full_value, \
+    should_evaluate_shape, is_container_with_shape_dtype
 from _pydevd_bundle.pydevd_vars import get_label, array_default_format, is_able_to_format_number, MAXIMUM_ARRAY_SIZE, \
     get_column_formatter_by_type, get_formatted_row_elements, IAtPolarsAccessor, DEFAULT_DF_FORMAT, DATAFRAME_HEADER_LOAD_MAX_SIZE
 from pydev_console.pydev_protocol import DebugValue, GetArrayResponse, ArrayData, ArrayHeaders, ColHeader, RowHeader, \
@@ -333,7 +334,7 @@ def var_to_struct(val, name, format='%s', do_trim=True, evaluate_full_value=True
 
     # shape to struct
     try:
-        if should_evaluate_shape():
+        if should_evaluate_shape() and is_container_with_shape_dtype(type_qualifier, typeName, v):
             if hasattr(v, 'shape') and not callable(v.shape):
                 debug_value.shape = str(tuple(v.shape))
             elif hasattr(v, '__len__') and not is_string(v):
@@ -344,8 +345,10 @@ def var_to_struct(val, name, format='%s', do_trim=True, evaluate_full_value=True
     # data type info to xml (for arrays and tensors)
     debug_value.arrayElementType = ''
     try:
-        if hasattr(v, 'dtype') and hasattr(v.dtype, 'name'):
-            debug_value.arrayElementType = v.dtype.name
+        if (is_container_with_shape_dtype(type_qualifier, typeName, v)
+                and hasattr(v, 'dtype')
+                and hasattr(v.dtype, 'name')):
+            debug_value.arrayElementType = str(v.dtype)
     except:
         pass
 
@@ -420,17 +423,26 @@ def array_to_thrift_struct(array, name, roffset, coffset, rows, cols, format):
     return array_chunk
 
 
-def tensor_to_thrift_struct(tensor, name, roffset, coffset, rows, cols, format):
+def tf_to_thrift_struct(tensor, name, roffset, coffset, rows, cols, format):
     try:
         return array_to_thrift_struct(tensor.numpy(), name, roffset, coffset, rows, cols, format)
     except TypeError:
         return array_to_thrift_struct(tensor.to_dense().numpy(), name, roffset, coffset, rows, cols, format)
 
 
-def sparse_tensor_to_thrift_struct(tensor, name, roffset, coffset, rows, cols, format):
+def torch_to_thrift_struct(tensor, name, roffset, coffset, rows, cols, format):
+    try:
+        if tensor.requires_grad:
+            tensor = tensor.detach()
+        return array_to_thrift_struct(tensor.numpy(), name, roffset, coffset, rows, cols, format)
+    except TypeError:
+        return array_to_thrift_struct(tensor.to_dense().numpy(), name, roffset, coffset, rows, cols, format)
+
+
+def tf_sparse_to_thrift_struct(tensor, name, roffset, coffset, rows, cols, format):
     try:
         import tensorflow as tf
-        return tensor_to_thrift_struct(tf.sparse.to_dense(tf.sparse.reorder(tensor)), name, roffset, coffset, rows, cols, format)
+        return tf_to_thrift_struct(tf.sparse.to_dense(tf.sparse.reorder(tensor)), name, roffset, coffset, rows, cols, format)
     except ImportError:
         pass
 
@@ -646,10 +658,10 @@ def header_data_to_thrift_struct(rows, cols, dtypes, col_bounds, col_to_format,
 TYPE_TO_THRIFT_STRUCT_CONVERTERS = {
     "ndarray": array_to_thrift_struct,
     "recarray": array_to_thrift_struct,
-    "EagerTensor": tensor_to_thrift_struct,
-    "ResourceVariable": tensor_to_thrift_struct,
-    "SparseTensor": sparse_tensor_to_thrift_struct,
-    "Tensor": tensor_to_thrift_struct,
+    "EagerTensor": tf_to_thrift_struct,
+    "ResourceVariable": tf_to_thrift_struct,
+    "SparseTensor": tf_sparse_to_thrift_struct,
+    "Tensor": torch_to_thrift_struct,
     "DataFrame": dataframe_to_thrift_struct,
     "Series": dataframe_to_thrift_struct,
     "Dataset": dataset_to_thrift_struct,

{pydevd_pycharm-252.23892.439 → pydevd_pycharm-252.25557.35}/_pydevd_bundle/pydevd_utils.py

@@ -5,6 +5,16 @@ import os
 import signal
 import traceback
 
+try:
+    import torch
+except ImportError:
+    pass
+
+try:
+    import tensorflow as tf
+except ImportError:
+    pass
+
 import pydevd_file_utils
 
 try:
@@ -606,6 +616,24 @@ def is_pandas_container(type_qualifier, var_type, var):
 def is_numpy_container(type_qualifier, var_type, var):
     return var_type == "ndarray" and type_qualifier == "numpy" and hasattr(var, "shape")
 
+def is_pytorch_tensor(type_qualifier, var):
+    try:
+        import torch
+        return type_qualifier == "torch" and torch.is_tensor(var)
+    except ImportError:
+        return False # Can't be torch if it is not installed
+
+def is_tf_tensor(type_qualifier, var):
+    try:
+        import tensorflow as tf
+        return type_qualifier.startswith("tensorflow") and tf.is_tensor(var)
+    except ImportError:
+        return False # Can't be tensorflow if it is not installed
+
+def is_container_with_shape_dtype(type_qualifier, var_type, var):
+    return (is_numpy_container(type_qualifier, var_type, var)
+            or is_pytorch_tensor(type_qualifier, var)
+            or is_tf_tensor(type_qualifier, var))
 
 def is_builtin(x):
     return getattr(x, '__module__', None) == BUILTINS_MODULE_NAME
@@ -640,11 +668,21 @@ def is_safe_to_access(obj, attr_name):
     of attribute access in the most risk-free manner. As an example, it leverages the
     `inspect` module, facilitating attribute retrieval without triggering any
     descriptor functionality.
+
+    Note
+    ----
+    This function performs a strict check for potential side-effects, the access can be safe even if `False` is returned.
+    This might need to be checked more precisely for some special types.
     """
+
     attr = inspect.getattr_static(obj, attr_name, None)
 
+    # Filter out objects that don't contain the given attribute
+    if attr is None:
+        return False
+
     # Should we check for other descriptor types here?
-    if inspect.isgetsetdescriptor(attr):
+    if inspect.isgetsetdescriptor(attr) or isinstance(attr, property):
         return False
 
     return True

{pydevd_pycharm-252.23892.439 → pydevd_pycharm-252.25557.35}/_pydevd_bundle/pydevd_vars.py

@@ -589,17 +589,26 @@ def array_to_xml(array, name, roffset, coffset, rows, cols, format):
     return xml
 
 
-def tensor_to_xml(tensor, name, roffset, coffset, rows, cols, format):
+def tf_to_xml(tensor, name, roffset, coffset, rows, cols, format):
     try:
         return array_to_xml(tensor.numpy(), name, roffset, coffset, rows, cols, format)
     except TypeError:
         return array_to_xml(tensor.to_dense().numpy(), name, roffset, coffset, rows, cols, format)
 
 
-def sparse_tensor_to_xml(tensor, name, roffset, coffset, rows, cols, format):
+def torch_to_xml(tensor, name, roffset, coffset, rows, cols, format):
+    try:
+        if tensor.requires_grad:
+            tensor = tensor.detach()
+        return array_to_xml(tensor.numpy(), name, roffset, coffset, rows, cols, format)
+    except TypeError:
+        return array_to_xml(tensor.to_dense().numpy(), name, roffset, coffset, rows, cols, format)
+
+
+def tf_sparse_to_xml(tensor, name, roffset, coffset, rows, cols, format):
     try:
         import tensorflow as tf
-        return tensor_to_xml(tf.sparse.to_dense(tf.sparse.reorder(tensor)), name, roffset, coffset, rows, cols, format)
+        return tf_to_xml(tf.sparse.to_dense(tf.sparse.reorder(tensor)), name, roffset, coffset, rows, cols, format)
     except ImportError:
         pass
 
@@ -861,10 +870,10 @@ TYPE_TO_XML_CONVERTERS = {
     "Series": dataframe_to_xml,
     "GeoDataFrame": dataframe_to_xml,
     "GeoSeries": dataframe_to_xml,
-    "EagerTensor": tensor_to_xml,
-    "ResourceVariable": tensor_to_xml,
-    "SparseTensor": sparse_tensor_to_xml,
-    "Tensor": tensor_to_xml,
+    "EagerTensor": tf_to_xml,
+    "ResourceVariable": tf_to_xml,
+    "SparseTensor": tf_sparse_to_xml,
+    "Tensor": torch_to_xml,
     "Dataset": dataset_to_xml
 }
 

{pydevd_pycharm-252.23892.439 → pydevd_pycharm-252.25557.35}/_pydevd_bundle/pydevd_xml.py

@@ -21,7 +21,7 @@ from _pydevd_bundle.pydevd_repr_utils import get_value_repr
 from _pydevd_bundle.pydevd_user_type_renderers_utils import \
     try_get_type_renderer_for_var
 from _pydevd_bundle.pydevd_utils import is_string, should_evaluate_full_value, \
-    should_evaluate_shape
+    should_evaluate_shape, is_safe_to_access, is_container_with_shape_dtype
 
 try:
     import types
@@ -344,8 +344,7 @@ def var_to_xml(val, name, do_trim=True, additional_in_xml='', evaluate_full_valu
     # shape to xml
     xml_shape = ''
     try:
-        # if should_evaluate_shape() and is_safe_to_access(v, 'shape'):
-        if should_evaluate_shape():
+        if should_evaluate_shape() and is_container_with_shape_dtype(type_qualifier, typeName, v):
             if hasattr(v, 'shape') and not callable(v.shape):
                 xml_shape = ' shape="%s"' % make_valid_xml_value(str(tuple(v.shape)))
             elif hasattr(v, '__len__') and not is_string(v):
@@ -357,7 +356,8 @@ def var_to_xml(val, name, do_trim=True, additional_in_xml='', evaluate_full_valu
     # we use it for view as image
     xml_data_type = ''
     try:
-        if hasattr(v, 'dtype') and hasattr(v.dtype, 'name'):
+        if (is_container_with_shape_dtype(type_qualifier, typeName, v)
+                and hasattr(v.dtype, 'name')):
             xml_data_type = ' arrayElementType="%s"' % make_valid_xml_value(v.dtype.name)
     except:
         pass

{pydevd_pycharm-252.23892.439 → pydevd_pycharm-252.25557.35}/_pydevd_bundle/tables/images/pydevd_numpy_based_image.py

@@ -31,6 +31,14 @@ def create_image(arr):
                 arr_to_convert = tf.sparse.to_dense(tf.sparse.reorder(arr_to_convert))
         except ImportError:
             pass
+        try:
+            import torch
+            if isinstance(arr_to_convert, torch.Tensor):
+                if arr_to_convert.requires_grad:
+                    arr_to_convert = arr_to_convert.detach()
+                arr_to_convert = arr_to_convert.to_dense()
+        except Exception:
+            pass
 
         arr_to_convert = arr_to_convert.numpy()
         arr_to_convert = np.where(arr_to_convert == None, 0, arr_to_convert)

{pydevd_pycharm-252.23892.439 → pydevd_pycharm-252.25557.35}/_pydevd_bundle/tables/pydevd_numpy_based.py

@@ -287,6 +287,8 @@ def __create_table(command, start_index=None, end_index=None, format=None):
     try:
         import torch
         if isinstance(np_array, torch.Tensor):
+            if np_array.requires_grad:
+                np_array = np_array.detach()
             np_array = np_array.to_dense()
     except Exception:
         pass

{pydevd_pycharm-252.23892.439 → pydevd_pycharm-252.25557.35}/build_tools/build.py

@@ -109,14 +109,9 @@ def build():
 
     os.chdir(root_dir)
 
-    env = None
-    if sys.platform == 'win32':
-        # "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\vcvars64.bat"
-        # set MSSdk=1
-        # set DISTUTILS_USE_SDK=1
-        # set VS100COMNTOOLS=C:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\Tools
+    env = os.environ.copy()
 
-        env = os.environ.copy()
+    if sys.platform == 'win32':
         if sys.version_info[:2] in ((2, 7), (3, 6), (3, 7), (3, 8), (3, 9), (3, 10),
                                     (3, 11), (3, 12)):
             import setuptools  # We have to import it first for the compiler to be found.
@@ -155,59 +150,115 @@ def build():
         macos_cross_compile(additional_args, env)
     else:
         args = [
-            sys.executable,
-            os.path.join(os.path.dirname(__file__), '..', 'setup_cython.py'),
-            'build_ext',
-            '--inplace',
-        ] + additional_args
+                   sys.executable,
+                   os.path.join(os.path.dirname(__file__), '..', 'setup_cython.py'),
+                   'build_ext',
+                   '--inplace',
+               ] + additional_args
 
         print('Calling args: %s' % (args,))
-        subprocess.check_call(args, env=env,)
+        subprocess.check_call(args, env=env)
 
 
+def check_arch(filepath, expected_arch):
+    try:
+        result = subprocess.check_output(['lipo', '-info', filepath],
+                                         stderr=subprocess.STDOUT).decode()
+        if expected_arch not in result:
+            raise RuntimeError(
+                'Wrong architecture for {filepath}. '.format(filepath=filepath) +
+                'Expected {expected_arch}, got: {result}'.format(
+                    expected_arch=expected_arch, result=result)
+            )
+    except subprocess.CalledProcessError as e:
+        print('Failed to check architecture of {filepath}: {output}'.format(
+            filepath=filepath, output=e.output.decode()))
+        raise
+
 def macos_cross_compile(additional_args, env):
     # Cross-compilation for x86 and M1.
     tempdir = tempfile.mkdtemp()
-    args = [
-               sys.executable,
-               os.path.join(os.path.dirname(__file__), '..', 'setup_cython.py'),
-               'build_ext',
-               '--inplace',
-               '--build-lib=%s/lib.x86' % tempdir,
-               '--build-temp=%s/temp.x86' % tempdir,
-               '--target=x86_64-apple-macos10.12',
-           ] + additional_args
-    print('Calling args: %s' % (args,))
-    subprocess.check_call(args, env=env, )
-    args = [
-               sys.executable,
-               os.path.join(os.path.dirname(__file__), '..', 'setup_cython.py'),
-               'build_ext',
-               '--inplace',
-               '--build-lib=%s/lib.arm64' % tempdir,
-               '--build-temp=%s/temp.arm64' % tempdir,
-               '--target=arm64-apple-macos11',
-           ] + additional_args
-    print('Calling args: %s' % (args,))
-    subprocess.check_call(args, env=env, )
-    # See: https://developer.apple.com/documentation/apple-silicon/building-a-universal-macos-binary.
-    for ext_dir_x86, ext_dir_arm64 in zip(glob.glob('%s/lib.x86/*' % tempdir),
-                                          glob.glob('%s/lib.arm64/*' % tempdir)):
-        for shared_lib_x86, shared_lib_arm64 in zip(
-                glob.glob('%s/*' % ext_dir_x86), glob.glob('%s/*' % ext_dir_arm64)):
-            args = [
-                'lipo',
-                '-create',
-                '-output',
-                '%s/%s/%s' % (root_dir, os.path.basename(ext_dir_x86),
-                              os.path.basename(shared_lib_x86)),
-                shared_lib_x86,
-                shared_lib_arm64,
-            ]
-
-            print('Building universal binary: %s' % (args,))
-            subprocess.check_call(args, env=env, )
+    try:
+        # x86_64
+        x86_env = env.copy()
+        x86_env['ARCHFLAGS'] = '-arch x86_64'
+        x86_env['MACOSX_DEPLOYMENT_TARGET'] = '14.3'
+
+        args = [
+                   sys.executable,
+                   os.path.join(os.path.dirname(__file__), '..', 'setup_cython.py'),
+                   'build_ext',
+                   '--inplace',
+                   '--build-lib=%s/lib.x86' % tempdir,
+                   '--build-temp=%s/temp.x86' % tempdir,
+                   '--target=x86_64-apple-macos14.3',
+                   ] + additional_args
+        print('Calling args for x86_64: %s' % (args,))
+        subprocess.check_call(args, env=x86_env)
+
+        # arm64
+        arm_env = env.copy()
+        arm_env['ARCHFLAGS'] = '-arch arm64'
+        arm_env['MACOSX_DEPLOYMENT_TARGET'] = '14.3'
 
+        args = [
+                   sys.executable,
+                   os.path.join(os.path.dirname(__file__), '..', 'setup_cython.py'),
+                   'build_ext',
+                   '--inplace',
+                   '--build-lib=%s/lib.arm64' % tempdir,
+                   '--build-temp=%s/temp.arm64' % tempdir,
+                   '--target=arm64-apple-macos14.3',
+                   ] + additional_args
+        print('Calling args for arm64: %s' % (args,))
+        subprocess.check_call(args, env=arm_env)
+
+        def ensure_dir_exists(path):
+            if not os.path.exists(path):
+                os.makedirs(path)
+
+        for ext_dir_x86, ext_dir_arm64 in zip(glob.glob('%s/lib.x86/*' % tempdir),
+                                              glob.glob('%s/lib.arm64/*' % tempdir)):
+            for shared_lib_x86, shared_lib_arm64 in zip(
+                    glob.glob('%s/*' % ext_dir_x86), glob.glob('%s/*' % ext_dir_arm64)):
+
+                if not os.path.exists(shared_lib_x86):
+                    raise RuntimeError('x86_64 binary not found: {shared_lib_x86}'.format(shared_lib_x86=shared_lib_x86))
+                if not os.path.exists(shared_lib_arm64):
+                    raise RuntimeError('arm64 binary not found: {shared_lib_arm64}'.format(shared_lib_arm64=shared_lib_arm64))
+
+                check_arch(shared_lib_x86, 'x86_64')
+                check_arch(shared_lib_arm64, 'arm64')
+
+                output_path = '%s/%s/%s' % (root_dir, os.path.basename(ext_dir_x86),
+                                            os.path.basename(shared_lib_x86))
+
+                ensure_dir_exists(os.path.dirname(output_path))
+
+                args = [
+                    'lipo',
+                    '-create',
+                    '-output',
+                    output_path,
+                    shared_lib_x86,
+                    shared_lib_arm64,
+                ]
+
+                print('Building universal binary:')
+                print(' - Output: %s' % output_path)
+                print(' - x86_64: %s' % shared_lib_x86)
+                print(' - arm64:  %s' % shared_lib_arm64)
+
+                try:
+                    subprocess.check_call(args, env=env)
+                except subprocess.CalledProcessError as e:
+                    print('Failed to create universal binary:')
+                    print(' - Command: {0}'.format(" ".join(args)))
+                    print(' - Return code: {0}'.format(e.returncode))
+                    raise
+    finally:
+        import shutil
+        shutil.rmtree(tempdir, ignore_errors=True)
 
 if __name__ == '__main__':
     use_cython = os.getenv('PYDEVD_USE_CYTHON', None)

{pydevd_pycharm-252.23892.439 → pydevd_pycharm-252.25557.35}/pydevd.py

@@ -1824,9 +1824,9 @@ def settrace(
     @param host: the user may specify another host, if the debug server is not in the same machine (default is the local
         host)
 
-    @param stdoutToServer: when this is true, the stdout is passed to the debug server
+    @param stdout_to_server: when this is true, the stdout is passed to the debug server
 
-    @param stderrToServer: when this is true, the stderr is passed to the debug server
+    @param stderr_to_server: when this is true, the stderr is passed to the debug server
         so that they are printed in its console and not in this process console.
 
     @param port: specifies which port to use for communicating with the server (note that the server must be started

{pydevd_pycharm-252.23892.439 → pydevd_pycharm-252.25557.35}/pydevd_attach_to_process/attach_script.py

@@ -188,8 +188,8 @@ def attach(port, host, protocol="", debug_mode=""):
         pydevd.settrace(
             port=port,
             host=host,
-            stdoutToServer=True,
-            stderrToServer=True,
+            stdout_to_server=True,
+            stderr_to_server=True,
             overwrite_prev_trace=True,
             suspend=False,
             trace_only_current_thread=False,

{pydevd_pycharm-252.23892.439 → pydevd_pycharm-252.25557.35}/pydevd_file_utils.py

@@ -32,7 +32,7 @@ r'''
     @note: all the paths with breakpoints must be translated (otherwise they won't be found in the server)
 
     @note: to enable remote debugging in the target machine (pydev extensions in the eclipse installation)
-        import pydevd;pydevd.settrace(host, stdoutToServer, stderrToServer, port, suspend)
+        import pydevd;pydevd.settrace(host, stdout_to_server, stderr_to_server, port, suspend)
 
         see parameter docs on pydevd.py
 

{pydevd_pycharm-252.23892.439 → pydevd_pycharm-252.25557.35/pydevd_pycharm.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pydevd-pycharm
-Version: 252.23892.439
+Version: 252.25557.35
 Summary: PyCharm Debugger (used in PyCharm and PyDev)
 Home-page: https://github.com/JetBrains/intellij-community
 Author: JetBrains, Fabio Zadrozny and others

pydevd_pycharm-252.23892.439/VERSION

@@ -1 +0,0 @@
-252.23892.439