Skip to content

Commit e9b0e98

Browse files
Fix CI
1 parent e4abccf commit e9b0e98

5 files changed

+14
-14
lines changed

UnitTests/test_chemistry.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def create_matrices(self):
2626
fock = rand(self.mat_dim, self.mat_dim, density=1.0)
2727
if self.is_complex:
2828
fock += 1j * rand(self.mat_dim, self.mat_dim, density=1.0)
29-
fock = fock + fock.H
29+
fock = fock + fock.getH()
3030
else:
3131
fock = fock + fock.T
3232
overlap = rand(self.mat_dim, self.mat_dim, density=1.0)
@@ -320,7 +320,7 @@ def test_wom_gc(self):
320320
we = [1.0/(1 + exp(beta*(x - mu))) for x in w]
321321

322322
if self.is_complex:
323-
DOrth = v @ diag(we) @ matrix(v).H
323+
DOrth = v @ diag(we) @ matrix(v).getH()
324324
else:
325325
DOrth = v @ diag(we) @ v.T
326326
D = ISQ.dot(DOrth).dot(ISQ)
@@ -381,7 +381,7 @@ def test_wom_c(self):
381381
while abs(trace(DOrth) - self.nel) > 1e-12:
382382
we = [1.0/(1 + exp(beta*(x - mu))) for x in w]
383383
if self.is_complex:
384-
DOrth = v @ diag(we) @ matrix(v).H
384+
DOrth = v @ diag(we) @ matrix(v).getH()
385385
else:
386386
DOrth = v @ diag(we) @ v.T
387387
D = ISQ.dot(DOrth).dot(ISQ)

UnitTests/test_matrix.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ def test_readsymmetric(self):
114114
'''Test routines to read and write matrices.'''
115115
for param in self.parameters:
116116
matrix1 = param.create_matrix(complex=self.complex, square=True)
117-
matrix1 = matrix1 + matrix1.H
117+
matrix1 = matrix1 + matrix1.getH()
118118
mmwrite(self.file1, matrix1)
119119
matrix2 = self.SMatrix(self.file1)
120120
matrix2.WriteToMatrixMarket(self.file2)
@@ -226,7 +226,7 @@ def test_multiply(self):
226226
from random import uniform
227227
for param in self.parameters:
228228
matrix1 = param.create_matrix(complex=self.complex)
229-
matrix2 = param.create_matrix(complex=self.complex).H
229+
matrix2 = param.create_matrix(complex=self.complex).getH()
230230
mmwrite(self.file1, matrix1)
231231
mmwrite(self.file2, matrix2)
232232
alpha = uniform(1.0, 2.0)
@@ -254,7 +254,7 @@ def test_multiply_nt(self):
254254
from random import uniform
255255
for param in self.parameters:
256256
matrix1 = param.create_matrix(complex=self.complex)
257-
matrix2 = param.create_matrix(complex=self.complex).H
257+
matrix2 = param.create_matrix(complex=self.complex).getH()
258258
mmwrite(self.file1, matrix1)
259259
mmwrite(self.file2, matrix2.T)
260260
alpha = uniform(1.0, 2.0)

UnitTests/test_psmatrix.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ def test_conjugatetranspose(self):
577577
matrix1 = param.create_matrix(self.complex)
578578
self.write_matrix(matrix1, self.input_file1)
579579

580-
self.CheckMat = matrix1.H
580+
self.CheckMat = matrix1.getH()
581581

582582
ntmatrix1 = nt.Matrix_ps(self.input_file1, False)
583583
ntmatrix2 = nt.Matrix_ps(ntmatrix1.GetActualDimension())

UnitTests/test_psmatrixalgebra.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ def test_asymmetry(self):
300300
else:
301301
ntmatrix1 = nt.Matrix_ps(param.rows)
302302

303-
diff = matrix1 - matrix1.H
303+
diff = matrix1 - matrix1.getH()
304304
ref = norm(diff.todense(), ord=inf)
305305
comp = ntmatrix1.MeasureAsymmetry()
306306
comm.barrier()
@@ -320,7 +320,7 @@ def test_symmetrize(self):
320320
else:
321321
ntmatrix1 = nt.Matrix_ps(param.rows)
322322

323-
self.CheckMat = 0.5 * (matrix1 + matrix1.H)
323+
self.CheckMat = 0.5 * (matrix1 + matrix1.getH())
324324
ntmatrix1 = nt.Matrix_ps(self.input_file1, False)
325325
ntmatrix1.Symmetrize()
326326
ntmatrix1.WriteToMatrixMarket(self.result_file)

UnitTests/test_solvers.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,7 @@ def test_hornerfunction(self):
663663
val[i] = 0
664664
for j in range(0, len(coef)):
665665
val[i] = val[i] + coef[j] * (temp**j)
666-
temp_poly = dot(dot(vec, diag(val)), vec.H)
666+
temp_poly = dot(dot(vec, diag(val)), vec.getH())
667667
self.CheckMat = csr_matrix(temp_poly)
668668

669669
# Result Matrix
@@ -702,7 +702,7 @@ def test_patersonstockmeyerfunction(self):
702702
val[i] = 0
703703
for j in range(0, len(coef)):
704704
val[i] = val[i] + coef[j] * (temp**j)
705-
temp_poly = dot(dot(vec, diag(val)), vec.H)
705+
temp_poly = dot(dot(vec, diag(val)), vec.getH())
706706
self.CheckMat = csr_matrix(temp_poly)
707707

708708
# Result Matrix
@@ -1189,16 +1189,16 @@ def create_matrix(self, SPD=None, scaled=None, diag_dom=None, rank=None,
11891189
from numpy import diag
11901190
mat = rand(self.mat_dim, self.mat_dim, density=1.0)
11911191
mat += 1j * rand(self.mat_dim, self.mat_dim, density=1.0)
1192-
mat = mat + mat.H
1192+
mat = mat + mat.getH()
11931193
if SPD:
1194-
mat = mat.H.dot(mat)
1194+
mat = mat.getH().dot(mat)
11951195
if diag_dom:
11961196
identity_matrix = identity(self.mat_dim)
11971197
mat = mat + identity_matrix * self.mat_dim
11981198
if scaled:
11991199
mat = (1.0 / self.mat_dim) * mat
12001200
if rank:
1201-
mat = mat[rank:].dot(mat[rank:].H)
1201+
mat = mat[rank:].dot(mat[rank:].getH())
12021202
if add_gap:
12031203
w, v = eigh(mat.todense())
12041204
gap = (w[-1] - w[0]) / 2.0

0 commit comments

Comments
 (0)