Skip to content

Commit 2ace40e

Browse files
antonwolfyantonwolfy
authored
Revert "Merge master to gold/2021 (#1441)"
This reverts commit 57ce272.
1 parent 57ce272 commit 2ace40e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1146
-1737
lines changed

‎.github/workflows/conda-package.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,8 @@ jobs:
196196
run: |
197197
python -m pytest -q -ra --disable-warnings -vv ${{ env.TEST_SCOPE }}
198198
working-directory: ${{ env.tests-path }}
199+
env:
200+
SYCL_QUEUE_THREAD_POOL_SIZE: 6
199201

200202
test_windows:
201203
name: Test ['windows-latest', python='${{ matrix.python }}']
@@ -333,6 +335,8 @@ jobs:
333335
run: |
334336
python -m pytest -q -ra --disable-warnings -vv ${{ env.TEST_SCOPE }}
335337
working-directory: ${{ env.tests-path }}
338+
env:
339+
SYCL_QUEUE_THREAD_POOL_SIZE: 6
336340

337341
upload:
338342
name: Upload ['${{ matrix.os }}', python='${{ matrix.python }}']

‎.github/workflows/generate_coverage.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ jobs:
6666
env:
6767
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6868
COVERALLS_PARALLEL: true
69+
SYCL_QUEUE_THREAD_POOL_SIZE: 6
6970

7071
coveralls:
7172
name: Indicate completion to coveralls.io

‎CHANGELOG.md

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎conda-recipe/bld.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ set "DPL_ROOT_HINT=%PREFIX%/Library"
1818
%PYTHON% -m dpctl --cmakedir > Output
1919
set /p DPCTL_CMAKE_DIR= < Output
2020

21-
set "SKBUILD_ARGS=-G Ninja -- -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icx -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
21+
set "SKBUILD_ARGS=-G Ninja -- -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icx"
2222
set "SKBUILD_ARGS=%SKBUILD_ARGS% -DDPCTL_MODULE_PATH:PATH=%DPCTL_CMAKE_DIR% "
2323
set "SKBUILD_ARGS=%SKBUILD_ARGS% -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
2424

‎conda-recipe/build.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
#!/bin/bash
22

3-
# Workaround to Klocwork overwriting LD_LIBRARY_PATH that was modified
4-
# by DPC++ compiler conda packages. Will need to be added to DPC++ compiler
5-
# activation scripts.
6-
export LDFLAGS="$LDFLAGS -Wl,-rpath,$PREFIX/lib"
7-
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PREFIX/compiler/lib/intel64_lin:$PREFIX/compiler/lib:$PREFIX/lib"
8-
93
# Intel LLVM must cooperate with compiler and sysroot from conda
104
echo "--gcc-toolchain=${BUILD_PREFIX} --sysroot=${BUILD_PREFIX}/${HOST}/sysroot -target ${HOST}" > icpx_for_conda.cfg
115
export ICPXCFG="$(pwd)/icpx_for_conda.cfg"
@@ -16,7 +10,7 @@ export TBB_ROOT_HINT=$PREFIX
1610
export DPL_ROOT_HINT=$PREFIX
1711
export MKL_ROOT_HINT=$PREFIX
1812
SKBUILD_ARGS="-- -DDPCTL_MODULE_PATH=$($PYTHON -m dpctl --cmakedir) "
19-
SKBUILD_ARGS="${SKBUILD_ARGS} -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icpx -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
13+
SKBUILD_ARGS="${SKBUILD_ARGS} -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icpx"
2014
SKBUILD_ARGS="${SKBUILD_ARGS} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
2115

2216
# Build wheel package

‎conda-recipe/meta.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ requirements:
1313
- cmake >=3.21
1414
- ninja
1515
- git
16-
- dpctl >=0.14.3
16+
- dpctl >=0.14.2
1717
- mkl-devel-dpcpp {{ environ.get('MKL_VER', '>=2023.1.0') }}
1818
- onedpl-devel
1919
- tbb-devel
@@ -25,7 +25,7 @@ requirements:
2525
- sysroot_linux-64 >=2.28 # [linux]
2626
run:
2727
- python
28-
- dpctl >=0.14.3
28+
- dpctl >=0.14.2
2929
- {{ pin_compatible('dpcpp-cpp-rt', min_pin='x.x', max_pin='x') }}
3030
- {{ pin_compatible('mkl-dpcpp', min_pin='x.x', max_pin='x') }}
3131
- {{ pin_compatible('numpy', min_pin='x.x', max_pin='x') }}

‎doc/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
author = 'Intel'
3232

3333
# The short X.Y version
34-
version = '0.12'
34+
version = '0.11'
3535
# The full version, including alpha/beta/rc tags
36-
release = '0.12.0'
36+
release = '0.11.2dev1'
3737

3838

3939
# -- General configuration ---------------------------------------------------

‎dpnp/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@
2727
import os
2828
mypath = os.path.dirname(os.path.realpath(__file__))
2929

30-
# workaround against hanging in OneMKL calls and in DPCTL
31-
os.environ.setdefault('SYCL_QUEUE_THREAD_POOL_SIZE', '6')
32-
3330
import dpctl
3431
dpctlpath = os.path.dirname(dpctl.__file__)
3532

@@ -44,6 +41,9 @@
4441
os.add_dll_directory(dpctlpath)
4542
os.environ["PATH"] = os.pathsep.join([os.getenv("PATH", ""), mypath, dpctlpath])
4643

44+
# workaround against hanging in OneMKL calls
45+
os.environ.setdefault('SYCL_QUEUE_THREAD_POOL_SIZE', '6')
46+
4747
from dpnp.dpnp_array import dpnp_array as ndarray
4848
from dpnp.dpnp_flatiter import flatiter as flatiter
4949

‎dpnp/backend/doc/Doxyfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = "DPNP C++ backend kernel library"
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = 0.12.0
41+
PROJECT_NUMBER = 0.11.2dev1
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a

‎dpnp/backend/include/dpnp_iface_fptr.hpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ enum class DPNPFuncName : size_t
124124
DPNP_FN_COUNT_NONZERO, /**< Used in numpy.count_nonzero() impl */
125125
DPNP_FN_COUNT_NONZERO_EXT, /**< Used in numpy.count_nonzero() impl, requires extra parameters */
126126
DPNP_FN_COV, /**< Used in numpy.cov() impl */
127+
DPNP_FN_COV_EXT, /**< Used in numpy.cov() impl, requires extra parameters */
127128
DPNP_FN_CROSS, /**< Used in numpy.cross() impl */
128129
DPNP_FN_CROSS_EXT, /**< Used in numpy.cross() impl, requires extra parameters */
129130
DPNP_FN_CUMPROD, /**< Used in numpy.cumprod() impl */
@@ -217,6 +218,7 @@ enum class DPNPFuncName : size_t
217218
DPNP_FN_MAXIMUM, /**< Used in numpy.maximum() impl */
218219
DPNP_FN_MAXIMUM_EXT, /**< Used in numpy.maximum() impl , requires extra parameters */
219220
DPNP_FN_MEAN, /**< Used in numpy.mean() impl */
221+
DPNP_FN_MEAN_EXT, /**< Used in numpy.mean() impl, requires extra parameters */
220222
DPNP_FN_MEDIAN, /**< Used in numpy.median() impl */
221223
DPNP_FN_MEDIAN_EXT, /**< Used in numpy.median() impl, requires extra parameters */
222224
DPNP_FN_MIN, /**< Used in numpy.min() impl */
@@ -358,6 +360,7 @@ enum class DPNPFuncName : size_t
358360
DPNP_FN_TANH, /**< Used in numpy.tanh() impl */
359361
DPNP_FN_TANH_EXT, /**< Used in numpy.tanh() impl, requires extra parameters */
360362
DPNP_FN_TRANSPOSE, /**< Used in numpy.transpose() impl */
363+
DPNP_FN_TRANSPOSE_EXT, /**< Used in numpy.transpose() impl, requires extra parameters */
361364
DPNP_FN_TRACE, /**< Used in numpy.trace() impl */
362365
DPNP_FN_TRACE_EXT, /**< Used in numpy.trace() impl, requires extra parameters */
363366
DPNP_FN_TRAPZ, /**< Used in numpy.trapz() impl */

‎dpnp/backend/kernels/dpnp_krnl_manipulation.cpp

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//*****************************************************************************
2-
// Copyright (c) 2016-2023, Intel Corporation
2+
// Copyright (c) 2016-2020, Intel Corporation
33
// All rights reserved.
44
//
55
// Redistribution and use in source and binary forms, with or without
@@ -211,7 +211,6 @@ void dpnp_elemwise_transpose_c(void* array1_in,
211211
size,
212212
dep_event_vec_ref);
213213
DPCTLEvent_WaitAndThrow(event_ref);
214-
DPCTLEvent_Delete(event_ref);
215214
}
216215

217216
template <typename _DataType>
@@ -223,6 +222,17 @@ void (*dpnp_elemwise_transpose_default_c)(void*,
223222
void*,
224223
size_t) = dpnp_elemwise_transpose_c<_DataType>;
225224

225+
template <typename _DataType>
226+
DPCTLSyclEventRef (*dpnp_elemwise_transpose_ext_c)(DPCTLSyclQueueRef,
227+
void*,
228+
const shape_elem_type*,
229+
const shape_elem_type*,
230+
const shape_elem_type*,
231+
size_t,
232+
void*,
233+
size_t,
234+
const DPCTLEventVectorRef) = dpnp_elemwise_transpose_c<_DataType>;
235+
226236
void func_map_init_manipulation(func_map_t& fmap)
227237
{
228238
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)
243253
(void*)dpnp_elemwise_transpose_default_c<float>};
244254
fmap[DPNPFuncName::DPNP_FN_TRANSPOSE][eft_DBL][eft_DBL] = {eft_DBL,
245255
(void*)dpnp_elemwise_transpose_default_c<double>};
256+
257+
fmap[DPNPFuncName::DPNP_FN_TRANSPOSE_EXT][eft_INT][eft_INT] = {eft_INT,
258+
(void*)dpnp_elemwise_transpose_ext_c<int32_t>};
259+
fmap[DPNPFuncName::DPNP_FN_TRANSPOSE_EXT][eft_LNG][eft_LNG] = {eft_LNG,
260+
(void*)dpnp_elemwise_transpose_ext_c<int64_t>};
261+
fmap[DPNPFuncName::DPNP_FN_TRANSPOSE_EXT][eft_FLT][eft_FLT] = {eft_FLT,
262+
(void*)dpnp_elemwise_transpose_ext_c<float>};
263+
fmap[DPNPFuncName::DPNP_FN_TRANSPOSE_EXT][eft_DBL][eft_DBL] = {eft_DBL,
264+
(void*)dpnp_elemwise_transpose_ext_c<double>};
265+
246266
return;
247267
}

0 commit comments

Comments
 (0)