X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/d09f5f0aeff338a0262c3faf5272b82945a3bf8f..07516f0b1615a95f3e68d073adf4cfda584b99fa:/o815/o815.cpp?ds=inline diff --git a/o815/o815.cpp b/o815/o815.cpp index 3fe43c8..648dbb3 100644 --- a/o815/o815.cpp +++ b/o815/o815.cpp @@ -2,6 +2,11 @@ #include #include +#include + +#ifndef MPI_DISABLED +#include +#endif #include "latlib/progress.h" @@ -22,22 +27,29 @@ o815::o815(int argc, char **argv, const string& _programid, comoption specOps[], comargs.outdir=""; comargs.idonly = false; comargs.showjobnum = false; - + comargs.startconfig = ""; + +#ifndef MPI_DISABLED MPI_Init(&argc, &argv); MPI_Comm_size(MPI_COMM_WORLD, &numprocs); MPI_Comm_rank(MPI_COMM_WORLD, &rank); - - addComOption("lsize", required_argument, NULL, 'L', "define lattice size", "xsize:tsize"); - addComOption("nmeas", required_argument, NULL, 'N', "set number of measurements", "nmeas"); - addComOption("skip", required_argument, NULL, 'S', "set number of skips between configs", "nskip"); - addComOption("nequi", required_argument, NULL, 'E', "set number of equilibrations", "nequi"); - addComOption("oro", required_argument, NULL, 'o', "read-only observable-store directory", "dir"); - addComOption("orw", required_argument, NULL, 'O', "read-write observable-store directory", "dir"); - addComOption("cro", required_argument, NULL, 'c', "read-only config-store directory", "dir"); - addComOption("crw", required_argument, NULL, 'C', "read-write config-store directory", "dir"); - addComOption("write", required_argument, NULL, 'w', "data writeout directory", "dir"); - addComOption("idonly", no_argument, &comargs.idonly, 'i', "show output-id only", ""); - addComOption("jobnum", no_argument, &comargs.showjobnum, 'j', "show jobnumber only", ""); +#else + numprocs = 1; + rank = 0; +#endif + + addComOption("lsize", required_argument, NULL, 'L', "define lattice size", "xsize:tsize"); + addComOption("nmeas", required_argument, NULL, 'N', "set number of measurements", "nmeas"); + addComOption("skip", required_argument, NULL, 'S', "set number of skips between configs", "nskip"); + addComOption("nequi", required_argument, NULL, 'E', "set number of equilibrations", "nequi"); + addComOption("ocache", required_argument, NULL, 'O', "set observable cache (mode=oo|ro|wo|rw)", "dir:mode"); + addComOption("ccache", required_argument, NULL, 'C', "set config cache (mode=oo|ro|wo|rw)", "dir:mode"); + addComOption("write", required_argument, NULL, 'W', "data writeout directory", "dir"); + addComOption("idonly", no_argument, &comargs.idonly, 'I', "show output-id only", ""); + addComOption("jobnum", no_argument, &comargs.showjobnum, 'J', "show jobnumber only", ""); + addComOption("startconfig", required_argument, NULL, 'X', "read start config from file", "startconfigfile"); + + vector::iterator lastO815Opt = comOptions.end()-1; if (specOps != NULL) for (int ispecop = 0; specOps[ispecop].name != ""; ispecop++) @@ -51,7 +63,7 @@ o815::o815(int argc, char **argv, const string& _programid, comoption specOps[], if (helpHeader != NULL) helpHeader(); - cout << "Options:" << endl; + cout << "General options:" << endl; for (vector::iterator opit = comOptions.begin(); opit != comOptions.end(); ++opit) { stringstream combinedLong; @@ -82,6 +94,11 @@ o815::o815(int argc, char **argv, const string& _programid, comoption specOps[], cout << "\t" << opit->optdesc; cout << endl; + + if ( opit == lastO815Opt && (opit+1) != comOptions.end() ) { + cout << endl; + cout << "Simulation specific options:" << endl; + } } exit(0); } @@ -96,7 +113,7 @@ void o815::postParaInit() { long timestamp; if(comargs.idonly) { - cout << programid << headMaster() << endl << flush; + cout << programid << headMaster(true) << endl << flush; exit(0); } @@ -108,20 +125,15 @@ void o815::postParaInit() { exit(0); } - if(rank==0) { - timestamp = time(NULL); - for(int idest=1; idest0) - MPI_Recv(×tamp, 1, MPI_LONG, 0, 123, MPI_COMM_WORLD, &mpiStatus); - - out = new writeout(comargs.outdir, programid+headMaster(), rank, numprocs, timestamp); + out = new writeout(comargs.outdir, programid+headMaster(true), rank, numprocs); } void o815::mainLoop() { *out->log << "OBS: Starting main loop." << endl; + if ( observables.size() == 0 ) + *out->log << "O815: Running in 0-observable-mode." << endl; + for (vector::iterator obsit = observables.begin(); obsit != observables.end(); ++obsit) (*obsit)->start(); @@ -132,6 +144,8 @@ void o815::mainLoop() { *out->log << ">" << endl << flush; Sim->_newParas(); + + Sim->resetConfig(); progress measProg(comargs.nmeas); @@ -142,6 +156,7 @@ void o815::mainLoop() { for( int imeas=0; imeas::iterator obsit = observables.begin(); obsit != observables.end(); ++obsit) { bool readnewObs; int nequileftNewObs; @@ -158,9 +173,12 @@ void o815::mainLoop() { } (*obsit)->meas(false, imeas); hypercache::writeO( (*obsit)->ocid ); - } - + } } + + if ( observables.size() == 0 ) + Sim->nextConfig(); + while( measProg.madeStep(imeas) ) *out->log << "O815: " << measProg.done()*100 << "% of measurements done." << endl << flush; } @@ -213,25 +231,18 @@ void o815::parseArgs(int argc, char **argv, comoption specOps[]) { case 'E': comargs.nequi = atoi(optarg); break; - case 'o': - comargs.obscache.first = optarg; - comargs.obscache.second = 1; - break; case 'O': - comargs.obscache.first = optarg; - comargs.obscache.second = 2; - break; - case 'c': - comargs.confcache.first = optarg; - comargs.confcache.second = 1; + readCacheArgs(optarg, comargs.obscache.first, comargs.obscache.second); break; case 'C': - comargs.confcache.first = optarg; - comargs.confcache.second = 2; + readCacheArgs(optarg, comargs.confcache.first, comargs.confcache.second); break; - case 'w': + case 'W': comargs.outdir = optarg; break; + case 'X': + comargs.startconfig = optarg; + break; default: if ( opt != 0) { comoption* thisop = getOptionByVal(opt); @@ -270,25 +281,33 @@ void o815::listArg(int *target, int tlen, char *listarg) { } } -string o815::headMaster() +string o815::headMaster(bool hashedrange) { stringstream hm; - hm << "-L" << comargs.lsize[0] << "_" << comargs.lsize[1] << "-E" << comargs.nequi << "-S" << comargs.nskip << "-N" << comargs.nmeas - << paraQ->rangeString(); + hm << "_L" << comargs.lsize[0] << "x" << comargs.lsize[1] << "_E" << comargs.nequi << "_S" << comargs.nskip << "_N" << comargs.nmeas; + + if( ! hashedrange ) + hm << paraQ->rangeString(); + else + hm << "_" << hash( paraQ->rangeString() ); return hm.str(); } o815::~o815() { if(comargs.outdir=="") { +#ifndef MPI_DISABLED MPI_Barrier(MPI_COMM_WORLD); +#endif if(rank==0) cout << "#end" << endl << flush; } hypercache::finalize(); delete out; +#ifndef MPI_DISABLED MPI_Finalize(); +#endif } int o815::nextParas() @@ -306,3 +325,37 @@ void o815::addPara(const string& paraid, const double& paraDefault) { hypercache::addPara(paraid); paraQ->setDefault(paraid, paraDefault); } + +void o815::readCacheArgs(const string& arg, string& cachedir, int& cachemode) +{ + if ( arg.rfind(":") == string::npos ) { + cerr << "O815: Invalid cache argument!" << endl; + exit(1); + } + + string arg_mode = arg.substr( arg.rfind(":")+1 ); + if ( arg_mode == "oo" ) + cachemode = CACHE_MODE_OO; + else if ( arg_mode == "ro" ) + cachemode = CACHE_MODE_RO; + else if ( arg_mode == "wo" ) + cachemode = CACHE_MODE_WO; + else if ( arg_mode == "rw" ) + cachemode = CACHE_MODE_RW; + else { + cerr << "O815: Unknown cache mode " << arg_mode << "!" << endl; + exit(1); + } + + cachedir = arg.substr( 0, arg.rfind(":") ); +} + +unsigned long o815::hash(const string& str) +{ + unsigned long hash = 5381; + + for(string::const_iterator it=str.begin();it!=str.end();it++) + hash = ((hash << 5) + hash) + *it; /* hash * 33 + character */ + + return hash; +}