dlib 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd6639aae7dbe444edd48de318840c7572f78e02
-  data.tar.gz: 4062eebb691556a06ff1118e8f7f8d67a3c6ae75
+  metadata.gz: 28f85b804791454aa5a9e9f4bc8573f8af0c9da6
+  data.tar.gz: 0be4a7dfa32c83ea73640b483a2b0ecc5c45674c
 SHA512:
-  metadata.gz: 081634764b995d7cbdad599705a39643603d69ea6d2da74bc2b24db1fd4e34103b56d49077ba7c93b627b8b77e114c055bcb5e220cdf58425400a909a6dc12b7
-  data.tar.gz: 16d1b4afda5237f40234cdf609cc3da0b9cd87ff4bfb673d31749ed62d221e89876d73d4abf8635c1349a52e0abde2f5f92723fcfdc4934f46421326c248c6ee
+  metadata.gz: ce89bc27b7cf2b1e3cc3f94f0bbe37dddec6c99527d27dca67bb9bd5709340885838419f8d6e5bae100774e067ab453040ef966e5a2d7cb0dbd9500f1e8cbff6
+  data.tar.gz: 8dfa3750b3eef607aadfba745a6e8053864f10ce84563f47b3ff05ebd2bf2961875ec9e67fc374f061ca2ccc7990a6d7866dd35fdf49fc5188f8ab4d78ef9aec

data/Changes.md

@@ -3,6 +3,12 @@
 At first, you can see original Release notes.
 http://dlib.net/release_notes.html
 
+## 1.1.4 (use dlib 19.4)
+
+### Bug fixes
+
+* raise CudaError as ruby's Exception (Dlib::CudaError)
+
 ## 1.1.3 (use dlib 19.4)
 
 ### Bug fixes

data/README.md

@@ -16,8 +16,9 @@ $ brew install jpeg libpng
 $ apt-get install libjpeg8-dev libpng12-dev
 ```
 
-**If you want to use DNN based face detector, you would have to install CUDA SDKs.**
+**If you want to use DNN based face detector, you would have to install CUDA SDKs and cuDNN SDK.**
 **Please read this page.** http://docs.nvidia.com/cuda/#axzz4anGdXQuB
+**This gem try to use CUDA if /usr/local/cuda directory is exists.**
 
 Add this line to your application's Gemfile:
 

data/ext/dlib/cuda.inc

@@ -6,7 +6,6 @@ static VALUE cDlibCuda;
 
 static VALUE eDlibCudaNotAvailableError;
 
-
 #define DLIB_RB_ASSERT_CUDA_AVILABILITY()				\
   do {									\
     VALUE ret = dlib_rb_cuda_check_availability();				\

data/ext/dlib/depend

@@ -13,7 +13,7 @@ NVCC_RESULT := $(shell which nvcc 2> NULL)
 NVCC_TEST := $(notdir $(NVCC_RESULT))
 ifeq ($(NVCC_TEST),nvcc)
 CUDA_NVCC = nvcc
-CUDA_FLAGS = $(CPPFLAGS) -I /usr/local/cuda/include -arch=sm_30 -D__STRICT_ANSI__ -D_MWAITXINTRIN_H_INCLUDED -D_FORCE_INLINES -std=c++11 -Xcompiler -fPIC
+CUDA_FLAGS = $(CPPFLAGS) -I /usr/local/cuda/include -arch=sm_30 -D__STRICT_ANSI__ -D_MWAITXINTRIN_H_INCLUDED -D_FORCE_INLINES -std=c++11 -Xcompiler -fPIC -Xcompiler -funwind-tables
 DLIB_CUDA_SRCS = $(DLIB_SRCDIR)/dlib/dnn/curand_dlibapi.cpp \
 	$(DLIB_SRCDIR)/dlib/dnn/cudnn_dlibapi.cpp \
 	$(DLIB_SRCDIR)/dlib/dnn/cublas_dlibapi.cpp \

data/ext/dlib/dlib.cpp

@@ -11,6 +11,8 @@ static VALUE mDlib;
 
 static VALUE eDlibError;
 
+static VALUE eDlibCudaError;
+
 #include "geometry.inc"
 
 #include "image.inc"
@@ -32,6 +34,8 @@ Init_dlib(void)
 
   eDlibError = rb_define_class_under(mDlib, "Error", rb_eStandardError);
 
+  eDlibCudaError = rb_define_class_under(mDlib, "CudaError", eDlibError);
+
   Init_dlib_geometry();
   Init_dlib_image();
   Init_dlib_detector();

data/ext/dlib/dnn_detector.inc

@@ -19,8 +19,6 @@ using net_type = loss_mmod<con<1,9,9,1,1,rcon5<rcon5<rcon5<downsampler<input_rgb
 
 static VALUE cDlibDNNFaceDetector;
 
-static VALUE eDlibDNNFaceDetectorBadAllocationError;
-
 struct dnn_fd_container {
   net_type net;
 };
@@ -71,7 +69,15 @@ static VALUE
 dlib_rb_dnn_fd_initialize(VALUE dnn_fd, VALUE filename)
 {
   dnn_fd_container *dnn_fdcont = dlib_rb_dnn_fd_get_dnn_fd_container(dnn_fd);
-  dlib::deserialize(StringValueCStr(filename))  >> dnn_fdcont->net;
+
+  try {
+    dlib::deserialize(StringValueCStr(filename)) >> dnn_fdcont->net;
+  } catch (dlib::cuda_error& error) {
+    rb_raise(eDlibCudaError, "cuda error during loading model: %s", error.info.c_str());
+  } catch (std::bad_alloc& error) {
+    rb_raise(rb_eNoMemError, "bad allocation memory during loading model");
+  }
+
   return dnn_fd;
 }
 
@@ -93,8 +99,10 @@ dlib_rb_dnn_fd_detect_in_batches(VALUE dnn_fd, VALUE images)
   std::vector<std::vector<dlib::mmod_rect>> detections_in_batches;
   try {
     detections_in_batches = dnn_fdcont->net(matrixes);
+  } catch (dlib::cuda_error& error) {
+    rb_raise(eDlibCudaError, "cuda error during inferencing: %s", error.info.c_str());
   } catch (std::bad_alloc& error) {
-    rb_raise(eDlibDNNFaceDetectorBadAllocationError, "Bad allocation memory while inferencing");
+    rb_raise(rb_eNoMemError, "bad allocation memory during inferencing");
   }
 
   VALUE result_all = rb_ary_new_capa(detections_in_batches.size());
@@ -143,8 +151,6 @@ Init_dlib_dnn_detector()
 {
   cDlibDNNFaceDetector = rb_define_class_under(mDlib, "DNNFaceDetector", rb_cData);
 
-  eDlibDNNFaceDetectorBadAllocationError = rb_define_class_under(cDlibDNNFaceDetector, "BadAllocationError", eDlibError);
-
   rb_define_alloc_func(cDlibDNNFaceDetector, dlib_rb_dnn_fd_alloc);
 
   rb_define_method(cDlibDNNFaceDetector, "initialize", RUBY_METHOD_FUNC(dlib_rb_dnn_fd_initialize), 1);

data/ext/dlib/extconf.rb

@@ -20,7 +20,7 @@ $defs << '-DDLIB_NO_GUI_SUPPORT'
 $defs << '-DNO_DEBUG'
 $defs << '-O3'
 $CPPFLAGS << " -I#{DLIB_SRCDIR}"
-$CXXFLAGS << " -std=c++11"
+$CXXFLAGS << " -std=c++11 -funwind-tables"
 $ARCH_FLAG = '-march=native'
 
 use_cuda = File.exist?('/usr/local/cuda/lib64/libcudart.so')

data/lib/dlib/version.rb

@@ -1,3 +1,3 @@
 module Dlib
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dlib
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Kenta Murata
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-09 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -3556,7 +3556,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby bindings of dlib C++ library.