mirror/darknet
1
0
Fork 0
mirror of https://github.com/pjreddie/darknet.git synced 2023-08-10 21:13:14 +03:00
Code Issues Projects Releases Wiki Activity

Minor fix

Browse Source
This commit is contained in:
AlexeyAB
2019-01-14 13:56:42 +03:00
parent a590609b1b
commit d2b5e142b3
3 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
include/yolo_v2_class.hpp
View File

@ -1,15 +1,15 @@
#pragma once #pragma once
#ifdef LIB_EXPORTS #ifdef LIB_EXPORTS
#if defined(_MSC_VER) #if defined(_MSC_VER)
#define LIB_EXPORTS __declspec(dllexport) #define LIB_API __declspec(dllexport)
#else #else
#define LIB_EXPORTS __attribute__((visibility("default"))) #define LIB_API __attribute__((visibility("default")))
#endif #endif
#else #else
#if defined(_MSC_VER) #if defined(_MSC_VER)
#define LIB_EXPORTS __declspec(dllimport) #define LIB_API
#else #else
#define LIB_EXPORTS #define LIB_API
#endif #endif
#endif #endif
@ -45,12 +45,12 @@ struct bbox_t_container {
#include "opencv2/imgproc/imgproc_c.h" // C #include "opencv2/imgproc/imgproc_c.h" // C
#endif // OPENCV #endif // OPENCV
extern "C" LIB_EXPORTS int init(const char *configurationFilename, const char *weightsFilename, int gpu); extern "C" LIB_API int init(const char *configurationFilename, const char *weightsFilename, int gpu);
extern "C" LIB_EXPORTS int detect_image(const char *filename, bbox_t_container &container); extern "C" LIB_API int detect_image(const char *filename, bbox_t_container &container);
extern "C" LIB_EXPORTS int detect_mat(const uint8_t* data, const size_t data_length, bbox_t_container &container); extern "C" LIB_API int detect_mat(const uint8_t* data, const size_t data_length, bbox_t_container &container);
extern "C" LIB_EXPORTS int dispose(); extern "C" LIB_API int dispose();
extern "C" LIB_EXPORTS int get_device_count(); extern "C" LIB_API int get_device_count();
extern "C" LIB_EXPORTS int get_device_name(int gpu, char* deviceName); extern "C" LIB_API int get_device_name(int gpu, char* deviceName);
class Detector { class Detector {
std::shared_ptr<void> detector_gpu_ptr; std::shared_ptr<void> detector_gpu_ptr;
@ -60,18 +60,18 @@ public:
float nms = .4; float nms = .4;
bool wait_stream; bool wait_stream;
LIB_EXPORTS Detector(std::string cfg_filename, std::string weight_filename, int gpu_id = 0); LIB_API Detector(std::string cfg_filename, std::string weight_filename, int gpu_id = 0);
LIB_EXPORTS ~Detector(); LIB_API ~Detector();
LIB_EXPORTS std::vector<bbox_t> detect(std::string image_filename, float thresh = 0.2, bool use_mean = false); LIB_API std::vector<bbox_t> detect(std::string image_filename, float thresh = 0.2, bool use_mean = false);
LIB_EXPORTS std::vector<bbox_t> detect(image_t img, float thresh = 0.2, bool use_mean = false); LIB_API std::vector<bbox_t> detect(image_t img, float thresh = 0.2, bool use_mean = false);
static LIB_EXPORTS image_t load_image(std::string image_filename); static LIB_API image_t load_image(std::string image_filename);
static LIB_EXPORTS void free_image(image_t m); static LIB_API void free_image(image_t m);
LIB_EXPORTS int get_net_width() const; LIB_API int get_net_width() const;
LIB_EXPORTS int get_net_height() const; LIB_API int get_net_height() const;
LIB_EXPORTS int get_net_color_depth() const; LIB_API int get_net_color_depth() const;
LIB_EXPORTS std::vector<bbox_t> tracking_id(std::vector<bbox_t> cur_bbox_vec, bool const change_history = true, LIB_API std::vector<bbox_t> tracking_id(std::vector<bbox_t> cur_bbox_vec, bool const change_history = true,
int const frames_story = 10, int const max_dist = 150); int const frames_story = 10, int const max_dist = 150);
std::vector<bbox_t> detect_resized(image_t img, int init_w, int init_h, float thresh = 0.2, bool use_mean = false) std::vector<bbox_t> detect_resized(image_t img, int init_w, int init_h, float thresh = 0.2, bool use_mean = false)
@ -613,13 +613,13 @@ public:
/* /*
// C - wrappers // C - wrappers
LIB_EXPORTS void create_detector(char const* cfg_filename, char const* weight_filename, int gpu_id); LIB_API void create_detector(char const* cfg_filename, char const* weight_filename, int gpu_id);
LIB_EXPORTS void delete_detector(); LIB_API void delete_detector();
LIB_EXPORTS bbox_t* detect_custom(image_t img, float thresh, bool use_mean, int *result_size); LIB_API bbox_t* detect_custom(image_t img, float thresh, bool use_mean, int *result_size);
LIB_EXPORTS bbox_t* detect_resized(image_t img, int init_w, int init_h, float thresh, bool use_mean, int *result_size); LIB_API bbox_t* detect_resized(image_t img, int init_w, int init_h, float thresh, bool use_mean, int *result_size);
LIB_EXPORTS bbox_t* detect(image_t img, int *result_size); LIB_API bbox_t* detect(image_t img, int *result_size);
LIB_EXPORTS image_t load_img(char *image_filename); LIB_API image_t load_img(char *image_filename);
LIB_EXPORTS void free_img(image_t m); LIB_API void free_img(image_t m);
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
@ -628,7 +628,7 @@ static std::shared_ptr<void> c_detector_ptr;
static std::vector<bbox_t> c_result_vec; static std::vector<bbox_t> c_result_vec;
void create_detector(char const* cfg_filename, char const* weight_filename, int gpu_id) { void create_detector(char const* cfg_filename, char const* weight_filename, int gpu_id) {
c_detector_ptr = std::make_shared<LIB_EXPORTS Detector>(cfg_filename, weight_filename, gpu_id); c_detector_ptr = std::make_shared<LIB_API Detector>(cfg_filename, weight_filename, gpu_id);
} }
void delete_detector() { c_detector_ptr.reset(); } void delete_detector() { c_detector_ptr.reset(); }

12
src/image.h
View File

@ -32,10 +32,10 @@ image crop_image(image im, int dx, int dy, int w, int h);
image random_crop_image(image im, int w, int h); image random_crop_image(image im, int w, int h);
image random_augment_image(image im, float angle, float aspect, int low, int high, int size); image random_augment_image(image im, float angle, float aspect, int low, int high, int size);
void random_distort_image(image im, float hue, float saturation, float exposure); void random_distort_image(image im, float hue, float saturation, float exposure);
//LIB_EXPORTS image resize_image(image im, int w, int h); //LIB_API image resize_image(image im, int w, int h);
void fill_image(image m, float s); void fill_image(image m, float s);
void letterbox_image_into(image im, int w, int h, image boxed); void letterbox_image_into(image im, int w, int h, image boxed);
//LIB_EXPORTS image letterbox_image(image im, int w, int h); //LIB_API image letterbox_image(image im, int w, int h);
image resize_min(image im, int min); image resize_min(image im, int min);
image resize_max(image im, int max); image resize_max(image im, int max);
void translate_image(image m, float s); void translate_image(image m, float s);
@ -48,7 +48,7 @@ void exposure_image(image im, float sat);
void distort_image(image im, float hue, float sat, float val); void distort_image(image im, float hue, float sat, float val);
void saturate_exposure_image(image im, float sat, float exposure); void saturate_exposure_image(image im, float sat, float exposure);
void hsv_to_rgb(image im); void hsv_to_rgb(image im);
//LIB_EXPORTS void rgbgr_image(image im); //LIB_API void rgbgr_image(image im);
void constrain_image(image im); void constrain_image(image im);
void composite_3d(char *f1, char *f2, char *out, int delta); void composite_3d(char *f1, char *f2, char *out, int delta);
int best_3d_shift_r(image a, image b, int min, int max); int best_3d_shift_r(image a, image b, int min, int max);
@ -70,13 +70,13 @@ void show_image_collapsed(image p, char *name);
void print_image(image m); void print_image(image m);
//LIB_EXPORTS image make_image(int w, int h, int c); //LIB_API image make_image(int w, int h, int c);
image make_random_image(int w, int h, int c); image make_random_image(int w, int h, int c);
image make_empty_image(int w, int h, int c); image make_empty_image(int w, int h, int c);
image float_to_image(int w, int h, int c, float *data); image float_to_image(int w, int h, int c, float *data);
image copy_image(image p); image copy_image(image p);
image load_image(char *filename, int w, int h, int c); image load_image(char *filename, int w, int h, int c);
//LIB_EXPORTS image load_image_color(char *filename, int w, int h); //LIB_API image load_image_color(char *filename, int w, int h);
image **load_alphabet(); image **load_alphabet();
//float get_pixel(image m, int x, int y, int c); //float get_pixel(image m, int x, int y, int c);
@ -87,7 +87,7 @@ float bilinear_interpolate(image im, float x, float y, int c);
image get_image_layer(image m, int l); image get_image_layer(image m, int l);
//LIB_EXPORTS void free_image(image m); //LIB_API void free_image(image m);
void test_resize(char *filename); void test_resize(char *filename);
#endif #endif

20
src/yolo_v2_class.cpp
View File

@ -100,7 +100,7 @@ struct detector_gpu_t {
unsigned int *track_id; unsigned int *track_id;
}; };
LIB_EXPORTS Detector::Detector(std::string cfg_filename, std::string weight_filename, int gpu_id) : cur_gpu_id(gpu_id) LIB_API Detector::Detector(std::string cfg_filename, std::string weight_filename, int gpu_id) : cur_gpu_id(gpu_id)
{ {
wait_stream = 0; wait_stream = 0;
int old_gpu_index; int old_gpu_index;
@ -147,7 +147,7 @@ LIB_EXPORTS Detector::Detector(std::string cfg_filename, std::string weight_file
} }
LIB_EXPORTS Detector::~Detector() LIB_API Detector::~Detector()
{ {
detector_gpu_t &detector_gpu = *static_cast<detector_gpu_t *>(detector_gpu_ptr.get()); detector_gpu_t &detector_gpu = *static_cast<detector_gpu_t *>(detector_gpu_ptr.get());
layer l = detector_gpu.net.layers[detector_gpu.net.n - 1]; layer l = detector_gpu.net.layers[detector_gpu.net.n - 1];
@ -171,21 +171,21 @@ LIB_EXPORTS Detector::~Detector()
#endif #endif
} }
LIB_EXPORTS int Detector::get_net_width() const { LIB_API int Detector::get_net_width() const {
detector_gpu_t &detector_gpu = *static_cast<detector_gpu_t *>(detector_gpu_ptr.get()); detector_gpu_t &detector_gpu = *static_cast<detector_gpu_t *>(detector_gpu_ptr.get());
return detector_gpu.net.w; return detector_gpu.net.w;
} }
LIB_EXPORTS int Detector::get_net_height() const { LIB_API int Detector::get_net_height() const {
detector_gpu_t &detector_gpu = *static_cast<detector_gpu_t *>(detector_gpu_ptr.get()); detector_gpu_t &detector_gpu = *static_cast<detector_gpu_t *>(detector_gpu_ptr.get());
return detector_gpu.net.h; return detector_gpu.net.h;
} }
LIB_EXPORTS int Detector::get_net_color_depth() const { LIB_API int Detector::get_net_color_depth() const {
detector_gpu_t &detector_gpu = *static_cast<detector_gpu_t *>(detector_gpu_ptr.get()); detector_gpu_t &detector_gpu = *static_cast<detector_gpu_t *>(detector_gpu_ptr.get());
return detector_gpu.net.c; return detector_gpu.net.c;
} }
LIB_EXPORTS std::vector<bbox_t> Detector::detect(std::string image_filename, float thresh, bool use_mean) LIB_API std::vector<bbox_t> Detector::detect(std::string image_filename, float thresh, bool use_mean)
{ {
std::shared_ptr<image_t> image_ptr(new image_t, [](image_t *img) { if (img->data) free(img->data); delete img; }); std::shared_ptr<image_t> image_ptr(new image_t, [](image_t *img) { if (img->data) free(img->data); delete img; });
*image_ptr = load_image(image_filename); *image_ptr = load_image(image_filename);
@ -214,7 +214,7 @@ static image load_image_stb(char *filename, int channels)
return im; return im;
} }
LIB_EXPORTS image_t Detector::load_image(std::string image_filename) LIB_API image_t Detector::load_image(std::string image_filename)
{ {
char *input = const_cast<char *>(image_filename.data()); char *input = const_cast<char *>(image_filename.data());
image im = load_image_stb(input, 3); image im = load_image_stb(input, 3);
@ -229,14 +229,14 @@ LIB_EXPORTS image_t Detector::load_image(std::string image_filename)
} }
LIB_EXPORTS void Detector::free_image(image_t m) LIB_API void Detector::free_image(image_t m)
{ {
if (m.data) { if (m.data) {
free(m.data); free(m.data);
} }
} }
LIB_EXPORTS std::vector<bbox_t> Detector::detect(image_t img, float thresh, bool use_mean) LIB_API std::vector<bbox_t> Detector::detect(image_t img, float thresh, bool use_mean)
{ {
detector_gpu_t &detector_gpu = *static_cast<detector_gpu_t *>(detector_gpu_ptr.get()); detector_gpu_t &detector_gpu = *static_cast<detector_gpu_t *>(detector_gpu_ptr.get());
network &net = detector_gpu.net; network &net = detector_gpu.net;
@ -322,7 +322,7 @@ LIB_EXPORTS std::vector<bbox_t> Detector::detect(image_t img, float thresh, bool
return bbox_vec; return bbox_vec;
} }
LIB_EXPORTS std::vector<bbox_t> Detector::tracking_id(std::vector<bbox_t> cur_bbox_vec, bool const change_history, LIB_API std::vector<bbox_t> Detector::tracking_id(std::vector<bbox_t> cur_bbox_vec, bool const change_history,
int const frames_story, int const max_dist) int const frames_story, int const max_dist)
{ {
detector_gpu_t &det_gpu = *static_cast<detector_gpu_t *>(detector_gpu_ptr.get()); detector_gpu_t &det_gpu = *static_cast<detector_gpu_t *>(detector_gpu_ptr.get());