Skip to content
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

Indicate dynamic #5

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Indicate dynamic #5

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ef5b47
indicate if Matrix is dynamic or not
bjodah Jan 27, 2022
a6cb3f6
Avoid allocating numpy array when rows / cols contains garbage
bjodah Dec 1, 2023
00bb6f5
Silence warnings
bjodah Dec 1, 2023
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
21 changes: 16 additions & 5 deletions eigengdb/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,22 +86,26 @@ def __init__(self, variety, val):
type = type.target()
self.type = type.unqualified().strip_typedefs()
tag = self.type.tag
regex = re.compile('\<.*\>')
regex = re.compile(r'\<.*\>')
m = regex.findall(tag)[0][1:-1]
template_params = m.split(',')
template_params = [x.replace(" ", "") for x in template_params]

if template_params[1] == '-0x00000000000000001' or template_params[
1] == '-0x000000001' or template_params[1] == '-1':
self.rows = val['m_storage']['m_rows']
self.dynamic_rows = True
else:
self.rows = int(template_params[1])
self.dynamic_rows = False

if template_params[2] == '-0x00000000000000001' or template_params[
2] == '-0x000000001' or template_params[2] == '-1':
self.cols = val['m_storage']['m_cols']
self.dynamic_cols = True
else:
self.cols = int(template_params[2])
self.dynamic_cols = False

self.options = 0 # default value
if len(template_params) > 3:
Expand Down Expand Up @@ -139,6 +143,15 @@ def __next__(self):
return ('[%d,%d]' % (row, col), item)

def to_string(self):
# handle uninitialized memory:
if self.rows < 0 or self.cols < 0 or self.rows > 1<<30 or self.cols > 1<<30 or self.rows*self.cols > 1<<33:
return f"Eigen::{self.variety}<{self.innerType},{'D' if self.dynamic_rows else ''}{':invalid:' if self.rows < 0 else self.rows},{'D' if self.dynamic_cols else ''}{':invalid:' if self.cols < 0 else self.cols},{'r' if self.rowMajor else 'c'}maj> (data ptr: {self.data})\n"

# let's not allocate more than 8 MiB for our debug printing ndarray...
if self.rows > 1<<20 or self.cols > 1<<20 or self.rows*self.cols > 1<<20:
return f"Eigen::{self.variety}<{self.innerType},{'D' if self.dynamic_rows else ''}{self.rows},{'D' if self.dynamic_cols else ''}{self.cols},{'r' if self.rowMajor else 'c'}maj> (data ptr: {self.data})\n"


mat = np.zeros((self.rows, self.cols), dtype=np.float64)
for row in range(self.rows):
for col in range(self.cols):
Expand All @@ -165,9 +178,7 @@ def to_string(self):
pass
mat[row, col] = float(item)

return "Eigen::%s<%s,%d,%d,%s> (data ptr: %s)\n%s\n" % (
self.variety, self.innerType, self.rows, self.cols,
"RowMajor" if self.rowMajor else "ColMajor", self.data, mat)
return f"Eigen::{self.variety}<{self.innerType},{'D' if self.dynamic_rows else ''}{self.rows},{self.cols},{'r' if self.rowMajor else 'c'}maj> (data ptr: {self.data})\n{mat}\n"


class EigenSparseMatrixPrinter:
Expand All @@ -181,7 +192,7 @@ def __init__(self, val):
type = type.target()
self.type = type.unqualified().strip_typedefs()
tag = self.type.tag
regex = re.compile('\<.*\>')
regex = re.compile(r'\<.*\>')
m = regex.findall(tag)[0][1:-1]
template_params = m.split(',')
template_params = [x.replace(" ", "") for x in template_params]
Expand Down