cumo 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f07518545c0e4d72380382915462039151c132ee9827967e9d4c32604001f15
-  data.tar.gz: 94e5c261659e401d9a8016eb0a3493d9bce26abe19347602859f7a9fcc79014e
+  metadata.gz: 5b17317cc0df56b966f0455be514318920624fb5869e45d442a81d3f71ee9e9d
+  data.tar.gz: 50e06b7373b2d0a97c6c715686fc7a38b58fbeb86d17aa8ad189e0a1d9828a5c
 SHA512:
-  metadata.gz: cf48d1e5452e2c871587da1f006b90f3de54c8dc911d4fa555bd54c7ea69741903ce000fd0b1fd38ba96fc46d65e79f24e3c9d858029df176cee7768e8de790b
-  data.tar.gz: 4c5d6bdc9ec211967458b9b4f3576a278b2d59011faf2ae5dd85979a4821496ad29db9eefd0fce9d0765f9ede38d42af2c8fc8dd250de41f9e22759ee9914a56
+  metadata.gz: f558130296b89c55e5d506673dd3376274f95c57970cd6aa17d686e69c2e23e41d85a16fdfb84fcb7a4acc6addbd67ea855800de8eb1fa1e6b1bf4d061894109
+  data.tar.gz: 642442d479765d459286474a514e047ab80273b9357b357f5509054f27cd52c27562f57c8af53a4efa5d8cb24afd4c2949afe1f2b962b9046ea4fd23935666b1

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.3.2 (2019-05-02)
+
+Fixes:
+
+* Fix max and max\_index for sfloat and dfloat
+
 # 0.3.1 (2019-04-16)
 
 Fixes:

data/ext/cumo/cuda/cudnn_impl.cpp

@@ -210,6 +210,7 @@ static void HashCombine(std::size_t& seed, std::size_t hash_value) {
 
 // Partially Borrowed from ChainerX
 struct AlgoCacheKey {
+    int device_id;
     size_t ndim;  // # of spatial dimensions
     size_t x_shape[CUMO_NA_MAX_DIMENSION];
     size_t w_shape[CUMO_NA_MAX_DIMENSION];
@@ -220,6 +221,7 @@ struct AlgoCacheKey {
     size_t max_workspace_size;
 
     bool operator==(const AlgoCacheKey& other) const {
+        if (device_id != other.device_id) return false;
         if (ndim != other.ndim) return false;
         if (dtype != other.dtype) return false;
         if (max_workspace_size != other.max_workspace_size) return false;
@@ -249,6 +251,7 @@ struct AlgoCacheKeyHash {
     std::size_t operator()(const AlgoCacheKey& key) const {
         std::size_t seed = 0;
         size_t ndim = key.ndim;
+        HashCombine(seed, std::hash<int>()(key.device_id));
         HashCombine(seed, std::hash<size_t>()(key.ndim));
         for (size_t idim = 0; idim < ndim + 2; ++idim) {
             HashCombine(seed, std::hash<size_t>()(key.x_shape[idim]));
@@ -275,7 +278,6 @@ using FwdAlgoCacheMap = std::unordered_map<AlgoCacheKey, std::pair<cudnnConvolut
 using BwdDataAlgoCacheMap = std::unordered_map<AlgoCacheKey, std::pair<cudnnConvolutionBwdDataAlgo_t, size_t>, AlgoCacheKeyHash>;
 using BwdFilterAlgoCacheMap = std::unordered_map<AlgoCacheKey, std::pair<cudnnConvolutionBwdFilterAlgo_t, size_t>, AlgoCacheKeyHash>;
 
-// TODO: Another cache for another device
 static FwdAlgoCacheMap fwd_algo_cache_map_{};
 static BwdDataAlgoCacheMap bwd_data_algo_cache_map_{};
 static BwdFilterAlgoCacheMap bwd_filter_algo_cache_map_{};
@@ -304,6 +306,7 @@ cumo_cuda_cudnn_FindConvolutionForwardAlgorithm(
     CumoGetNArray(y, ny);
 
     auto key = AlgoCacheKey{};
+    cumo_cuda_runtime_check_status(cudaGetDevice(&(key.device_id)));
     key.ndim = ndim;
     for (size_t idim = 0; idim < ndim + 2; ++idim) {
         key.x_shape[idim] = nx->shape[idim];

data/ext/cumo/include/cumo.h

@@ -10,8 +10,8 @@ extern "C" {
 #endif
 #endif
 
-#define CUMO_VERSION "0.3.1"
-#define CUMO_VERSION_CODE 31
+#define CUMO_VERSION "0.3.2"
+#define CUMO_VERSION_CODE 32
 
 bool cumo_compatible_mode_enabled_p();
 bool cumo_show_warning_enabled_p();

data/ext/cumo/include/cumo/types/dfloat.h

@@ -44,5 +44,5 @@ inline static void m_rand_norm(dtype mu, dtype sigma, dtype *a0, dtype *a1)
 #define M_MIN     rb_float_new(2.2250738585072014e-308)
 #define M_MAX     rb_float_new(1.7976931348623157e+308)
 
-#define DATA_MIN DBL_MIN
+#define DATA_MIN -DBL_MAX
 #define DATA_MAX DBL_MAX

data/ext/cumo/include/cumo/types/dfloat_kernel.h

@@ -8,7 +8,7 @@ typedef double rtype;
 
 #define m_nearly_eq(x,y) (fabs(x-y)<=(fabs(x)+fabs(y))*DBL_EPSILON*2)
 
-#define DATA_MIN DBL_MIN
+#define DATA_MIN -DBL_MAX
 #define DATA_MAX DBL_MAX
 
 #endif // CUMO_DFLOAT_KERNEL_H

data/ext/cumo/include/cumo/types/sfloat.h

@@ -45,5 +45,5 @@ inline static void m_rand_norm(dtype mu, dtype sigma, dtype *a0, dtype *a1)
 #define M_MIN     rb_float_new(1.1754943508222875e-38)
 #define M_MAX     rb_float_new(3.4028234663852886e+38)
 
-#define DATA_MIN FLT_MIN
+#define DATA_MIN -FLT_MAX
 #define DATA_MAX FLT_MAX

data/ext/cumo/include/cumo/types/sfloat_kernel.h

@@ -8,7 +8,7 @@ typedef float rtype;
 
 #define m_nearly_eq(x,y) (fabs(x-y)<=(fabs(x)+fabs(y))*FLT_EPSILON*2)
 
-#define DATA_MIN FLT_MIN
+#define DATA_MIN -FLT_MAX
 #define DATA_MAX FLT_MAX
 
 #endif // CUMO_SFLOAT_KERNEL_H

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cumo
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-16 00:00:00.000000000 Z
+date: 2019-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray