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.

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

Add delayed update #242

Merged
merged 33 commits into from
Jun 12, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
aa27277
Add DiracDeterminant from QMCPACK.
ye-luo May 18, 2019
58c0633
Now the code compiles.
ye-luo Jun 4, 2019
a551369
Add unit tests
ye-luo Jun 4, 2019
8078aba
Format codes.
ye-luo Jun 4, 2019
b18e180
Fix SPO size
ye-luo Jun 4, 2019
f4fa4c3
Minor fix. still buggy.
ye-luo Jun 4, 2019
907401f
Make all timers as pointers.
ye-luo Jun 4, 2019
aa0841d
Connect SPO to Det
ye-luo Jun 4, 2019
5a4b0e3
Add delay rank arguments.
ye-luo Jun 4, 2019
eaca306
Fix check_spo
ye-luo Jun 5, 2019
5d0d3e6
Merge branch 'develop' into add-delayed-update
ye-luo Jun 5, 2019
f0ef52b
Add DiracDeterminantRef and add check_wfc
ye-luo Jun 5, 2019
c4f316a
Remove old Determinant
ye-luo Jun 5, 2019
d30ef2e
Remove redundant calculation
ye-luo Jun 5, 2019
2b3d2c2
Add completeUpdates to completeUpdates.
ye-luo Jun 5, 2019
0dd50dc
Add timer.
ye-luo Jun 5, 2019
f686020
Fix batching interface in SPOSet
ye-luo Jun 5, 2019
4639a3e
Fixing timers
ye-luo Jun 5, 2019
87dbf1a
Clean up interface
ye-luo Jun 6, 2019
0534126
Add a few more multi_ function in DiracDeterminant
ye-luo Jun 6, 2019
ecc8035
Use only xx of hess, mimic laplacian.
ye-luo Jun 6, 2019
4d869f6
Replace CI check.
ye-luo Jun 6, 2019
bf65c0d
Merge branch 'develop' into add-delayed-update
ye-luo Jun 6, 2019
bb0a45b
Merge branch 'develop' into add-delayed-update
PDoakORNL Jun 7, 2019
862c4e5
A bit update.
ye-luo Jun 7, 2019
44d2525
Change check_wfc G and L checks to relative errors.
ye-luo Jun 7, 2019
f21e626
Use relative error check on Det only
ye-luo Jun 8, 2019
ce4e53c
Correct script.
ye-luo Jun 10, 2019
b90bab6
Change DU rank option to -k.
ye-luo Jun 10, 2019
43a3da8
Adjust omp runtime calls.
ye-luo Jun 10, 2019
6f81ef3
Merge branch 'develop' into add-delayed-update
PDoakORNL Jun 11, 2019
7a1ae9d
Move LAPACK wrapper to OhmmsBlas.h
ye-luo Jun 12, 2019
9afab34
Minor clean up
ye-luo Jun 12, 2019
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
2 changes: 2 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -178,4 +178,6 @@ ENDIF()

SUBDIRS(Particle/tests)

SUBDIRS(QMCWaveFunctions)

SUBDIRS(Drivers)
35 changes: 13 additions & 22 deletions src/Drivers/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,29 +1,20 @@
if(QMC_BUILD_LEVEL GREATER 4)
# add apps XYZ.cpp, e.g., qmc_particles.cpp
#SET(ESTEST einspline_smp einspline_spo qmc_particles moveonsphere twobody ptclset)
SET(ESTEST check_wfc check_spo check_determinant)

FOREACH(p ${ESTEST})
ADD_EXECUTABLE( ${p} ${p}.cpp)
TARGET_LINK_LIBRARIES(${p} qmcbase qmcutil ${QMC_UTIL_LIBS} ${MPI_LIBRARY})
ENDFOREACH(p ${ESTEST})

ADD_LIBRARY(miniwfs ../QMCWaveFunctions/WaveFunction.cpp ../QMCWaveFunctions/SPOSet_builder.cpp)

SET(DRIVERS miniqmc miniqmc_sync_move)
#//////////////////////////////////////////////////////////////////////////////////////
#// This file is distributed under the University of Illinois/NCSA Open Source License.
#// See LICENSE file in top directory for details.
#//
#// Copyright (c) 2019 QMCPACK developers.
#//
#// File developed by: Ye Luo, [email protected], Argonne National Laboratory
#//
#// File created by: Ye Luo, [email protected], Argonne National Laboratory
#//////////////////////////////////////////////////////////////////////////////////////

SET(DRIVERS check_spo check_wfc miniqmc miniqmc_sync_move)

FOREACH(p ${DRIVERS})
ADD_EXECUTABLE( ${p} ${p}.cpp)
TARGET_LINK_LIBRARIES(${p} miniwfs qmcbase qmcutil ${QMC_UTIL_LIBS} ${MPI_LIBRARY})
TARGET_LINK_LIBRARIES(${p} qmcwfs qmcbase qmcutil ${QMC_UTIL_LIBS} ${MPI_LIBRARY})
ENDFOREACH(p ${ESTEST})

endif()

SUBDIRS(tests)

#SET(boost_test exchange_walker)
#FOREACH(p ${boost_test})
# ADD_EXECUTABLE( ${p} ${p}.cpp)
# TARGET_LINK_LIBRARIES(${p} qmcbase qmcutil ${QMC_UTIL_LIBS} boost ${MPI_LIBRARY})
#ENDFOREACH(p ${boost_test})

221 changes: 0 additions & 221 deletions src/Drivers/check_determinant.cpp

This file was deleted.

16 changes: 9 additions & 7 deletions src/Drivers/check_spo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,9 @@ int main(int argc, char** argv)
// VMC
for (int iel = 0; iel < nels; ++iel)
{
PosType pos = els.R[iel] + delta[iel];
spo.evaluate_vgh(pos);
spo_ref.evaluate_vgh(pos);
els.makeMove(iel, delta[iel]);
spo.evaluate_vgh(els, iel);
spo_ref.evaluate_vgh(els, iel);
// accumulate error
for (int ib = 0; ib < spo.nBlocks; ib++)
for (int n = 0; n < spo.nSplinesPerBlock; n++)
Expand All @@ -272,7 +272,7 @@ int main(int argc, char** argv)
}
if (ur[iel] < accept)
{
els.R[iel] = pos;
els.acceptMove(iel);
my_accepted++;
}
}
Expand All @@ -288,11 +288,13 @@ int main(int argc, char** argv)

for (int nn = 0; nn < nnF; ++nn)
{
int iel = nn + iat * zval;
for (int k = 0; k < nknots; k++)
{
PosType pos = centerP + r * rOnSphere[k];
spo.evaluate_v(pos);
spo_ref.evaluate_v(pos);
PosType delta_qp = centerP + r * rOnSphere[k] - els.R[iel];
els.makeMove(iel, delta_qp);
spo.evaluate_v(els, iel);
spo_ref.evaluate_v(els, iel);
// accumulate error
for (int ib = 0; ib < spo.nBlocks; ib++)
for (int n = 0; n < spo.nSplinesPerBlock; n++)
Expand Down
Loading