nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 16:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fast Kmeans on Windows

Browse Source 
.. remove unused general functions that work with memory and time
   in a non-portable way.
This commit is contained in:
Mark Liversedge
2021-09-28 11:35:32 +01:00
parent 1dc1cd678f
commit 5fb2dfb73e
2 changed files with 0 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
contrib/kmeans/kmeans_general_functions.cpp
View File

@@ -238,32 +238,6 @@ Dataset *init_centers_kmeanspp_v2(Dataset const &x, unsigned short k) {
}
/**
* in MB
*/
double getMemoryUsage() {
char buf[30];
snprintf(buf, 30, "/proc/%u/statm", (unsigned)getpid());
FILE* pf = fopen(buf, "r");
unsigned int totalProgramSizeInPages = 0;
unsigned int residentSetSizeInPages = 0;
if (pf) {
int numScanned = fscanf(pf, "%u %u" /* %u %u %u %u %u"*/, &totalProgramSizeInPages, &residentSetSizeInPages);
if (numScanned != 2) {
return 0.0;
}
}
fclose(pf);
pf = NULL;
double sizeInKilobytes = residentSetSizeInPages * 4.0; // assumes 4096 byte page
// getconf PAGESIZE
return sizeInKilobytes;
}
void assign(Dataset const &x, Dataset const &c, unsigned short *assignment) {
for (int i = 0; i < x.n; ++i) {
double shortestDist2 = std::numeric_limits<double>::max();
@@ -281,50 +255,3 @@ void assign(Dataset const &x, Dataset const &c, unsigned short *assignment) {
assignment[i] = closest;
}
}
rusage get_time() {
rusage now;
getrusage(RUSAGE_SELF, &now);
return now;
}
double get_wall_time(){
struct timeval time;
if (gettimeofday(&time,NULL)){
// Handle error
return 0;
}
return (double)time.tv_sec + (double)time.tv_usec * .000001;
}
int timeval_subtract(timeval *result, timeval *x, timeval *y) {
/* Perform the carry for the later subtraction by updating y. */
if (x->tv_usec < y->tv_usec) {
int nsec = (y->tv_usec - x->tv_usec) / 1000000 + 1;
y->tv_usec -= 1000000 * nsec;
y->tv_sec += nsec;
}
if (x->tv_usec - y->tv_usec > 1000000) {
int nsec = (x->tv_usec - y->tv_usec) / 1000000;
y->tv_usec += 1000000 * nsec;
y->tv_sec -= nsec;
}
/* Compute the time remaining to wait. tv_usec is certainly positive. */
result->tv_sec = x->tv_sec - y->tv_sec;
result->tv_usec = x->tv_usec - y->tv_usec;
/* Return 1 if result
* is negative. */
return x->tv_sec < y->tv_sec;
}
double elapsed_time(rusage *start) {
rusage now;
timeval diff;
getrusage(RUSAGE_SELF, &now);
timeval_subtract(&diff, &now.ru_utime, &start->ru_utime);
return (double)diff.tv_sec + (double)diff.tv_usec / 1e6;
}

8
contrib/kmeans/kmeans_general_functions.h
View File

@@ -12,8 +12,6 @@
#include <iostream>
#include <string>
#include <sys/resource.h>
#include <sys/time.h>
#include "kmeans_dataset.h"
/* Add together two vectors, and put the result in the first argument.
@@ -78,12 +76,6 @@ void printArray(T const *arr, int length, std::string separator) {
}
}
double getMemoryUsage();
rusage get_time();
double get_wall_time();
int timeval_subtract(timeval *result, timeval *x, timeval *y);
double elapsed_time(rusage *start);
void centerDataset(Dataset *x);
void assign(Dataset const &x, Dataset const &c, unsigned short *assignment);