Skip to content

remove MKL word from sources #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 6, 2020
Merged

remove MKL word from sources #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions dpnp/backend/backend_iface.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

/*
* This header file is for interface Cython with C++.
* It should not contains any backend specific headers (like SYCL or MKL) because
* It should not contains any backend specific headers (like SYCL or math library) because
* all included headers will be exposed in Cython compilation procedure
*
* We would like to avoid backend specific things in higher level Cython modules.
Expand Down Expand Up @@ -173,7 +173,7 @@ INP_DLLEXPORT void custom_prod_c(void* array, void* result, size_t size);

/**
* @ingroup BACKEND_API
* @brief MKL implementation of eig function
* @brief math library implementation of eig function
*
* @param [in] array1 Input array.
*
Expand All @@ -187,7 +187,7 @@ INP_DLLEXPORT void mkl_lapack_syevd_c(void* array1, void* result1, size_t size);

/**
* @ingroup BACKEND_API
* @brief MKL implementation of argsort function
* @brief math library implementation of argsort function
*
* @param [in] array Input array with data.
*
Expand All @@ -201,7 +201,7 @@ INP_DLLEXPORT void custom_argsort_c(void* array, void* result, size_t size);

/**
* @ingroup BACKEND_API
* @brief MKL implementation of sort function
* @brief math library implementation of sort function
*
* @param [in] array Input array with data.
*
Expand All @@ -215,7 +215,7 @@ INP_DLLEXPORT void custom_sort_c(void* array, void* result, size_t size);

/**
* @ingroup BACKEND_API
* @brief Custom implementation of cov function with MKL and PSTL
* @brief Custom implementation of cov function with math library and PSTL
*
* @param [in] array Input array.
*
Expand All @@ -231,7 +231,7 @@ INP_DLLEXPORT void custom_cov_c(void* array1_in, void* result1, size_t nrows, si

/**
* @ingroup BACKEND_API
* @brief MKL implementation of max function
* @brief math library implementation of max function
*
* @param [in] array Input array with data.
*
Expand All @@ -252,7 +252,7 @@ INP_DLLEXPORT void

/**
* @ingroup BACKEND_API
* @brief MKL implementation of mean function
* @brief math library implementation of mean function
*
* @param [in] array Input array with data.
*
Expand All @@ -273,7 +273,7 @@ INP_DLLEXPORT void

/**
* @ingroup BACKEND_API
* @brief MKL implementation of median function
* @brief math library implementation of median function
*
* @param [in] array Input array with data.
*
Expand All @@ -294,7 +294,7 @@ INP_DLLEXPORT void

/**
* @ingroup BACKEND_API
* @brief MKL implementation of min function
* @brief math library implementation of min function
*
* @param [in] array Input array with data.
*
Expand All @@ -315,7 +315,7 @@ INP_DLLEXPORT void

/**
* @ingroup BACKEND_API
* @brief MKL implementation of argmax function
* @brief math library implementation of argmax function
*
* @param [in] array Input array with data.
*
Expand All @@ -329,7 +329,7 @@ INP_DLLEXPORT void custom_argmax_c(void* array, void* result, size_t size);

/**
* @ingroup BACKEND_API
* @brief MKL implementation of argmin function
* @brief math library implementation of argmin function
*
* @param [in] array Input array with data.
*
Expand All @@ -343,7 +343,7 @@ INP_DLLEXPORT void custom_argmin_c(void* array, void* result, size_t size);

/**
* @ingroup BACKEND_API
* @brief MKL implementation of std function
* @brief math library implementation of std function
*
* @param [in] array Input array with data.
*
Expand All @@ -366,7 +366,7 @@ INP_DLLEXPORT void custom_std_c(

/**
* @ingroup BACKEND_API
* @brief MKL implementation of var function
* @brief math library implementation of var function
*
* @param [in] array Input array with data.
*
Expand Down Expand Up @@ -441,7 +441,7 @@ INP_DLLEXPORT void custom_elemwise_transpose_c(void* array1_in,

/**
* @ingroup BACKEND_API
* @brief MKL implementation of random number generator (gaussian continious distribution)
* @brief math library implementation of random number generator (gaussian continious distribution)
*
* @param [in] size Number of elements in `result` arrays.
*
Expand All @@ -453,7 +453,7 @@ INP_DLLEXPORT void mkl_rng_gaussian(void* result, size_t size);

/**
* @ingroup BACKEND_API
* @brief MKL implementation of random number generator (uniform distribution)
* @brief math library implementation of random number generator (uniform distribution)
*
* @param [in] low Left bound of array values.
*
Expand Down
2 changes: 1 addition & 1 deletion dpnp/backend/backend_iface_fptr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

/*
* This header file is for interface Cython with C++.
* It should not contains any backend specific headers (like SYCL or MKL) because
* It should not contains any backend specific headers (like SYCL or math library) because
* all included headers will be exposed in Cython compilation procedure
*
* Also, this file should contains documentation on functions and types
Expand Down
2 changes: 1 addition & 1 deletion dpnp/backend/backend_iface_fptr.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

/*
* This header file is for interface Cython with C++.
* It should not contains any backend specific headers (like SYCL or MKL) because
* It should not contains any backend specific headers (like SYCL or math library) because
* all included headers will be exposed in Cython compilation procedure
*
* We would like to avoid backend specific things in higher level Cython modules.
Expand Down
2 changes: 1 addition & 1 deletion dpnp/backend/custom_kernels.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ void custom_blas_gemm_c(void* array1_in, void* array2_in, void* result1, size_t

if constexpr (std::is_same<_DataType, double>::value || std::is_same<_DataType, float>::value)
{
// using std::max for these ldx variables is required by MKL
// using std::max for these ldx variables is required by math library
const std::int64_t lda = std::max<size_t>(1UL, size_k); // First dimensions of array_1
const std::int64_t ldb = std::max<size_t>(1UL, size_n); // First dimensions of array_2
const std::int64_t ldc = std::max<size_t>(1UL, size_n); // Fast dimensions of result
Expand Down
2 changes: 1 addition & 1 deletion dpnp/dpnp_iface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ def matmul(in_array1, in_array2, out=None):
cost_size = 4096 # 2D array shape(64, 64)
if ((in_array1.dtype == numpy.float64) or (in_array1.dtype == numpy.float32)):
"""
Floating point types are handled via original MKL better than SYCL MKL
Floating point types are handled via original math library better than SYCL math library
"""
cost_size = 262144 # 2D array shape(512, 512)

Expand Down
2 changes: 1 addition & 1 deletion dpnp/linalg/linalg.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ cpdef tuple dpnp_eig(dparray in_array1):
cdef DPNPFuncData kernel_data = get_dpnp_function_ptr(DPNP_FN_EIG, param1_type, param1_type)

result_type = dpnp_DPNPFuncType_to_dtype( < size_t > kernel_data.return_type)
# this array is used as input for MKL and will be overwritten with eigen vectors
# this array is used as input for math library and will be overwritten with eigen vectors
res_vec = in_array1.astype(result_type)
# ceate result array with type given by FPTR data
cdef dparray res_val = dparray((size1,), dtype=result_type)
Expand Down
25 changes: 0 additions & 25 deletions dpnp/mkl/__init__.py
View file
Open in desktop

This file was deleted.

75 changes: 0 additions & 75 deletions dpnp/mkl/inumpy_mkl.pxd
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions dpnp/mkl/inumpy_mkl.pyx
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions examples/example1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ def run_dgemm(executor, name, size, test_type, repetition):
print(f"...Test data type is {test_type}, each test repetitions {test_repetition}")

for size in [16, 32, 64, 128]: # , 256, 512, 1024, 2048, 4096]:
times_python, result_python = run_dgemm(numpy, " <NumPy>", size, test_type, test_repetition)
times_sycl, result_mkl = run_dgemm(dpnp, "<Intel MKL>", size, test_type, test_repetition)
times_python, result_python = run_dgemm(numpy, "<NumPy>", size, test_type, test_repetition)
times_sycl, result_mkl = run_dgemm(dpnp, " <DPNP>", size, test_type, test_repetition)

verification = False
if result_mkl == result_python:
Expand Down
4 changes: 2 additions & 2 deletions examples/example7.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ def run_function(executor, name, size, test_type, repetition):
print(f"...Test data type is {test_type}, each test repetitions {test_repetition}")

for size in [16, 32, 64, 128, 256, 512, 1024, 2048, 4096]:
time_python, result_python = run_function(numpy, " <NumPy>", size, test_type, test_repetition)
time_mkl, result_mkl = run_function(dpnp, "<Intel MKL>", size, test_type, test_repetition)
time_python, result_python = run_function(numpy, "<NumPy>", size, test_type, test_repetition)
time_mkl, result_mkl = run_function(dpnp, " <DPNP>", size, test_type, test_repetition)

if result_mkl == result_python:
verification = True
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@


"""
Search and set MKL environemnt
Search and set math library environemnt
"""
_mkl_rpath = []
_cmplr_rpath = []
Expand Down