ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use platform::cputtime()

Browse Source
This commit is contained in:
Axel Kohlmeyer
2021-10-05 22:31:06 -04:00
parent 087c1b3a65
commit cc2d23de21
2 changed files with 6 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/info.cpp
View File

@ -636,23 +636,7 @@ void Info::command(int narg, char **arg)
if (flags & TIME) { if (flags & TIME) {
double wallclock = MPI_Wtime() - lmp->initclock; double wallclock = MPI_Wtime() - lmp->initclock;
double cpuclock = 0.0; double cpuclock = platform::cputime();
#if defined(_WIN32)
// from MSD docs.
FILETIME ct,et,kt,ut;
union { FILETIME ft; uint64_t ui; } cpu;
if (GetProcessTimes(GetCurrentProcess(),&ct,&et,&kt,&ut)) {
cpu.ft = ut;
cpuclock = cpu.ui * 0.0000001;
}
#else /* POSIX */
struct rusage ru;
if (getrusage(RUSAGE_SELF, &ru) == 0) {
cpuclock = (double) ru.ru_utime.tv_sec;
cpuclock += (double) ru.ru_utime.tv_usec * 0.000001;
}
#endif /* ! _WIN32 */
int cpuh,cpum,cpus,wallh,wallm,walls; int cpuh,cpum,cpus,wallh,wallm,walls;
cpus = fmod(cpuclock,60.0); cpus = fmod(cpuclock,60.0);

52
src/timer.cpp
View File

@ -20,50 +20,8 @@
#include <cstring> #include <cstring>
#ifdef _WIN32
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <cstdint>
#else
#include <sys/time.h>
#include <sys/resource.h>
#endif
using namespace LAMMPS_NS; using namespace LAMMPS_NS;
// Return the CPU time for the current process in seconds very
// much in the same way as MPI_Wtime() returns the wall time.
static double CPU_Time()
{
double rv = 0.0;
#ifdef _WIN32
// from MSD docs.
FILETIME ct,et,kt,ut;
union { FILETIME ft; uint64_t ui; } cpu;
if (GetProcessTimes(GetCurrentProcess(),&ct,&et,&kt,&ut)) {
cpu.ft = ut;
rv = cpu.ui * 0.0000001;
}
#else /* ! _WIN32 */
struct rusage ru;
if (getrusage(RUSAGE_SELF, &ru) == 0) {
rv = (double) ru.ru_utime.tv_sec;
rv += (double) ru.ru_utime.tv_usec * 0.000001;
}
#endif /* ! _WIN32 */
return rv;
}
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
Timer::Timer(LAMMPS *lmp) : Pointers(lmp) Timer::Timer(LAMMPS *lmp) : Pointers(lmp)
@ -93,7 +51,7 @@ void Timer::_stamp(enum ttype which)
{ {
double current_cpu=0.0, current_wall=0.0; double current_cpu=0.0, current_wall=0.0;
if (_level > NORMAL) current_cpu = CPU_Time(); if (_level > NORMAL) current_cpu = platform::cputime();
current_wall = MPI_Wtime(); current_wall = MPI_Wtime();
if ((which > TOTAL) && (which < NUM_TIMER)) { if ((which > TOTAL) && (which < NUM_TIMER)) {
@ -117,7 +75,7 @@ void Timer::_stamp(enum ttype which)
if (_sync) { if (_sync) {
MPI_Barrier(world); MPI_Barrier(world);
if (_level > NORMAL) current_cpu = CPU_Time(); if (_level > NORMAL) current_cpu = platform::cputime();
current_wall = MPI_Wtime(); current_wall = MPI_Wtime();
cpu_array[SYNC] += current_cpu - previous_cpu; cpu_array[SYNC] += current_cpu - previous_cpu;
@ -137,7 +95,7 @@ void Timer::barrier_start()
if (_level < LOOP) return; if (_level < LOOP) return;
current_cpu = CPU_Time(); current_cpu = platform::cputime();
current_wall = MPI_Wtime(); current_wall = MPI_Wtime();
cpu_array[TOTAL] = current_cpu; cpu_array[TOTAL] = current_cpu;
@ -156,7 +114,7 @@ void Timer::barrier_stop()
if (_level < LOOP) return; if (_level < LOOP) return;
current_cpu = CPU_Time(); current_cpu = platform::cputime();
current_wall = MPI_Wtime(); current_wall = MPI_Wtime();
cpu_array[TOTAL] = current_cpu - cpu_array[TOTAL]; cpu_array[TOTAL] = current_cpu - cpu_array[TOTAL];
@ -167,7 +125,7 @@ void Timer::barrier_stop()
double Timer::cpu(enum ttype which) double Timer::cpu(enum ttype which)
{ {
double current_cpu = CPU_Time(); double current_cpu = platform::cputime();
return (current_cpu - cpu_array[which]); return (current_cpu - cpu_array[which]);
} }