clean up

sunqm · Jun 20, 2024 · 58ab5b6 · 58ab5b6
1 parent f075db6
commit 58ab5b6
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/pyscf/lib/linalg_helper.py b/pyscf/lib/linalg_helper.py
@@ -33,13 +33,8 @@
 
 SAFE_EIGH_LINDEP = getattr(__config__, 'lib_linalg_helper_safe_eigh_lindep', 1e-15)
 DAVIDSON_LINDEP = getattr(__config__, 'lib_linalg_helper_davidson_lindep', 1e-14)
-<<<<<<< HEAD
 DSOLVE_LINDEP = getattr(__config__, 'lib_linalg_helper_dsolve_lindep', 1e-13)
-MAX_MEMORY = getattr(__config__, 'lib_linalg_helper_davidson_max_memory', 2000)  # 2GB
-=======
-DSOLVE_LINDEP = getattr(__config__, 'lib_linalg_helper_dsolve_lindep', 1e-15)
 MAX_MEMORY = getattr(__config__, 'lib_linalg_helper_davidson_max_memory', 4000)  # 4GB
->>>>>>> Update krylov solver
 
 # sort by similarity has problem which flips the ordering of eigenvalues when
 # the initial guess is closed to excited state.  In this situation, function