From f606b5456e4876da5f90e2902b2dff07516a03dc Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Wed, 22 Aug 2018 14:52:48 +0000
Subject: [PATCH] XNOR-net 21 FPS on CPU yolov2-tiny.cfg
---
src/utils.c | 151 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 128 insertions(+), 23 deletions(-)
diff --git a/src/utils.c b/src/utils.c
index f340a7e..14d647b 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -7,13 +7,24 @@
#include <limits.h>
#ifdef WIN32
#include "unistd.h"
+#include "gettimeofday.h"
#else
#include <unistd.h>
+#include <sys/time.h>
#endif
#include "utils.h"
#pragma warning(disable: 4996)
+double what_time_is_it_now()
+{
+ struct timeval time;
+ if (gettimeofday(&time, NULL)) {
+ return 0;
+ }
+ return (double)time.tv_sec + (double)time.tv_usec * .000001;
+}
+
int *read_map(char *filename)
{
int n = 0;
@@ -46,7 +57,7 @@
void *swp = calloc(1, size);
for(i = 0; i < n-1; ++i){
size_t j = i + rand()/(RAND_MAX / (n-i)+1);
- memcpy(swp, (char*)arr+(j*size), size);
+ memcpy(swp, (char*)arr+(j*size), size);
memcpy((char*)arr+(j*size), (char*)arr+(i*size), size);
memcpy((char*)arr+(i*size), swp, size);
}
@@ -126,7 +137,7 @@
{
c = next+1;
}
- if(!next) while ((next = strchr(c, '\\'))) { c = next + 1; }
+ if(!next) while ((next = strchr(c, '\\'))) { c = next + 1; }
c = copy_string(c);
next = strchr(c, '.');
if (next) *next = 0;
@@ -158,18 +169,85 @@
void find_replace(char *str, char *orig, char *rep, char *output)
{
- char buffer[4096] = {0};
+ char *buffer = calloc(8192, sizeof(char));
char *p;
sprintf(buffer, "%s", str);
if(!(p = strstr(buffer, orig))){ // Is 'orig' even in 'str'?
sprintf(output, "%s", str);
+ free(buffer);
return;
}
*p = '\0';
sprintf(output, "%s%s%s", buffer, rep, p+strlen(orig));
+ free(buffer);
+}
+
+void trim(char *str)
+{
+ char *buffer = calloc(8192, sizeof(char));
+ sprintf(buffer, "%s", str);
+
+ char *p = buffer;
+ while (*p == ' ' || *p == '\t') ++p;
+
+ char *end = p + strlen(p) - 1;
+ while (*end == ' ' || *end == '\t') {
+ *end = '\0';
+ --end;
+ }
+ sprintf(str, "%s", p);
+
+ free(buffer);
+}
+
+void find_replace_extension(char *str, char *orig, char *rep, char *output)
+{
+ char *buffer = calloc(8192, sizeof(char));
+
+ sprintf(buffer, "%s", str);
+ char *p = strstr(buffer, orig);
+ int offset = (p - buffer);
+ int chars_from_end = strlen(buffer) - offset;
+ if (!p || chars_from_end != strlen(orig)) { // Is 'orig' even in 'str' AND is 'orig' found at the end of 'str'?
+ sprintf(output, "%s", str);
+ free(buffer);
+ return;
+ }
+
+ *p = '\0';
+ sprintf(output, "%s%s%s", buffer, rep, p + strlen(orig));
+ free(buffer);
+}
+
+void replace_image_to_label(char *input_path, char *output_path)
+{
+ find_replace(input_path, "/images/train2014/", "/labels/train2014/", output_path); // COCO
+ find_replace(output_path, "/images/val2014/", "/labels/val2014/", output_path); // COCO
+ find_replace(output_path, "/JPEGImages/", "/labels/", output_path); // PascalVOC
+ find_replace(output_path, "\\images\\train2014\\", "\\labels\\train2014\\", output_path); // COCO
+ find_replace(output_path, "\\images\\val2014\\", "\\labels\\val2014\\", output_path); // COCO
+ find_replace(output_path, "\\JPEGImages\\", "\\labels\\", output_path); // PascalVOC
+ //find_replace(output_path, "/images/", "/labels/", output_path); // COCO
+ //find_replace(output_path, "/VOC2007/JPEGImages/", "/VOC2007/labels/", output_path); // PascalVOC
+ //find_replace(output_path, "/VOC2012/JPEGImages/", "/VOC2012/labels/", output_path); // PascalVOC
+
+ //find_replace(output_path, "/raw/", "/labels/", output_path);
+ trim(output_path);
+
+ // replace only ext of files
+ find_replace_extension(output_path, ".jpg", ".txt", output_path);
+ find_replace_extension(output_path, ".JPG", ".txt", output_path); // error
+ find_replace_extension(output_path, ".jpeg", ".txt", output_path);
+ find_replace_extension(output_path, ".JPEG", ".txt", output_path);
+ find_replace_extension(output_path, ".png", ".txt", output_path);
+ find_replace_extension(output_path, ".PNG", ".txt", output_path);
+ find_replace_extension(output_path, ".bmp", ".txt", output_path);
+ find_replace_extension(output_path, ".BMP", ".txt", output_path);
+ find_replace_extension(output_path, ".ppm", ".txt", output_path);
+ find_replace_extension(output_path, ".PPM", ".txt", output_path);
}
float sec(clock_t clocks)
@@ -197,19 +275,19 @@
{
perror(s);
assert(0);
- exit(-1);
+ exit(EXIT_FAILURE);
}
void malloc_error()
{
fprintf(stderr, "Malloc error\n");
- exit(-1);
+ exit(EXIT_FAILURE);
}
void file_error(char *s)
{
fprintf(stderr, "Couldn't open file: %s\n", s);
- exit(0);
+ exit(EXIT_FAILURE);
}
list *split_str(char *s, char delim)
@@ -234,12 +312,26 @@
size_t offset = 0;
for(i = 0; i < len; ++i){
char c = s[i];
- if(c==' '||c=='\t'||c=='\n'||c =='\r') ++offset;
+ if(c==' '||c=='\t'||c=='\n'||c =='\r'||c==0x0d||c==0x0a) ++offset;
else s[i-offset] = c;
}
s[len-offset] = '\0';
}
+
+void strip_args(char *s)
+{
+ size_t i;
+ size_t len = strlen(s);
+ size_t offset = 0;
+ for (i = 0; i < len; ++i) {
+ char c = s[i];
+ if (c == '\t' || c == '\n' || c == '\r' || c == 0x0d || c == 0x0a) ++offset;
+ else s[i - offset] = c;
+ }
+ s[len - offset] = '\0';
+}
+
void strip_char(char *s, char bad)
{
size_t i;
@@ -286,7 +378,11 @@
fgets(&line[curr], readsize, fp);
curr = strlen(line);
}
- if(line[curr-1] == '\n') line[curr-1] = '\0';
+ if(curr >= 2)
+ if(line[curr-2] == 0x0d) line[curr-2] = 0x00;
+
+ if(curr >= 1)
+ if(line[curr-1] == 0x0a) line[curr-1] = 0x00;
return line;
}
@@ -504,7 +600,7 @@
int i;
float sum = 0;
for(i = 0; i < n; ++i){
- sum += a[i]*a[i];
+ sum += a[i]*a[i];
}
return sqrt(sum);
}
@@ -544,6 +640,15 @@
return max_i;
}
+int int_index(int *a, int val, int n)
+{
+ int i;
+ for (i = 0; i < n; ++i) {
+ if (a[i] == val) return i;
+ }
+ return -1;
+}
+
int rand_int(int min, int max)
{
if (max < min){
@@ -590,7 +695,7 @@
size_t rand_size_t()
{
- return ((size_t)(rand()&0xff) << 56) |
+ return ((size_t)(rand()&0xff) << 56) |
((size_t)(rand()&0xff) << 48) |
((size_t)(rand()&0xff) << 40) |
((size_t)(rand()&0xff) << 32) |
@@ -608,7 +713,7 @@
max = swap;
}
return ((float)rand()/RAND_MAX * (max - min)) + min;
- //return (random_float() * (max - min)) + min;
+ //return (random_float() * (max - min)) + min;
}
float rand_scale(float s)
@@ -632,30 +737,30 @@
unsigned int random_gen()
{
- unsigned int rnd = 0;
+ unsigned int rnd = 0;
#ifdef WIN32
- rand_s(&rnd);
+ rand_s(&rnd);
#else
- rnd = rand();
+ rnd = rand();
#endif
- return rnd;
+ return rnd;
}
float random_float()
{
#ifdef WIN32
- return ((float)random_gen() / (float)UINT_MAX);
+ return ((float)random_gen() / (float)UINT_MAX);
#else
- return ((float)random_gen() / (float)RAND_MAX);
+ return ((float)random_gen() / (float)RAND_MAX);
#endif
}
float rand_uniform_strong(float min, float max)
{
- if (max < min) {
- float swap = min;
- min = max;
- max = swap;
- }
- return (random_float() * (max - min)) + min;
+ if (max < min) {
+ float swap = min;
+ min = max;
+ max = swap;
+ }
+ return (random_float() * (max - min)) + min;
}
\ No newline at end of file
--
Gitblit v1.10.0