cumo 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 621f319a4a92862c60267ace14b39968fb7e5c203da94bb9d1f01b86412b77b3
-  data.tar.gz: db4964d257fcbe79c6a6f4b8e84ac71f7657c87168d43b7c205d9de5059b02e3
+  metadata.gz: 3a00113b29c4cd47082953a1327d8b5c30c29543d42d7b9c3de1fb81a06d44c3
+  data.tar.gz: 78014e61144693436adc2c822b40f4520615cbeda8a7776600a3cc53cbe39474
 SHA512:
-  metadata.gz: a703d9f146c556af7ef60c869dd44989fdd67d8c2b45f99d337b1cc5dd606a1eace434b46d0b6a7e4a404930351565f2ca3e93f116886a5b915f285a8b1b85d0
-  data.tar.gz: 9fc0c1c794aeb12f9f5a3cf7866bec32439b09083c3b34869301ac5dc3c602845ec3c51e7caa7bf5022d375e448db5c4c6d3f16f77660645b07fdd5dc2bf29c1
+  metadata.gz: e93d0fb045838fd34a047488a287dfc6c777106255b7e0783e56148967f0c773c4e14a6f9590360f2521b277cdb46cd71bdbe307bd0cf68456942e8e26449a7c
+  data.tar.gz: cab27fb6523bc0362b5b5bb8e144dbed26c7636bfa7adc8ba69be3f9ad408dd00c2b2a28f59a750108856bb50986f8a398adf0844cfed8150f79475002da56c3

data/README.md

@@ -190,7 +190,7 @@ ln -sf "$HOME/opt/ccache/bin/ccache" "$HOME/opt/ccache/bin/nvcc"
 Use `MAKEFLAGS` environment variable to specify `make` command options. You can build in parallel as:
 
 ```
-bundle exec MAKEFLAG=-j8 rake compile
+bundle exec env MAKEFLAG=-j8 rake compile
 ```
 
 ### Specify nvcc --generate-code options
@@ -242,6 +242,23 @@ bundle exec DTYPE=dfloat ruby test/narray_test.rb
 bundle exec CUDA_LAUNCH_BLOCKING=1
 ```
 
+### Disable Cumo warnings
+
+As default, cumo shows some warnings once for each.
+
+It is possible to disable by followings:
+
+```
+export CUMO_SHOW_WARNING=OFF
+```
+
+You may want to show warnings everytime rather than once:
+
+```
+export CUMO_SHOW_WARNING=ON
+export CUMO_WARNING_ONCE=OFF
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/sonots/cumo.

data/ext/cumo/cuda/cublas.c

@@ -16,7 +16,7 @@ get_cublas_error_msg(cublasStatus_t error) {
     switch (error) {
 #define RETURN_MSG(msg) \
     case msg:                              \
-        return #msg
+        return (char*)#msg
 
         RETURN_MSG(CUBLAS_STATUS_SUCCESS);
         RETURN_MSG(CUBLAS_STATUS_NOT_INITIALIZED);
@@ -47,6 +47,7 @@ cublasHandle_t
 cumo_cuda_cublas_handle()
 {
     static cublasHandle_t *handles = 0;  // handle is never destroyed
+    int device;
     if (handles == 0) {
         int i;
         int device_count = cumo_cuda_runtime_get_device_count();
@@ -55,7 +56,7 @@ cumo_cuda_cublas_handle()
             handles[i] = 0;
         }
     }
-    int device = cumo_cuda_runtime_get_device();
+    device = cumo_cuda_runtime_get_device();
     if (handles[device] == 0) {
         cublasCreate(&handles[device]);
     }

data/ext/cumo/cuda/driver.c

@@ -387,6 +387,9 @@ rb_cuModuleUnload(VALUE self, VALUE hmod)
 void
 Init_cumo_cuda_driver()
 {
+    CUdevice cuDevice;
+    CUcontext context;
+
     VALUE mCumo = rb_define_module("Cumo");
     VALUE mCUDA = rb_define_module_under(mCumo, "CUDA");
     mDriver = rb_define_module_under(mCUDA, "Driver");
@@ -413,8 +416,6 @@ Init_cumo_cuda_driver()
     rb_define_const(mDriver, "CU_JIT_INPUT_OBJECT", INT2NUM(CU_JIT_INPUT_OBJECT));
     rb_define_const(mDriver, "CU_JIT_INPUT_PTX", INT2NUM(CU_JIT_INPUT_PTX));
 
-    CUdevice cuDevice;
-    CUcontext context;
     cuInit(0);
     cuDeviceGet(&cuDevice, 0);
     cuCtxCreate(&context, 0, cuDevice);

data/ext/cumo/cumo.c

@@ -47,6 +47,20 @@ bool cumo_compatible_mode_enabled_p()
     return cumo_compatible_mode_enabled;
 }
 
+static bool cumo_show_warning_enabled;
+
+bool cumo_show_warning_enabled_p()
+{
+    return cumo_show_warning_enabled;
+}
+
+static bool cumo_warning_once_enabled;
+
+bool cumo_warning_once_enabled_p()
+{
+    return cumo_warning_once_enabled;
+}
+
 /*
   Enable Numo NArray compatible mode.
 
@@ -110,6 +124,14 @@ Init_cumo()
     env = getenv("CUMO_COMPATIBLE_MODE");
     cumo_compatible_mode_enabled = (env != NULL && strcmp(env, "OFF") != 0 && strcmp(env, "0") != 0 && strcmp(env, "NO") != 0);
 
+    // default is true
+    env = getenv("CUMO_SHOW_WARNING");
+    cumo_show_warning_enabled = env == NULL || (strcmp(env, "OFF") != 0 && strcmp(env, "0") != 0 && strcmp(env, "NO") != 0);
+
+    // default is true
+    env = getenv("CUMO_WARNING_ONCE");
+    cumo_warning_once_enabled = env == NULL || (strcmp(env, "OFF") != 0 && strcmp(env, "0") != 0 && strcmp(env, "NO") != 0);
+
     Init_cumo_narray();
 
     Init_cumo_na_step();

data/ext/cumo/include/cumo.h

@@ -10,10 +10,33 @@ extern "C" {
 #endif
 #endif
 
-#define CUMO_VERSION "0.1.1"
-#define CUMO_VERSION_CODE 11
+#define CUMO_VERSION "0.1.2"
+#define CUMO_VERSION_CODE 12
 
 bool cumo_compatible_mode_enabled_p();
+bool cumo_show_warning_enabled_p();
+bool cumo_warning_once_enabled_p();
+
+#define CUMO_SHOW_WARNING_ONCE( c_str ) \
+    { \
+        if (cumo_show_warning_enabled_p()) { \
+            if (cumo_warning_once_enabled_p()) { \
+                static bool show_warning = true; \
+                if (show_warning) { \
+                    fprintf(stderr, (c_str)); \
+                    show_warning = false; \
+                } \
+            } else { \
+                fprintf(stderr, (c_str)); \
+            } \
+        } \
+    }
+
+#define CUMO_SHOW_SYNCHRONIZE_FIXME_WARNING_ONCE( func_name, type_name ) \
+    CUMO_SHOW_WARNING_ONCE("Warning: FIXME: Method \"" func_name "\" for dtype \"" type_name "\" synchronizes with CPU.\n")
+
+#define CUMO_SHOW_SYNCHRONIZE_WARNING_ONCE( func_name, type_name ) \
+    CUMO_SHOW_WARNING_ONCE("Warning: Method \"" func_name "\" for dtype \"" type_name "\" synchronizes with CPU.\n")
 
 #if defined(__cplusplus)
 #if 0

data/ext/cumo/include/cumo/template.h

@@ -145,19 +145,4 @@ cumo_is_aligned_step(const ssize_t step, const size_t alignment)
     return ((step) & ((alignment)-1)) == 0;
 }
 
-#define CUMO_SHOW_WARNING_ONCE( c_str ) \
-    { \
-        static bool show_warning = true; \
-        if (show_warning) { \
-            fprintf(stderr, (c_str)); \
-            show_warning = false; \
-        } \
-    }
-
-#define CUMO_SHOW_SYNCHRONIZE_FIXME_WARNING_ONCE( func_name, type_name ) \
-    CUMO_SHOW_WARNING_ONCE("Warning: FIXME: Method \"" func_name "\" for dtype \"" type_name "\" synchronizes with CPU.\n")
-
-#define CUMO_SHOW_SYNCHRONIZE_WARNING_ONCE( func_name, type_name ) \
-    CUMO_SHOW_WARNING_ONCE("Warning: Method \"" func_name "\" for dtype \"" type_name "\" synchronizes with CPU.\n")
-
 #endif /* ifndef CUMO_TEMPLATE_H */

data/ext/cumo/narray/gen/tmpl/rand.c

@@ -92,7 +92,6 @@ static void
     <%=shift_set%>
 
     CUMO_SHOW_SYNCHRONIZE_FIXME_WARNING_ONCE("<%=name%>", "<%=type_name%>");
-    CUMO_SHOW_SYNCHRONIZE_WARNING_ONCE("<%=name%>", "<%=type_name%>");
     cumo_cuda_runtime_check_status(cudaDeviceSynchronize());
     if (idx1) {
         for (; i--;) {

data/ext/cumo/narray/index.c

@@ -1,5 +1,6 @@
 #include <string.h>
 #include <ruby.h>
+#include "cumo.h"
 #include "cumo/narray.h"
 #include "cumo/cuda/runtime.h"
 #include "cumo/template.h"

data/ext/cumo/narray/ndloop.c

@@ -1,4 +1,5 @@
 #include <ruby.h>
+#include "cumo.h"
 #include "cumo/narray.h"
 #include "cumo/cuda/memory_pool.h"
 #include "cumo/cuda/runtime.h"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cumo
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-10 00:00:00.000000000 Z
+date: 2018-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray