portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2024-09-20 17:25:37 +01:00
Code Releases Activity

Merge branch 'develop' into feature/qed-fvol

Browse Source
This commit is contained in:
Antonin Portelli 2017-01-19 14:22:36 -08:00
commit 7a327a3f28
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -9,6 +9,7 @@
################ ################
*~ *~
*# *#
*.sublime-*
# Precompiled Headers # # Precompiled Headers #
####################### #######################

8
extras/Hadrons/GeneticScheduler.hpp
View File

@ -166,7 +166,7 @@ void GeneticScheduler<T>::initPopulation(void)
{ {
auto p = graph_.topoSort(gen_); auto p = graph_.topoSort(gen_);
population_.emplace(func_(p), p); population_.insert(std::make_pair(func_(p), p));
} }
} }
@ -180,8 +180,8 @@ void GeneticScheduler<T>::doCrossover(void)
crossover(c1, c2, p1, p2); crossover(c1, c2, p1, p2);
PARALLEL_CRITICAL PARALLEL_CRITICAL
{ {
population_.emplace(func_(c1), c1); population_.insert(std::make_pair(func_(c1), c1));
population_.emplace(func_(c2), c2); population_.insert(std::make_pair(func_(c2), c2));
} }
} }
@ -200,7 +200,7 @@ void GeneticScheduler<T>::doMutation(void)
mutation(m, it->second); mutation(m, it->second);
PARALLEL_CRITICAL PARALLEL_CRITICAL
{ {
population_.emplace(func_(m), m); population_.insert(std::make_pair(func_(m), m));
} }
} }
} }

4
lib/lattice/Lattice_transfer.h
View File

@ -386,7 +386,7 @@ void InsertSlice(Lattice<vobj> &lowDim,Lattice<vobj> & higherDim,int slice, int
} }
// the above should guarantee that the operations are local // the above should guarantee that the operations are local
//PARALLEL_FOR_LOOP PARALLEL_FOR_LOOP
for(int idx=0;idx<lg->lSites();idx++){ for(int idx=0;idx<lg->lSites();idx++){
std::vector<int> lcoor(nl); std::vector<int> lcoor(nl);
std::vector<int> hcoor(nh); std::vector<int> hcoor(nh);
@ -428,7 +428,7 @@ void ExtractSlice(Lattice<vobj> &lowDim, Lattice<vobj> & higherDim,int slice, in
} }
} }
// the above should guarantee that the operations are local // the above should guarantee that the operations are local
//PARALLEL_FOR_LOOP PARALLEL_FOR_LOOP
for(int idx=0;idx<lg->lSites();idx++){ for(int idx=0;idx<lg->lSites();idx++){
std::vector<int> lcoor(nl); std::vector<int> lcoor(nl);
std::vector<int> hcoor(nh); std::vector<int> hcoor(nh);

2
tests/hadrons/Makefile.am
View File

@ -1,3 +1,3 @@
AM_LDFLAGS += -L../../extras/hadrons AM_LDFLAGS += -L../../extras/Hadrons
include Make.inc include Make.inc