Revert "Merge master to gold/2021 (#1441)" (#1442)

This reverts commit 57ce272.

.github/workflows/conda-package.yml

@@ -196,6 +196,8 @@ jobs:
         run: |
           python -m pytest -q -ra --disable-warnings -vv ${{ env.TEST_SCOPE }}
         working-directory: ${{ env.tests-path }}
+        env:
+          SYCL_QUEUE_THREAD_POOL_SIZE: 6
 
   test_windows:
     name: Test ['windows-latest', python='${{ matrix.python }}']
@@ -333,6 +335,8 @@ jobs:
         run: |
           python -m pytest -q -ra --disable-warnings -vv ${{ env.TEST_SCOPE }}
         working-directory: ${{ env.tests-path }}
+        env:
+          SYCL_QUEUE_THREAD_POOL_SIZE: 6
 
   upload:
     name: Upload ['${{ matrix.os }}', python='${{ matrix.python }}']

.github/workflows/generate_coverage.yaml

@@ -66,6 +66,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           COVERALLS_PARALLEL: true
+          SYCL_QUEUE_THREAD_POOL_SIZE: 6
 
   coveralls:
     name: Indicate completion to coveralls.io

conda-recipe/bld.bat

@@ -18,7 +18,7 @@ set "DPL_ROOT_HINT=%PREFIX%/Library"
 %PYTHON% -m dpctl --cmakedir > Output
 set /p DPCTL_CMAKE_DIR= < Output
 
-set "SKBUILD_ARGS=-G Ninja -- -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icx -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
+set "SKBUILD_ARGS=-G Ninja -- -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icx"
 set "SKBUILD_ARGS=%SKBUILD_ARGS% -DDPCTL_MODULE_PATH:PATH=%DPCTL_CMAKE_DIR% "
 set "SKBUILD_ARGS=%SKBUILD_ARGS% -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
 

conda-recipe/build.sh

@@ -1,11 +1,5 @@
 #!/bin/bash
 
-# Workaround to Klocwork overwriting LD_LIBRARY_PATH that was modified
-# by DPC++ compiler conda packages. Will need to be added to DPC++ compiler
-# activation scripts.
-export LDFLAGS="$LDFLAGS -Wl,-rpath,$PREFIX/lib"
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PREFIX/compiler/lib/intel64_lin:$PREFIX/compiler/lib:$PREFIX/lib"
-
 # Intel LLVM must cooperate with compiler and sysroot from conda
 echo "--gcc-toolchain=${BUILD_PREFIX} --sysroot=${BUILD_PREFIX}/${HOST}/sysroot -target ${HOST}" > icpx_for_conda.cfg
 export ICPXCFG="$(pwd)/icpx_for_conda.cfg"
@@ -16,7 +10,7 @@ export TBB_ROOT_HINT=$PREFIX
 export DPL_ROOT_HINT=$PREFIX
 export MKL_ROOT_HINT=$PREFIX
 SKBUILD_ARGS="-- -DDPCTL_MODULE_PATH=$($PYTHON -m dpctl --cmakedir) "
-SKBUILD_ARGS="${SKBUILD_ARGS} -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icpx -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
+SKBUILD_ARGS="${SKBUILD_ARGS} -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icpx"
 SKBUILD_ARGS="${SKBUILD_ARGS} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
 
 # Build wheel package

conda-recipe/meta.yaml

@@ -13,7 +13,7 @@ requirements:
       - cmake >=3.21
       - ninja
       - git
-      - dpctl >=0.14.3
+      - dpctl >=0.14.2
       - mkl-devel-dpcpp {{ environ.get('MKL_VER', '>=2023.1.0') }}
       - onedpl-devel
       - tbb-devel
@@ -25,7 +25,7 @@ requirements:
       - sysroot_linux-64 >=2.28 # [linux]
     run:
       - python
-      - dpctl >=0.14.3
+      - dpctl >=0.14.2
       - {{ pin_compatible('dpcpp-cpp-rt', min_pin='x.x', max_pin='x') }}
       - {{ pin_compatible('mkl-dpcpp', min_pin='x.x', max_pin='x') }}
       - {{ pin_compatible('numpy', min_pin='x.x', max_pin='x') }}

doc/conf.py

@@ -31,9 +31,9 @@
 author = 'Intel'
 
 # The short X.Y version
-version = '0.12'
+version = '0.11'
 # The full version, including alpha/beta/rc tags
-release = '0.12.0'
+release = '0.11.2dev1'
 
 
 # -- General configuration ---------------------------------------------------

dpnp/__init__.py

@@ -27,9 +27,6 @@
 import os
 mypath = os.path.dirname(os.path.realpath(__file__))
 
-# workaround against hanging in OneMKL calls and in DPCTL
-os.environ.setdefault('SYCL_QUEUE_THREAD_POOL_SIZE', '6')
-
 import dpctl
 dpctlpath = os.path.dirname(dpctl.__file__)
 
@@ -44,6 +41,9 @@
         os.add_dll_directory(dpctlpath)
     os.environ["PATH"] = os.pathsep.join([os.getenv("PATH", ""), mypath, dpctlpath])
 
+# workaround against hanging in OneMKL calls
+os.environ.setdefault('SYCL_QUEUE_THREAD_POOL_SIZE', '6')
+
 from dpnp.dpnp_array import dpnp_array as ndarray
 from dpnp.dpnp_flatiter import flatiter as flatiter
 

dpnp/backend/doc/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = "DPNP C++ backend kernel library"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 0.12.0
+PROJECT_NUMBER         = 0.11.2dev1
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

dpnp/backend/include/dpnp_iface_fptr.hpp

@@ -124,6 +124,7 @@ enum class DPNPFuncName : size_t
     DPNP_FN_COUNT_NONZERO,                /**< Used in numpy.count_nonzero() impl  */
     DPNP_FN_COUNT_NONZERO_EXT,            /**< Used in numpy.count_nonzero() impl, requires extra parameters */
     DPNP_FN_COV,                          /**< Used in numpy.cov() impl  */
+    DPNP_FN_COV_EXT,                      /**< Used in numpy.cov() impl, requires extra parameters */
     DPNP_FN_CROSS,                        /**< Used in numpy.cross() impl  */
     DPNP_FN_CROSS_EXT,                    /**< Used in numpy.cross() impl, requires extra parameters */
     DPNP_FN_CUMPROD,                      /**< Used in numpy.cumprod() impl  */
@@ -217,6 +218,7 @@ enum class DPNPFuncName : size_t
     DPNP_FN_MAXIMUM,                      /**< Used in numpy.maximum() impl  */
     DPNP_FN_MAXIMUM_EXT,                  /**< Used in numpy.maximum() impl , requires extra parameters */
     DPNP_FN_MEAN,                         /**< Used in numpy.mean() impl  */
+    DPNP_FN_MEAN_EXT,                     /**< Used in numpy.mean() impl, requires extra parameters */
     DPNP_FN_MEDIAN,                       /**< Used in numpy.median() impl  */
     DPNP_FN_MEDIAN_EXT,                   /**< Used in numpy.median() impl, requires extra parameters */
     DPNP_FN_MIN,                          /**< Used in numpy.min() impl  */
@@ -358,6 +360,7 @@ enum class DPNPFuncName : size_t
     DPNP_FN_TANH,                         /**< Used in numpy.tanh() impl  */
     DPNP_FN_TANH_EXT,                     /**< Used in numpy.tanh() impl, requires extra parameters */
     DPNP_FN_TRANSPOSE,                    /**< Used in numpy.transpose() impl  */
+    DPNP_FN_TRANSPOSE_EXT,                /**< Used in numpy.transpose() impl, requires extra parameters */
     DPNP_FN_TRACE,                        /**< Used in numpy.trace() impl  */
     DPNP_FN_TRACE_EXT,                    /**< Used in numpy.trace() impl, requires extra parameters */
     DPNP_FN_TRAPZ,                        /**< Used in numpy.trapz() impl  */

dpnp/backend/kernels/dpnp_krnl_manipulation.cpp

@@ -1,5 +1,5 @@
 //*****************************************************************************
-// Copyright (c) 2016-2023, Intel Corporation
+// Copyright (c) 2016-2020, Intel Corporation
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -211,7 +211,6 @@ void dpnp_elemwise_transpose_c(void* array1_in,
                                                                        size,
                                                                        dep_event_vec_ref);
     DPCTLEvent_WaitAndThrow(event_ref);
-    DPCTLEvent_Delete(event_ref);
 }
 
 template <typename _DataType>
@@ -223,6 +222,17 @@ void (*dpnp_elemwise_transpose_default_c)(void*,
                                           void*,
                                           size_t) = dpnp_elemwise_transpose_c<_DataType>;
 
+template <typename _DataType>
+DPCTLSyclEventRef (*dpnp_elemwise_transpose_ext_c)(DPCTLSyclQueueRef,
+                                                   void*,
+                                                   const shape_elem_type*,
+                                                   const shape_elem_type*,
+                                                   const shape_elem_type*,
+                                                   size_t,
+                                                   void*,
+                                                   size_t,
+                                                   const DPCTLEventVectorRef) = dpnp_elemwise_transpose_c<_DataType>;
+
 void func_map_init_manipulation(func_map_t& fmap)
 {
     fmap[DPNPFuncName::DPNP_FN_REPEAT][eft_INT][eft_INT] = {eft_INT, (void*)dpnp_repeat_default_c<int32_t>};
@@ -243,5 +253,15 @@ void func_map_init_manipulation(func_map_t& fmap)
                                                                (void*)dpnp_elemwise_transpose_default_c<float>};
     fmap[DPNPFuncName::DPNP_FN_TRANSPOSE][eft_DBL][eft_DBL] = {eft_DBL,
                                                                (void*)dpnp_elemwise_transpose_default_c<double>};
+
+    fmap[DPNPFuncName::DPNP_FN_TRANSPOSE_EXT][eft_INT][eft_INT] = {eft_INT,
+                                                                   (void*)dpnp_elemwise_transpose_ext_c<int32_t>};
+    fmap[DPNPFuncName::DPNP_FN_TRANSPOSE_EXT][eft_LNG][eft_LNG] = {eft_LNG,
+                                                                   (void*)dpnp_elemwise_transpose_ext_c<int64_t>};
+    fmap[DPNPFuncName::DPNP_FN_TRANSPOSE_EXT][eft_FLT][eft_FLT] = {eft_FLT,
+                                                                   (void*)dpnp_elemwise_transpose_ext_c<float>};
+    fmap[DPNPFuncName::DPNP_FN_TRANSPOSE_EXT][eft_DBL][eft_DBL] = {eft_DBL,
+                                                                   (void*)dpnp_elemwise_transpose_ext_c<double>};
+
     return;
 }