Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Update python verions #13574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
robbiemu wants to merge 20 commits into
base: master
Choose a base branch
from
+20 −17
Open

Update python verions #13574

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
91b5d14
Updates Python and torch versions
robbiemu May 15, 2025
c99863b
Updates torchvision dependency
robbiemu May 15, 2025
ef77f28
Updates NumPy dependency to version 2.1 or higher
robbiemu May 15, 2025
c278aff
pyright-based changes for tools/mtmd/legacy-models/convert_image_enc…
robbiemu May 16, 2025
a6ab097
Fixes type annotation for numpy arrays
robbiemu May 16, 2025
eb7cef1
Updates type hints for numpy compatibility
robbiemu May 16, 2025
150f157
Better fix than earlier for quants.py
robbiemu May 16, 2025
822c83c
Several types in numpy 2.2+ are defined as typeAliases with no underl…
robbiemu May 16, 2025
4cfda13
revert change from NDArray in this file
robbiemu May 19, 2025
2f3854c
Updates pyright configuration
robbiemu May 19, 2025
eb6499c
Revert tools/mtmd/ to match master
robbiemu May 19, 2025
ba079d3
Revert "Revert tools/mtmd/ to match master"
robbiemu May 19, 2025
1434730
reverting change to legacy-models script
robbiemu May 19, 2025
afd66e9
Excludes legacy models from type checking
robbiemu May 19, 2025
6ee8253
Configures pyright to ignore invalid type forms
robbiemu May 19, 2025
d49b004
Uses `np.dtype` for NumPy type hints in GGUF reader
robbiemu May 19, 2025
a5c74dd
reverting removal of DTypeLike changes
robbiemu May 19, 2025
3400755
Fixes byteorder check and removes unrequested exclusion tests
robbiemu May 19, 2025
4802d01
reverting unnecessary changes in gguf-py/gguf as of numpy 2.2.6
robbiemu May 20, 2025
0570f17
pyrightconfig.json
robbiemu May 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Configures pyright to ignore invalid type forms 
Temporarily disables `reportInvalidTypeForm` in pyright configuration due to ongoing transition to the new type system in numpy 2.2.x.
  • Loading branch information
@robbiemu
robbiemu committed May 19, 2025
commit 6ee825381b5cdecedb42d4ca5b43d1cf4d09f2c1
2 changes: 0 additions & 2 deletions gguf-py/gguf/gguf_reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# pyright: reportInvalidTypeForm=false
#
# GGUF file reading/modification support. For API usage information,
# please see the files scripts/ for some fairly simple examples.
#
Expand Down Expand Up @@ -136,12 +134,12 @@
offs = 0

# Check for GGUF magic
if self._get(offs, np.uint32, override_order = '<')[0] != GGUF_MAGIC:

Check failure on line 137 in gguf-py/gguf/gguf_reader.py

View workflow job for this annotation

GitHub Actions / pyright type-check 

Argument of type "uint32" cannot be assigned to parameter "dtype" of type "dtype[Any]" in function "_get"
  "type[type]" is not assignable to "type[dtype[Any]]" (reportArgumentType)
raise ValueError('GGUF magic invalid')
offs += 4

# Check GGUF version
temp_version = self._get(offs, np.uint32)

Check failure on line 142 in gguf-py/gguf/gguf_reader.py

View workflow job for this annotation

GitHub Actions / pyright type-check 

Argument of type "uint32" cannot be assigned to parameter "dtype" of type "dtype[Any]" in function "_get"
  "type[type]" is not assignable to "type[dtype[Any]]" (reportArgumentType)
if temp_version[0] & 65535 == 0:
# If we get 0 here that means it's (probably) a GGUF file created for
# the opposite byte order of the machine this script is running on.
Expand All @@ -164,7 +162,7 @@
offs += self._push_field(ReaderField(offs, 'GGUF.version', [temp_version], [0], [GGUFValueType.UINT32]))

# Check tensor count and kv count
temp_counts = self._get(offs, np.uint64, 2)

Check failure on line 165 in gguf-py/gguf/gguf_reader.py

View workflow job for this annotation

GitHub Actions / pyright type-check 

Argument of type "uint64" cannot be assigned to parameter "dtype" of type "dtype[Any]" in function "_get"
  "type[type]" is not assignable to "type[dtype[Any]]" (reportArgumentType)
offs += self._push_field(ReaderField(offs, 'GGUF.tensor_count', [temp_counts[:1]], [0], [GGUFValueType.UINT64]))
offs += self._push_field(ReaderField(offs, 'GGUF.kv_count', [temp_counts[1:]], [0], [GGUFValueType.UINT64]))
tensor_count, kv_count = temp_counts
Expand Down Expand Up @@ -214,8 +212,8 @@
return 0 if skip_sum else sum(int(part.nbytes) for part in field.parts)

def _get_str(self, offset: int) -> tuple[npt.NDArray[np.uint64], npt.NDArray[np.uint8]]:
slen = self._get(offset, np.uint64)

Check failure on line 215 in gguf-py/gguf/gguf_reader.py

View workflow job for this annotation

GitHub Actions / pyright type-check 

Argument of type "uint64" cannot be assigned to parameter "dtype" of type "dtype[Any]" in function "_get"
  "type[type]" is not assignable to "type[dtype[Any]]" (reportArgumentType)
return slen, self._get(offset + 8, np.uint8, slen[0].item())

Check failure on line 216 in gguf-py/gguf/gguf_reader.py

View workflow job for this annotation

GitHub Actions / pyright type-check 

Argument of type "uint8" cannot be assigned to parameter "dtype" of type "dtype[Any]" in function "_get"
  "type[type]" is not assignable to "type[dtype[Any]]" (reportArgumentType)

def _get_field_parts(
self, orig_offs: int, raw_type: int,
Expand All @@ -236,9 +234,9 @@
return int(val.nbytes), [val], [0], types
# Handle arrays.
if gtype == GGUFValueType.ARRAY:
raw_itype = self._get(offs, np.uint32)

Check failure on line 237 in gguf-py/gguf/gguf_reader.py

View workflow job for this annotation

GitHub Actions / pyright type-check 

Argument of type "uint32" cannot be assigned to parameter "dtype" of type "dtype[Any]" in function "_get"
  "type[type]" is not assignable to "type[dtype[Any]]" (reportArgumentType)
offs += int(raw_itype.nbytes)
alen = self._get(offs, np.uint64)

Check failure on line 239 in gguf-py/gguf/gguf_reader.py

View workflow job for this annotation

GitHub Actions / pyright type-check 

Argument of type "uint64" cannot be assigned to parameter "dtype" of type "dtype[Any]" in function "_get"
  "type[type]" is not assignable to "type[dtype[Any]]" (reportArgumentType)
offs += int(alen.nbytes)
aparts: list[npt.NDArray[Any]] = [raw_itype, alen]
data_idxs: list[int] = []
Expand All @@ -263,7 +261,7 @@
offs += int(name_len.nbytes + name_data.nbytes)

# Get Tensor Dimensions Count
n_dims = self._get(offs, np.uint32)

Check failure on line 264 in gguf-py/gguf/gguf_reader.py

View workflow job for this annotation

GitHub Actions / pyright type-check 

Argument of type "uint32" cannot be assigned to parameter "dtype" of type "dtype[Any]" in function "_get"
  "type[type]" is not assignable to "type[dtype[Any]]" (reportArgumentType)
offs += int(n_dims.nbytes)

# Get Tensor Dimension Array
Expand Down
1 change: 1 addition & 0 deletions pyrightconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"extraPaths": ["gguf-py"],
"pythonVersion": "3.10",
"pythonPlatform": "All",
"reportInvalidTypeForm": false, // TODO: remove once numpy 2.2.x resolves the transition to their new type system
"reportUnusedImport": "warning",
"reportDuplicateImport": "error",
"reportDeprecated": "warning",
Expand Down
Loading