mirror of
https://github.com/pjreddie/darknet.git
synced 2023-08-10 21:13:14 +03:00
Fixed network resizing (random=1) for non-square networks
This commit is contained in:
11
src/cuda.c
11
src/cuda.c
@ -67,7 +67,16 @@ static int streamInit[16] = { 0 };
|
|||||||
cudaStream_t get_cuda_stream() {
|
cudaStream_t get_cuda_stream() {
|
||||||
int i = cuda_get_device();
|
int i = cuda_get_device();
|
||||||
if (!streamInit[i]) {
|
if (!streamInit[i]) {
|
||||||
cudaStreamCreate(&streamsArray[i]);
|
cudaError_t status = cudaStreamCreate(&streamsArray[i]);
|
||||||
|
//cudaError_t status = cudaStreamCreateWithFlags(&streamsArray[i], cudaStreamNonBlocking);
|
||||||
|
if (status != cudaSuccess) {
|
||||||
|
printf(" cudaStreamCreate error: %d \n", status);
|
||||||
|
const char *s = cudaGetErrorString(status);
|
||||||
|
char buffer[256];
|
||||||
|
printf("CUDA Error: %s\n", s);
|
||||||
|
status = cudaStreamCreateWithFlags(&streamsArray[i], cudaStreamDefault);
|
||||||
|
check_error(status);
|
||||||
|
}
|
||||||
streamInit[i] = 1;
|
streamInit[i] = 1;
|
||||||
}
|
}
|
||||||
return streamsArray[i];
|
return streamsArray[i];
|
||||||
|
@ -66,6 +66,11 @@ void train_detector(char *datacfg, char *cfgfile, char *weightfile, int *gpus, i
|
|||||||
srand(time(0));
|
srand(time(0));
|
||||||
network net = nets[0];
|
network net = nets[0];
|
||||||
|
|
||||||
|
if ((net.batch * net.subdivisions) == 1) {
|
||||||
|
printf("\n Error: You set incorrect value batch=1 for Training! You should set batch=64 subdivision=64 \n");
|
||||||
|
getchar();
|
||||||
|
}
|
||||||
|
|
||||||
int imgs = net.batch * net.subdivisions * ngpus;
|
int imgs = net.batch * net.subdivisions * ngpus;
|
||||||
printf("Learning Rate: %g, Momentum: %g, Decay: %g\n", net.learning_rate, net.momentum, net.decay);
|
printf("Learning Rate: %g, Momentum: %g, Decay: %g\n", net.learning_rate, net.momentum, net.decay);
|
||||||
data train, buffer;
|
data train, buffer;
|
||||||
@ -121,12 +126,16 @@ void train_detector(char *datacfg, char *cfgfile, char *weightfile, int *gpus, i
|
|||||||
while(get_current_batch(net) < net.max_batches){
|
while(get_current_batch(net) < net.max_batches){
|
||||||
if(l.random && count++%10 == 0){
|
if(l.random && count++%10 == 0){
|
||||||
printf("Resizing\n");
|
printf("Resizing\n");
|
||||||
int dim = (rand() % 12 + (init_w/32 - 5)) * 32; // +-160
|
//int dim = (rand() % 12 + (init_w/32 - 5)) * 32; // +-160
|
||||||
//if (get_current_batch(net)+100 > net.max_batches) dim = 544;
|
|
||||||
//int dim = (rand() % 4 + 16) * 32;
|
//int dim = (rand() % 4 + 16) * 32;
|
||||||
printf("%d\n", dim);
|
//if (get_current_batch(net)+100 > net.max_batches) dim = 544;
|
||||||
args.w = dim;
|
int random_val = rand() % 12;
|
||||||
args.h = dim;
|
int dim_w = (random_val + (init_w / 32 - 5)) * 32; // +-160
|
||||||
|
int dim_h = (random_val + (init_h / 32 - 5)) * 32; // +-160
|
||||||
|
|
||||||
|
printf("%d x %d \n", dim_w, dim_h);
|
||||||
|
args.w = dim_w;
|
||||||
|
args.h = dim_h;
|
||||||
|
|
||||||
pthread_join(load_thread, 0);
|
pthread_join(load_thread, 0);
|
||||||
train = buffer;
|
train = buffer;
|
||||||
@ -134,7 +143,7 @@ void train_detector(char *datacfg, char *cfgfile, char *weightfile, int *gpus, i
|
|||||||
load_thread = load_data(args);
|
load_thread = load_data(args);
|
||||||
|
|
||||||
for(i = 0; i < ngpus; ++i){
|
for(i = 0; i < ngpus; ++i){
|
||||||
resize_network(nets + i, dim, dim);
|
resize_network(nets + i, dim_w, dim_h);
|
||||||
}
|
}
|
||||||
net = nets[0];
|
net = nets[0];
|
||||||
}
|
}
|
||||||
|
@ -950,7 +950,7 @@ image load_image_cv(char *filename, int channels)
|
|||||||
sprintf(buff, "echo %s >> bad.list", filename);
|
sprintf(buff, "echo %s >> bad.list", filename);
|
||||||
system(buff);
|
system(buff);
|
||||||
return make_image(10,10,3);
|
return make_image(10,10,3);
|
||||||
//exit(0);
|
//exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
image out = ipl_to_image(src);
|
image out = ipl_to_image(src);
|
||||||
cvReleaseImage(&src);
|
cvReleaseImage(&src);
|
||||||
@ -1691,7 +1691,11 @@ image load_image_stb(char *filename, int channels)
|
|||||||
unsigned char *data = stbi_load(filename, &w, &h, &c, channels);
|
unsigned char *data = stbi_load(filename, &w, &h, &c, channels);
|
||||||
if (!data) {
|
if (!data) {
|
||||||
fprintf(stderr, "Cannot load image \"%s\"\nSTB Reason: %s\n", filename, stbi_failure_reason());
|
fprintf(stderr, "Cannot load image \"%s\"\nSTB Reason: %s\n", filename, stbi_failure_reason());
|
||||||
exit(1);
|
char buff[256];
|
||||||
|
sprintf(buff, "echo %s >> bad.list", filename);
|
||||||
|
system(buff);
|
||||||
|
return make_image(10, 10, 3);
|
||||||
|
//exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
if(channels) c = channels;
|
if(channels) c = channels;
|
||||||
int i,j,k;
|
int i,j,k;
|
||||||
|
@ -208,19 +208,19 @@ void error(const char *s)
|
|||||||
{
|
{
|
||||||
perror(s);
|
perror(s);
|
||||||
assert(0);
|
assert(0);
|
||||||
exit(1);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
|
|
||||||
void malloc_error()
|
void malloc_error()
|
||||||
{
|
{
|
||||||
fprintf(stderr, "Malloc error\n");
|
fprintf(stderr, "Malloc error\n");
|
||||||
exit(1);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
|
|
||||||
void file_error(char *s)
|
void file_error(char *s)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "Couldn't open file: %s\n", s);
|
fprintf(stderr, "Couldn't open file: %s\n", s);
|
||||||
exit(1);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
|
|
||||||
list *split_str(char *s, char delim)
|
list *split_str(char *s, char delim)
|
||||||
|
Reference in New Issue
Block a user