Merge pull request #672 from IntelPython/master

Merge master to gold/2021

Author: densmirn

README.md

@@ -3,10 +3,11 @@
 [![Build Sphinx](https://github.com/IntelPython/dpnp/workflows/Build%20Sphinx/badge.svg)](https://intelpython.github.io/dpnp)
 
 # DPNP: NumPy-like API accelerated with SYCL
+[API coverage summary](https://intelpython.github.io/dpnp/reference/comparison.html#summary)
 
-Full documentation: https://intelpython.github.io/dpnp/
+[Full documentation](https://intelpython.github.io/dpnp/)
 
-DPNP C++ backend documentation: https://intelpython.github.io/dpnp/backend_doc/
+[DPNP C++ backend documentation](https://intelpython.github.io/dpnp/backend_doc/)
 
 The project contains:
 - Python interface with NumPy-like API

conda-recipe/meta.yaml

@@ -10,7 +10,7 @@ requirements:
       - setuptools
       - numpy-devel >=1.18
       - cython
-      - cmake
+      - cmake >=3.16.5
       - dpctl >=0.5.0a0
       - mkl-devel >=2021.1.1
       - wheel

doc/comparison_generator.py

@@ -2,6 +2,20 @@
 import inspect
 
 
+def calc_totals(base_mod, ref_mods, cls):
+    base_obj, _ = import_mod(base_mod, cls)
+    base_funcs = get_functions(base_obj)
+
+    totals = [len(base_funcs)]
+    for ref_mod in ref_mods:
+        ref_obj, _ = import_mod(ref_mod, cls)
+        ref_funcs = get_functions(ref_obj)
+
+        totals.append(len(ref_funcs & base_funcs))
+
+    return totals
+
+
 def get_functions(obj):
     funcs = []
     for n, _ in inspect.getmembers(obj):
@@ -31,19 +45,11 @@ def import_mod(mod, cls):
 
 
 def generate_totals(base_mod, ref_mods, base_type, ref_types, cls):
-    base_obj, _ = import_mod(base_mod, cls)
-    base_funcs = get_functions(base_obj)
-
     all_types = [base_type] + ref_types
     header = ', '.join('**{} Total**'.format(t) for t in all_types)
     header = '   {}'.format(header)
 
-    totals = [len(base_funcs)]
-    for ref_mod in ref_mods:
-        ref_obj, _ = import_mod(ref_mod, cls)
-        ref_funcs = get_functions(ref_obj)
-
-        totals.append(len(ref_funcs & base_funcs))
+    totals = calc_totals(base_mod, ref_mods, cls)
 
     cells = ', '.join(str(t) for t in totals)
     total = '   {}'.format(cells)
@@ -87,6 +93,93 @@ def section(header, base_mod, ref_mods, base_type, ref_types, cls=None):
     return [header, '~' * len(header), ''] + comparison_rst + ['']
 
 
+def generate_totals_numbers(header, base_mod, ref_mods, cls=None):
+    base_obj, _ = import_mod(base_mod, cls)
+    base_funcs = get_functions(base_obj)
+
+    counter_funcs = [len(base_funcs)]
+    for ref_mod in ref_mods:
+        ref_obj, _ = import_mod(ref_mod, cls)
+        ref_funcs = get_functions(ref_obj)
+
+        counter_funcs.append(len(ref_funcs & base_funcs))
+
+    totals = [header] + calc_totals(base_mod, ref_mods, cls)
+
+    cells = ', '.join(str(t) for t in totals)
+    total = '   {}'.format(cells)
+
+    return total, counter_funcs
+
+
+def generate_table_numbers(base_mod, ref_mods, base_type, ref_types, cls=None):
+    all_types = ['Name'] + [base_type] + ref_types
+    header = ', '.join('**{}**'.format(t) for t in all_types)
+    header = '   {}'.format(header)
+
+    rows = []
+    counters_funcs = []
+
+    totals = []
+    totals_, counters_funcs_ = generate_totals_numbers('Module-Level', base_mod, ref_mods)
+    totals.append(totals_)
+    counters_funcs.append(counters_funcs_)
+    cells = ', '.join(str(t) for t in totals)
+    total = '   {}'.format(cells)
+    rows.append(total)
+
+    totals = []
+    totals_, counters_funcs_ = generate_totals_numbers('Multi-Dimensional Array', base_mod, ref_mods, cls='ndarray')
+    totals.append(totals_)
+    counters_funcs.append(counters_funcs_)
+    cells = ', '.join(str(t) for t in totals)
+    total = '   {}'.format(cells)
+    rows.append(total)
+
+    totals = []
+    totals_, counters_funcs_ = generate_totals_numbers('Linear Algebra', base_mod + '.linalg',
+                                                       [m + '.linalg' for m in ref_mods])
+    totals.append(totals_)
+    counters_funcs.append(counters_funcs_)
+    cells = ', '.join(str(t) for t in totals)
+    total = '   {}'.format(cells)
+    rows.append(total)
+
+    totals = []
+    totals_, counters_funcs_ = generate_totals_numbers('Discrete Fourier Transform', base_mod + '.fft',
+                                                       [m + '.fft' for m in ref_mods])
+    totals.append(totals_)
+    counters_funcs.append(counters_funcs_)
+    cells = ', '.join(str(t) for t in totals)
+    total = '   {}'.format(cells)
+    rows.append(total)
+
+    totals = []
+    totals_, counters_funcs_ = generate_totals_numbers('Random Sampling', base_mod + '.random',
+                                                       [m + '.random' for m in ref_mods])
+    totals.append(totals_)
+    counters_funcs.append(counters_funcs_)
+    cells = ', '.join(str(t) for t in totals)
+    total = '   {}'.format(cells)
+    rows.append(total)
+
+    counter_functions = []
+    for i in range(len(counters_funcs[0])):
+        counter = 0
+        for j in range(len(counters_funcs)):
+            counter += counters_funcs[j][i]
+        counter_functions.append('{}'.format(counter))
+
+    summary = ['Total'] + counter_functions
+    cells = ', '.join(str(t) for t in summary)
+    summary_total = '   {}'.format(cells)
+    rows.append(summary_total)
+
+    comparison_rst = ['.. csv-table::', ''] + [header] + rows
+
+    return ['Summary', '~' * len('Summary'), ''] + comparison_rst + ['']
+
+
 def generate():
     ref_mods = []
     ref_types = []
@@ -119,6 +212,8 @@ def generate():
     header = ' / '.join([base_ver] + ref_vers) + ' APIs'
     buf = ['**{}**'.format(header), '']
 
+    buf += generate_table_numbers(
+        base_mod, ref_mods, base_type, ref_types)
     buf += section(
         'Module-Level',
         base_mod, ref_mods, base_type, ref_types)

doc/reference/creation.rst

@@ -20,6 +20,7 @@ Basic creation routines
    dpnp.zeros_like
    dpnp.full
    dpnp.full_like
+   dpnp.vander
 
 
 Creation from other data

doc/reference/math.rst

@@ -67,9 +67,15 @@ Sums, products, differences
    dpnp.sum
    dpnp.cumprod
    dpnp.cumsum
+   dpnp.nancumprod
+   dpnp.nancumsum
    dpnp.nansum
    dpnp.nanprod
+   dpnp.cross
    dpnp.diff
+   dpnp.ediff1d
+   dpnp.gradient
+   dpnp.trapz
 
 
 Exponents and logarithms

dpnp/backend/CMakeLists.txt

@@ -42,7 +42,7 @@ else()
   if(UNIX)
     set(DPNP_ONEAPI_ROOT "/opt/intel/oneapi" CACHE PATH "Folder contains oneapi tool set")
   elseif(WIN32)
-    set(DPNP_ONEAPI_ROOT "C:\Program Files (x86)\Intel\oneAPI" CACHE PATH "Folder contains oneapi tool set")
+    set(DPNP_ONEAPI_ROOT "C:/Program Files (x86)/Intel/oneAPI" CACHE PATH "Folder contains oneapi tool set")
   else()
     message(FATAL_ERROR "Unsupported system ${CMAKE_SYSTEM}")
   endif()
@@ -54,6 +54,10 @@ option(DPNP_INSTALL_STRUCTURED "if FALSE, install package files into same direct
 option(DPNP_SYCL_QUEUE_MGR_ENABLE "Use external manager for SYCL queue" FALSE)
 option(DPNP_BACKEND_TESTS "Enable DPNP tests" FALSE)
 
+if(DEFINED ENV{DPNP_DEBUG})
+  set(DPNP_DEBUG_ENABLE $ENV{DPNP_DEBUG})
+endif()
+
 message(STATUS "CMAKE_VERSION:                   ${CMAKE_VERSION}")
 message(STATUS "CMAKE_GENERATOR:                 ${CMAKE_GENERATOR}")
 message(STATUS "CMAKE_HOST_SYSTEM_NAME:          ${CMAKE_HOST_SYSTEM_NAME}")
@@ -171,6 +175,7 @@ set(DPNP_SRC
     kernels/dpnp_krnl_fft.cpp
     kernels/dpnp_krnl_indexing.cpp
     kernels/dpnp_krnl_linalg.cpp
+    kernels/dpnp_krnl_logic.cpp
     kernels/dpnp_krnl_manipulation.cpp
     kernels/dpnp_krnl_mathematical.cpp
     kernels/dpnp_krnl_random.cpp
@@ -214,7 +219,6 @@ if(UNIX)
 # -DMKL_ILP64 -I"${MKLROOT}/include"
 # -lmkl_sycl -lmkl_intel_ilp64 -lmkl_sequential -lmkl_core -lsycl -lOpenCL -lpthread -lm -ldl
   set(DPNP_MATHLIB_DEP_LIBS
-      mkl_rt
       mkl_sycl
       mkl_intel_ilp64
       mkl_sequential
@@ -230,7 +234,6 @@ elseif(WIN32)
 # -DMKL_ILP64 -I"%MKLROOT%\include"
 # mkl_sycl_dll.lib mkl_intel_ilp64_dll.lib mkl_sequential_dll.lib mkl_core_dll.lib sycl.lib OpenCL.lib
   set(DPNP_MATHLIB_DEP_LIBS
-      mkl_rt
       mkl_sycl        # _dll
       mkl_intel_ilp64 # _dll
       mkl_sequential  # _dll

dpnp/backend/examples/example9.cpp

@@ -30,7 +30,7 @@
  * to calculate sum of the given elements vector
  *
  * Possible compile line:
- * clang++ -g -fPIC examples/example9.cpp -Idpnp -Idpnp/backend/include -Ldpnp -Wl,-rpath='$ORIGIN'/dpnp -ldpnp_backend_c -o example9
+ * clang++ dpnp/backend/examples/example9.cpp -Idpnp -Idpnp/backend/include -Ldpnp -Wl,-rpath='$ORIGIN'/dpnp -ldpnp_backend_c -o example9
  *
  */
 
@@ -54,7 +54,7 @@ int main(int, char**)
         result_verification += i;
     }
 
-    dpnp_sum_c<long>(array, &result, size);
+    dpnp_sum_c<long, long>(&result, array, &size, 1, NULL, 0, NULL, NULL);
 
     std::cout << "SUM() value: " << result << " verification value: " << result_verification << std::endl;