Implemented CRubix::clip, CRubix::clipLower and CRubix::clipUpper

Author: henrique-borba

config.m4

@@ -4,6 +4,7 @@ PHP_ARG_WITH(carray, whether to enable CArray computing library,
 PHP_ARG_ENABLE(carray-opencl, whether to enable OpenCL support,
 [  --enable-carray-opencl     whether to enable OpenCL support], no, no)
 
+
 if test "$PHP_CARRAY" != "no"; then
   AC_DEFINE([HAVE_CARRAY],1 ,[whether to enable  CArray computing library])
 
@@ -130,6 +131,16 @@ PHP_CHECK_LIBRARY(lapacke,LAPACKE_sgetrf,
   -llapacke
 ])
 
+PHP_CHECK_LIBRARY(omp,omp_get_num_threads,
+[
+  AC_DEFINE(HAVE_OMP,1,[ ])
+  AC_MSG_RESULT([OpenMP found])
+  PHP_ADD_LIBRARY(omp,,CARRAY_SHARED_LIBADD)
+],[
+  AC_MSG_RESULT([OpenMP not found])
+],[
+  -fopenmp
+])
 
 PHP_NEW_EXTENSION(carray,
 	  phpsci.c \
@@ -181,5 +192,3 @@ PHP_NEW_EXTENSION(carray,
   PHP_INSTALL_HEADERS([ext/carray], [phpsci.h, kernel/carray.h, kernel/types.h, kernel/buffer.h])
   PHP_SUBST(CARRAY_SHARED_LIBADD)
 fi
-
-

kernel/clip.c

@@ -227,7 +227,7 @@ CArray_Clip(CArray * self, CArray * min, CArray * max, MemoryPointer * out_ptr)
 
         out = emalloc(sizeof(CArray));
         out = CArray_NewFromDescr(out,
-                                  indescr, CArray_NDIM(self),
+                                  CArray_DESCR(self), CArray_NDIM(self),
                                   CArray_DIMS(self),
                                   NULL, NULL,
                                   CArray_ISFORTRAN(self),
@@ -274,4 +274,4 @@ CArray_Clip(CArray * self, CArray * min, CArray * max, MemoryPointer * out_ptr)
     return out;
 fail:
     return NULL;
-}
+}

kernel/interfaces/rubix.c

@@ -15,6 +15,7 @@
 #include <kernel/buffer.h>
 #include <kernel/search.h>
 #include <kernel/round.h>
+#include <kernel/clip.h>
 #include <kernel/calculation.h>
 #include <kernel/carray.h>
 #include <phpsci.h>
@@ -26,6 +27,10 @@
 #include "lapacke.h"
 #include "cblas.h"
 
+#ifdef HAVE_OMP
+#include <omp.h>
+#endif
+
 /**
  * RubixML/Tensor/Matrix::identity
  */
@@ -1632,6 +1637,7 @@ PHP_METHOD(CRubix, min)
 
             rtn_ca = CArray_Zeros(newshape, 1, TYPE_INTEGER, &order, &rtn_ptr);
             it = CArray_NewIter(target_ca);
+
             do {
                 if (tmp_int > IT_IDATA(it)[0] || i == 0) {
                     IDATA(rtn_ca)[j] = IT_IDATA(it)[0];
@@ -1654,6 +1660,7 @@ PHP_METHOD(CRubix, min)
 
             rtn_ca = CArray_Zeros(newshape, 1, TYPE_DOUBLE, &order, &rtn_ptr);
             it = CArray_NewIter(target_ca);
+
             do {
                 if (tmp_double > IT_DDATA(it)[0] || i == 0) {
                     DDATA(rtn_ca)[j] = IT_DDATA(it)[0];
@@ -1874,7 +1881,6 @@ PHP_METHOD(CRubix, quantile)
         return;
     }
 
-
     // For 2-D Tensor
     x = q * (CArray_DIMS(target_ca)[1] - 1.0) + 1.0;
     x_hat = (int)x;
@@ -1891,9 +1897,9 @@ PHP_METHOD(CRubix, quantile)
     result = CArray_NewFromDescr(result, descr, 1, dims, NULL, NULL, 0, NULL);
 
     for (i = 0; i < CArray_DIMS(target_ca)[0]; i++) {
-        key = i * CArray_DIMS(target_ca)[1];
-        t = DDATA(sorted_ca)[(key + (x_hat - 1))];
-        DDATA(result)[i] = t + remainder * (DDATA(sorted_ca)[key + x_hat] - t);
+          key = i * CArray_DIMS(target_ca)[1];
+          t = DDATA(sorted_ca)[(key + (x_hat - 1))];
+          DDATA(result)[i] = t + remainder * (DDATA(sorted_ca)[key + x_hat] - t);
     }
 
     add_to_buffer(&out_ptr, result, sizeof(CArray));
@@ -2002,7 +2008,44 @@ PHP_METHOD(CRubix, ceil)
  */
 PHP_METHOD(CRubix, clip)
 {
+  MemoryPointer ptr_a, ptr_min, ptr_max, ptr_rtn;
+  CArray * ca_a, * ca_min = NULL, * ca_max = NULL, * rtn = NULL;
+  zval * a, * a_min, * a_max;
+  ZEND_PARSE_PARAMETERS_START(3, 3)
+      Z_PARAM_ZVAL(a)
+      Z_PARAM_ZVAL(a_min)
+      Z_PARAM_ZVAL(a_max)
+  ZEND_PARSE_PARAMETERS_END();
+  ZVAL_TO_MEMORYPOINTER(a, &ptr_a, NULL);
+  ZVAL_TO_MEMORYPOINTER(a_min, &ptr_min, NULL);
+  ZVAL_TO_MEMORYPOINTER(a_max, &ptr_max, NULL);
+
+  ca_a = CArray_FromMemoryPointer(&ptr_a);
+
+  if (Z_TYPE_P(a_min) != IS_NULL) {
+      ca_min = CArray_FromMemoryPointer(&ptr_min);
+  }
+  if (Z_TYPE_P(a_max) != IS_NULL) {
+      ca_max = CArray_FromMemoryPointer(&ptr_max);
+  }
+
+  rtn = CArray_Clip(ca_a, ca_min, ca_max, &ptr_rtn);
+
+  FREE_FROM_MEMORYPOINTER(&ptr_a);
+
+  if (Z_TYPE_P(a_min) != IS_NULL) {
+      FREE_FROM_MEMORYPOINTER(&ptr_min);
+  }
+
+  if (Z_TYPE_P(a_max) != IS_NULL) {
+      FREE_FROM_MEMORYPOINTER(&ptr_max);
+  }
+
+  if (rtn == NULL) {
+      return;
+  }
 
+  RETURN_MEMORYPOINTER(return_value, &ptr_rtn);
 }
 
 /**

kernel/interfaces/rubix.h

@@ -84,9 +84,9 @@ PHP_METHOD(CRubix, covariance);                     //OK        PASSED
 PHP_METHOD(CRubix, round);
 PHP_METHOD(CRubix, floor);                          //OK        PASSED
 PHP_METHOD(CRubix, ceil);                           //OK        PASSED
-PHP_METHOD(CRubix, clip);
-PHP_METHOD(CRubix, clipLower);
-PHP_METHOD(CRubix, clipUpper);
+PHP_METHOD(CRubix, clip);                           //OK        PASSED
+PHP_METHOD(CRubix, clipLower);                      //OK
+PHP_METHOD(CRubix, clipUpper);                      //OK        PASSED
 PHP_METHOD(CRubix, sign);
 PHP_METHOD(CRubix, negate);                         //OK        PASSED
 PHP_METHOD(CRubix, insert);

phpsci.c

@@ -124,7 +124,6 @@ ZVAL_TO_MEMORYPOINTER(zval * obj, MemoryPointer * ptr, char * type)
             throw_overflow_exception("CArrays only works with int32 and "
                                      "float64 values, LONG INT detected.");
         }
-
         IDATA(self)[0] = (int)zval_get_long(obj);
         add_to_buffer(ptr, self, sizeof(CArray));
         efree(dims);
@@ -2725,6 +2724,7 @@ static zend_function_entry crubix_class_methods[] =
         PHP_ME(CRubix, subMatrix, NULL, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
         PHP_ME(CRubix, solve, NULL, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
         PHP_ME(CRubix, quantile, NULL, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
+        PHP_ME(CRubix, clip, NULL, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
 
         PHP_ME(CRubix, log, NULL, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
         PHP_ME(CRubix, log1p, NULL, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)