Merge pull request #50 from NumPower/feat/ndarray_0_5_0

NumPower 0.5.0

Author: henrique-borba

CMakeLists.txt

@@ -1,12 +1,14 @@
 cmake_minimum_required(VERSION 3.26)
+
 project(numpower)
 
+
 set(CMAKE_CXX_STANDARD 14)
 
+include_directories(/usr/include/)
 include_directories(/usr/local/include/php/main/)
 include_directories(/usr/local/include/php)
 include_directories(/usr/local/include)
-include_directories(/usr/include/)
 include_directories(.)
 include_directories(src)
 include_directories(src/ndmath)
@@ -52,4 +54,9 @@ add_executable(numpower
         src/ndmath/signal.c
         src/ndmath/signal.h
         src/ndmath/calculation.c
-)
+        src/ndmath/calculation.h
+        src/dnn.c
+        src/dnn.h
+        src/ndmath/cuda/cuda_dnn.cu
+        src/ndmath/cuda/cuda_dnn.cuh
+)

Makefile.frag

@@ -80,10 +80,12 @@ install-cuda:
 	$(CC)    -I. -I $(CXX) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)  $(ALL_CCFLAGS) $(GENCODE_FLAGS)  -c $(builddir)./src/ndmath/linalg.c -shared -fPIC -o .libs/linalg.o
 	$(CC)    -I. -I $(CXX) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)  $(ALL_CCFLAGS) $(GENCODE_FLAGS)  -c $(builddir)./src/ndmath/signal.c -shared -fPIC -o .libs/signal.o
 	$(CC)    -I. -I $(CXX) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)  $(ALL_CCFLAGS) $(GENCODE_FLAGS)  -c $(builddir)./src/ndmath/calculation.c -shared -fPIC -o .libs/calculation.o
+	$(CC)    -I. -I $(CXX) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)  $(ALL_CCFLAGS) $(GENCODE_FLAGS)  -c $(builddir)./src/dnn.c -shared -fPIC -o .libs/dnn.o
 	$(NVCC)  -I. -I $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)  $(ALL_CCFLAGS) $(GENCODE_FLAGS)  -c $(builddir)./src/gpu_alloc.c -shared -Xcompiler -fPIC -o .libs/gpu_alloc.o
 	$(NVCC)  -I. -I $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)  $(ALL_CCFLAGS) $(GENCODE_FLAGS)  -c $(builddir)./src/ndmath/cuda/cuda_math.cu -shared -Xcompiler -fPIC -o .libs/cuda_math.o
+	$(NVCC)  -I. -I $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)  $(ALL_CCFLAGS) $(GENCODE_FLAGS)  -c $(builddir)./src/ndmath/cuda/cuda_dnn.cu -shared -Xcompiler -fPIC -o .libs/cuda_dnn.o
 	$(NVCC)  -I. -I $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)  $(ALL_CCFLAGS) $(GENCODE_FLAGS)  -c $(builddir)./src/ndmath/statistics.c -shared -Xcompiler -fPIC -o .libs/statistics.o
-	$(NVCC)  -shared .libs/numpower.o .libs/signal.o .libs/initializers.o .libs/double_math.o .libs/ndarray.o .libs/debug.o .libs/statistics.o .libs/buffer.o .libs/logic.o .libs/gpu_alloc.o .libs/linalg.o .libs/manipulation.o .libs/iterators.o .libs/indexing.o .libs/arithmetics.o .libs/types.o  .libs/cuda_math.o -lcublas -lcusolver -lcudart -llapack -llapacke -lopenblas -lpthread -lcuda  -o .libs/ndarray.so
+	$(NVCC)  -shared .libs/numpower.o .libs/signal.o .libs/initializers.o .libs/double_math.o .libs/ndarray.o .libs/debug.o .libs/statistics.o .libs/calculation.o .libs/buffer.o .libs/dnn.o .libs/cuda_dnn.o .libs/logic.o .libs/gpu_alloc.o .libs/linalg.o .libs/manipulation.o .libs/iterators.o .libs/indexing.o .libs/arithmetics.o .libs/types.o  .libs/cuda_math.o $(CFLAGS_CLEAN) -o .libs/ndarray.so
 	cp ./.libs/ndarray.so $(phplibdir)/ndarray.so
 	cp ./.libs/ndarray.so $(EXTENSION_DIR)/ndarray.so
 

README.md

@@ -29,7 +29,8 @@ NumPower aims to manage memory more efficiently than a matrix in PHP arrays
 - PHP 8.x
 - LAPACKE
 - OpenBLAS
-- **Optional (GPU)**: CUBLAS, CUDA Build Toolkit
+- **Optional**: Intel MKL
+- **Optional (GPU)**: CUBLAS, CUDA Build Toolkit and cuDNN
 - **Optional (Image)**: PHP-GD
 
 ## GPU Support
@@ -58,3 +59,12 @@ $x_cpu = $x->cpu();
 
 > **You must explicitly copy the arrays you want to use in your devices**. Cross-array operations (like adding) will 
 > raise an exception if the arrays used are on different devices.
+
+## DNN Features
+When NumPower identifies the oneDNN or cuDNN libraries during compilation, 
+some resources for DNN will be available for use.
+
+This includes for example high performance feed forward and backward for convolutions and pooling 
+for both CPU (oneDNN) and GPU (cuDNN).
+
+If you do not have any of the libraries installed, all DNN API methods calls will raise a fatal error.

config.m4

@@ -86,16 +86,33 @@ PHP_CHECK_LIBRARY(cblas,cblas_sdot,
   -lcblas
 ])
 
+PHP_CHECK_LIBRARY(mkl_rt,LAPACKE_sgesdd,
+    [
+      AC_DEFINE(HAVE_LAPACKE_MKL,1,[ ])
+      PHP_ADD_LIBRARY(lapack,,NDARRAY_SHARED_LIBADD)
+      AC_MSG_RESULT([LAPACKE (MKL) detected ])
+      CFLAGS+=" -lmkl_rt "
+    ],[
+    PHP_CHECK_LIBRARY(lapacke,LAPACKE_sgesdd,
+    [
+      AC_DEFINE(HAVE_LAPACKE,1,[ ])
+      PHP_ADD_LIBRARY(lapack,,NDARRAY_SHARED_LIBADD)
+      AC_MSG_RESULT([LAPACKE detected ])
+      CFLAGS+=" -llapack -llapacke "
+    ],[
+        AC_MSG_ERROR([wrong LAPACKE version or library not found. Try `apt install liblapacke-dev`])
+    ])
+])
 
 
-PHP_CHECK_LIBRARY(lapacke,LAPACKE_sgesdd,
-[
-  AC_DEFINE(HAVE_LAPACKE,1,[ ])
-  PHP_ADD_LIBRARY(lapack,,NDARRAY_SHARED_LIBADD)
-  AC_MSG_RESULT([LAPACKE detected ])
-  CFLAGS+=" -llapack -llapacke "
-],[
-    AC_MSG_ERROR([wrong LAPACKE version or library not found. Try `apt install liblapacke-dev`])
+PHP_CHECK_LIBRARY(cudnn, cudnnCreate,
+    [
+      AC_DEFINE(HAVE_CUDNN,1,[ ])
+      PHP_ADD_LIBRARY(z,,NDARRAY_SHARED_LIBADD)
+      AC_MSG_RESULT([cuDNN detected, enabling GPU DNN capabilities.])
+      CFLAGS+=" -lz -lcudnn "
+    ],[
+    AC_MSG_RESULT([cuDNN not found. GPU DNN capabilities disabled.])
 ])
 
 if test "$PHP_NDARRAY" != "no"; then
@@ -111,6 +128,7 @@ if test "$PHP_NDARRAY" != "no"; then
       src/gpu_alloc.c \
       src/ndmath/linalg.c \
       src/manipulation.c \
+      src/dnn.c \
       src/iterators.c \
       src/indexing.c \
       src/ndmath/arithmetics.c \