Skip to content
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.

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

Migrate make to ICX/ICPX for Windows #2712

Open
wants to merge 118 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 96 commits
Commits
Show all changes
118 commits
Select commit Hold shift + click to select a range
351ac8a
init commit
Alexandr-Solovev Apr 8, 2024
7a3d95c
minor fix
Alexandr-Solovev Apr 9, 2024
b3225ba
minor fix
Alexandr-Solovev Apr 9, 2024
ebe2e71
drop c++11
Alexandr-Solovev Apr 9, 2024
a49da6a
minor fixes
Alexandr-Solovev Apr 9, 2024
204dcb9
minor fix
Alexandr-Solovev Apr 9, 2024
d8c5f8b
drop c++11
Alexandr-Solovev Apr 9, 2024
3b36216
minor fixes with extern
Alexandr-Solovev Apr 9, 2024
fe8ac3a
remove DAAL_IMPLEMENTATION
Alexandr-Solovev Apr 9, 2024
15c4839
minor fix
Alexandr-Solovev Apr 9, 2024
45f9eab
aligning win and lnx
Alexandr-Solovev Apr 10, 2024
a21bc6a
drop icc
Alexandr-Solovev Apr 11, 2024
c15acbe
minor fix
Alexandr-Solovev Apr 11, 2024
1691cb8
drop c++11
Alexandr-Solovev Apr 11, 2024
f99d304
update tokens
Alexandr-Solovev Apr 11, 2024
6f62aa9
minor fix
Alexandr-Solovev Apr 11, 2024
9758af1
minor fix
Alexandr-Solovev Apr 11, 2024
ac57a51
minor fix
Alexandr-Solovev Apr 11, 2024
6cf2370
minor fix
Alexandr-Solovev Apr 11, 2024
a5c5775
minor fix
Alexandr-Solovev Apr 11, 2024
d269d3e
minor fix
Alexandr-Solovev Apr 11, 2024
bb64859
fixes for icpx
Alexandr-Solovev Apr 12, 2024
70949a4
minor fix
Alexandr-Solovev Apr 12, 2024
ee49893
minor fix
Alexandr-Solovev Apr 12, 2024
97dc166
minor fix
Alexandr-Solovev Apr 12, 2024
532de88
minor
Alexandr-Solovev Apr 12, 2024
971d5ae
minor fix
Alexandr-Solovev Apr 15, 2024
a9282b8
minor fixes
Alexandr-Solovev Apr 15, 2024
99be97c
fixes for DAAL building
Alexandr-Solovev Apr 15, 2024
41686e2
fixes for DAAL building cov
Alexandr-Solovev Apr 15, 2024
8792602
minor fixes
Alexandr-Solovev Apr 15, 2024
b8ecd8d
minor fixes
Alexandr-Solovev Apr 15, 2024
409776b
minor fixes for LOM
Alexandr-Solovev Apr 15, 2024
7c4d9a0
minor fixes for PCA
Alexandr-Solovev Apr 15, 2024
05d5dac
minor fixes for typename
Alexandr-Solovev Apr 15, 2024
1be177b
minor fixes for typename
Alexandr-Solovev Apr 15, 2024
9c931f4
minor fixes for typename
Alexandr-Solovev Apr 15, 2024
295f29b
more fixes
Alexandr-Solovev Apr 15, 2024
1672a4d
more fixes
Alexandr-Solovev Apr 15, 2024
db46db7
rm error flag
Alexandr-Solovev Apr 15, 2024
c1c72e2
rm error flag
Alexandr-Solovev Apr 15, 2024
8ec1601
minor fixes
Alexandr-Solovev Apr 15, 2024
59672a7
minor fixes
Alexandr-Solovev Apr 15, 2024
dfaea38
fix for pca
Alexandr-Solovev Apr 15, 2024
da74329
fix flags
Alexandr-Solovev Apr 15, 2024
44227fe
restoring icc
Alexandr-Solovev Apr 15, 2024
11ca8a5
fix for eternals
Alexandr-Solovev Apr 15, 2024
f5fd80e
maybe unused adding
Alexandr-Solovev Apr 15, 2024
b9b3e7b
fix unused variable
Alexandr-Solovev Apr 15, 2024
a6905a1
back to icx in dpcpp
Alexandr-Solovev Apr 15, 2024
85b1f23
minor fixes
Alexandr-Solovev Apr 15, 2024
17e4f17
add ehsc flag
Alexandr-Solovev Apr 15, 2024
5905f5f
minor fix for pca
Alexandr-Solovev Apr 15, 2024
afbaf12
zscore fix
Alexandr-Solovev Apr 15, 2024
13eebe4
minor fix
Alexandr-Solovev Apr 16, 2024
f3403d6
fix for pca normalization
Alexandr-Solovev Apr 16, 2024
6b4b046
add daal_exports
Alexandr-Solovev Apr 16, 2024
263ad17
minor fix
Alexandr-Solovev Apr 16, 2024
6c71642
fix daal export
Alexandr-Solovev Apr 16, 2024
6481b35
minor fix
Alexandr-Solovev Apr 16, 2024
71ae548
minor fixes
Alexandr-Solovev Apr 16, 2024
ee06bd5
fix for SVD
Alexandr-Solovev Apr 16, 2024
c75cd9c
minor fixes
Alexandr-Solovev Apr 16, 2024
1fe8a6c
minor fix
Alexandr-Solovev Apr 16, 2024
036202a
minor fixes
Alexandr-Solovev Apr 16, 2024
cdf6af4
svd fixes
Alexandr-Solovev Apr 16, 2024
4daf784
minor fix
Alexandr-Solovev Apr 16, 2024
e77bedd
fix for clang
Alexandr-Solovev Apr 16, 2024
d8c5733
Merge branch 'oneapi-src:main' into dev/asolovev_win_icx_migration
Alexandr-Solovev Apr 16, 2024
45057f6
fix distributed kmeans and dbscan
Alexandr-Solovev Apr 16, 2024
288ca32
fix for kmeans
Alexandr-Solovev Apr 16, 2024
c4349ad
minor fix
Alexandr-Solovev Apr 16, 2024
97ef736
minor fixes
Alexandr-Solovev Apr 16, 2024
a225f16
fix for svd
Alexandr-Solovev Apr 17, 2024
894e1a2
fix for svd
Alexandr-Solovev Apr 17, 2024
a2dedf2
fixes for transform and pca
Alexandr-Solovev Apr 17, 2024
2ba3770
fixes
Alexandr-Solovev Apr 17, 2024
5c78cd6
fixes pca(prev commit build fine)
Alexandr-Solovev Apr 17, 2024
b12e495
minor fixes
Alexandr-Solovev Apr 17, 2024
d116ef0
minor fixes for pca
Alexandr-Solovev Apr 17, 2024
874a39e
fixes for pca
Alexandr-Solovev Apr 17, 2024
bf93d98
Merge branch 'oneapi-src:main' into dev/asolovev_win_icx_migration
Alexandr-Solovev Apr 17, 2024
2ec1541
Merge branch 'oneapi-src:main' into dev/asolovev_win_icx_migration
Alexandr-Solovev Apr 17, 2024
e3d89c2
minor fix for icl
Alexandr-Solovev Apr 17, 2024
6f787c1
minor fix for makefile
Alexandr-Solovev Apr 18, 2024
fbfc3bb
add new exports
Alexandr-Solovev Apr 18, 2024
c380439
makefile fix
Alexandr-Solovev Apr 18, 2024
402c1de
minor fix
Alexandr-Solovev Apr 18, 2024
36207d1
minor fixes
Alexandr-Solovev Apr 19, 2024
e06b4b5
minor fixes for unresolved symbols
Alexandr-Solovev Apr 19, 2024
c5a6d6b
minor fixes
Alexandr-Solovev Apr 19, 2024
40590c6
minor fixes
Alexandr-Solovev Apr 19, 2024
2f437a2
minor fix
Alexandr-Solovev Apr 19, 2024
f49d780
fix for win
Alexandr-Solovev Apr 19, 2024
b691ea4
minor fix
Alexandr-Solovev Apr 22, 2024
942c7da
minor fix
Alexandr-Solovev Apr 22, 2024
295c372
Update dev/make/compiler_definitions/icx.mkl.32e.mk
Alexandr-Solovev Apr 22, 2024
932dae8
minor fix for export
Alexandr-Solovev Apr 22, 2024
1236120
minor fix
Alexandr-Solovev Apr 22, 2024
c176487
temporary revert
Alexandr-Solovev Apr 22, 2024
b3fd6fc
fix for compiler
Alexandr-Solovev Apr 22, 2024
273946b
fix for win
Alexandr-Solovev Apr 22, 2024
deaf1b6
fixes for serialization tag
Alexandr-Solovev Apr 22, 2024
1d62f07
fix for serialization
Alexandr-Solovev Apr 22, 2024
2e12b18
minor fix
Alexandr-Solovev Apr 23, 2024
87e2a64
fix for pca partial
Alexandr-Solovev Apr 23, 2024
de8a26f
minor fix
Alexandr-Solovev Apr 23, 2024
a530644
clang fix
Alexandr-Solovev Apr 23, 2024
eee8adb
minor fix
Alexandr-Solovev Apr 24, 2024
defd8b6
Merge branch 'main' into dev/asolovev_win_icx_migration
Alexandr-Solovev Apr 30, 2024
d796494
minor fix
Alexandr-Solovev Apr 30, 2024
e0a0f56
Merge branch 'oneapi-src:main' into dev/asolovev_win_icx_migration
Alexandr-Solovev May 6, 2024
18570ea
Merge branch 'main' into dev/asolovev_win_icx_migration
Alexandr-Solovev May 24, 2024
5bf7920
fix
Alexandr-Solovev May 27, 2024
c4b5de0
Merge branch 'oneapi-src:main' into dev/asolovev_win_icx_migration
Alexandr-Solovev Jun 18, 2024
6ba7c2b
Merge branch 'oneapi-src:main' into dev/asolovev_win_icx_migration
Alexandr-Solovev Jun 24, 2024
816e0ee
fix dynamic link
Alexandr-Solovev Jun 24, 2024
357d554
fix
Alexandr-Solovev Jun 24, 2024
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
4 changes: 4 additions & 0 deletions .ci/scripts/describe_system.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ if [ -x "$(command -v icc)" ]; then
echo "ICC:"
icc --version
fi
if [ -x "$(command -v icx)" ]; then
echo "ICX:"
icx --version
fi
Comment on lines +57 to +60
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AR: same should be applied for sklearnex repo script

if [ -x "$(command -v icpx)" ]; then
echo "ICPX:"
icpx --version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,11 @@ class AlgorithmContainerImpl<batch> : public AlgorithmContainer<batch>
#if defined(TARGET_X86_64)
template <typename sse2Container DAAL_KERNEL_SSE42_ONLY(typename sse42Container) DAAL_KERNEL_AVX2_ONLY(typename avx2Container)
DAAL_KERNEL_AVX512_ONLY(typename avx512Container)>
class DAAL_EXPORT AlgorithmDispatchContainer<batch, sse2Container DAAL_KERNEL_SSE42_ONLY(sse42Container) DAAL_KERNEL_AVX2_ONLY(avx2Container)
DAAL_KERNEL_AVX512_ONLY(avx512Container)> : public AlgorithmContainerImpl<batch>
class AlgorithmDispatchContainer<batch, sse2Container DAAL_KERNEL_SSE42_ONLY(sse42Container) DAAL_KERNEL_AVX2_ONLY(avx2Container)
DAAL_KERNEL_AVX512_ONLY(avx512Container)> : public AlgorithmContainerImpl<batch>
#elif defined(TARGET_ARM)
template <typename SVEContainer DAAL_KERNEL_SVE_ONLY(typename sveContainer)>
class DAAL_EXPORT AlgorithmDispatchContainer<batch, SVEContainer DAAL_KERNEL_SVE_ONLY(sveContainer)> : public AlgorithmContainerImpl<batch>
class AlgorithmDispatchContainer<batch, SVEContainer DAAL_KERNEL_SVE_ONLY(sveContainer)> : public AlgorithmContainerImpl<batch>
#endif
{
public:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ class DistributedContainer<step2Master, algorithmFPType, sumCSR, cpu> : public D
* - Result class
*/
template <ComputeStep step>
class DAAL_EXPORT DistributedIface : public daal::algorithms::Analysis<distributed>
class DistributedIface : public daal::algorithms::Analysis<distributed>
{};

/**
Expand Down Expand Up @@ -383,7 +383,7 @@ class DistributedIface<step1Local> : public OnlineImpl
* - Result class
*/
template <>
class DAAL_EXPORT DistributedIface<step2Master> : public daal::algorithms::Analysis<distributed>
class DistributedIface<step2Master> : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::covariance::DistributedInput<step2Master> InputType;
Expand Down Expand Up @@ -529,7 +529,7 @@ class DAAL_EXPORT DistributedIface<step2Master> : public daal::algorithms::Analy
* - Result class
*/
template <ComputeStep step, typename algorithmFPType = DAAL_ALGORITHM_FP_TYPE, Method method = defaultDense>
class DAAL_EXPORT Distributed : public DistributedIface<step>
class Distributed : public DistributedIface<step>
{};

/**
Expand All @@ -554,7 +554,7 @@ class DAAL_EXPORT Distributed : public DistributedIface<step>
* - Result class
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step1Local, algorithmFPType, method> : public Online<algorithmFPType, method>
class Distributed<step1Local, algorithmFPType, method> : public Online<algorithmFPType, method>
{
public:
typedef Online<algorithmFPType, method> super;
Expand Down Expand Up @@ -615,7 +615,7 @@ class DAAL_EXPORT Distributed<step1Local, algorithmFPType, method> : public Onli
* - Result class
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step2Master, algorithmFPType, method> : public DistributedIface<step2Master>
class Distributed<step2Master, algorithmFPType, method> : public DistributedIface<step2Master>
{
public:
typedef DistributedIface<step2Master> super;
Expand Down
26 changes: 13 additions & 13 deletions cpp/daal/include/algorithms/dbscan/dbscan_distributed.h
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ class DAAL_EXPORT Distributed
* - \ref ResultId Identifiers of results of the DBSCAN algorithm
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step1Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
class Distributed<step1Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::dbscan::DistributedInput<step1Local> InputType;
Expand Down Expand Up @@ -585,7 +585,7 @@ class DAAL_EXPORT Distributed<step1Local, algorithmFPType, method> : public daal
* - \ref ResultId Identifiers of results of the DBSCAN algorithm
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step2Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
class Distributed<step2Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::dbscan::DistributedInput<step2Local> InputType;
Expand Down Expand Up @@ -705,7 +705,7 @@ class DAAL_EXPORT Distributed<step2Local, algorithmFPType, method> : public daal
* - \ref ResultId Identifiers of results of the DBSCAN algorithm
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step3Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
class Distributed<step3Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::dbscan::DistributedInput<step3Local> InputType;
Expand Down Expand Up @@ -827,7 +827,7 @@ class DAAL_EXPORT Distributed<step3Local, algorithmFPType, method> : public daal
* - \ref ResultId Identifiers of results of the DBSCAN algorithm
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step4Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
class Distributed<step4Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::dbscan::DistributedInput<step4Local> InputType;
Expand Down Expand Up @@ -949,7 +949,7 @@ class DAAL_EXPORT Distributed<step4Local, algorithmFPType, method> : public daal
* - \ref ResultId Identifiers of results of the DBSCAN algorithm
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step5Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
class Distributed<step5Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::dbscan::DistributedInput<step5Local> InputType;
Expand Down Expand Up @@ -1070,7 +1070,7 @@ class DAAL_EXPORT Distributed<step5Local, algorithmFPType, method> : public daal
* - \ref ResultId Identifiers of results of the DBSCAN algorithm
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step6Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
class Distributed<step6Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::dbscan::DistributedInput<step6Local> InputType;
Expand Down Expand Up @@ -1192,7 +1192,7 @@ class DAAL_EXPORT Distributed<step6Local, algorithmFPType, method> : public daal
* - \ref ResultId Identifiers of results of the DBSCAN algorithm
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step7Master, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
class Distributed<step7Master, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::dbscan::DistributedInput<step7Master> InputType;
Expand Down Expand Up @@ -1298,7 +1298,7 @@ class DAAL_EXPORT Distributed<step7Master, algorithmFPType, method> : public daa
* - \ref ResultId Identifiers of results of the DBSCAN algorithm
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step8Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
class Distributed<step8Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::dbscan::DistributedInput<step8Local> InputType;
Expand Down Expand Up @@ -1418,7 +1418,7 @@ class DAAL_EXPORT Distributed<step8Local, algorithmFPType, method> : public daal
* - \ref ResultId Identifiers of results of the DBSCAN algorithm
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step9Master, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
class Distributed<step9Master, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::dbscan::DistributedInput<step9Master> InputType;
Expand Down Expand Up @@ -1544,7 +1544,7 @@ class DAAL_EXPORT Distributed<step9Master, algorithmFPType, method> : public daa
* - \ref ResultId Identifiers of results of the DBSCAN algorithm
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step10Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
class Distributed<step10Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::dbscan::DistributedInput<step10Local> InputType;
Expand Down Expand Up @@ -1664,7 +1664,7 @@ class DAAL_EXPORT Distributed<step10Local, algorithmFPType, method> : public daa
* - \ref ResultId Identifiers of results of the DBSCAN algorithm
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step11Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
class Distributed<step11Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::dbscan::DistributedInput<step11Local> InputType;
Expand Down Expand Up @@ -1784,7 +1784,7 @@ class DAAL_EXPORT Distributed<step11Local, algorithmFPType, method> : public daa
* - \ref ResultId Identifiers of results of the DBSCAN algorithm
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step12Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
class Distributed<step12Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::dbscan::DistributedInput<step12Local> InputType;
Expand Down Expand Up @@ -1904,7 +1904,7 @@ class DAAL_EXPORT Distributed<step12Local, algorithmFPType, method> : public daa
* - \ref ResultId Identifiers of results of the DBSCAN algorithm
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step13Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
class Distributed<step13Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::dbscan::DistributedInput<step13Local> InputType;
Expand Down
2 changes: 1 addition & 1 deletion cpp/daal/include/algorithms/engines/engine.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ namespace interface1
* <a name="DAAL-CLASS-ALGORITHMS__ENGINES__BATCHBASE"></a>
* \brief Class representing an engine
*/
class DAAL_EXPORT BatchBase : public daal::algorithms::Analysis<batch>
class BatchBase : public daal::algorithms::Analysis<batch>
{
public:
typedef algorithms::engines::Input InputType;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ class DistributedContainer<step4Local, algorithmFPType, method, cpu> : public Tr
* - \ref Method %Training methods of the implicit ALS algorithm in the first step of the distributed processing mode
*/
template <ComputeStep step, typename algorithmFPType = DAAL_ALGORITHM_FP_TYPE, Method method = fastCSR>
class DAAL_EXPORT Distributed : public Training<distributed>
class Distributed : public Training<distributed>
{};

/**
Expand All @@ -200,7 +200,7 @@ class DAAL_EXPORT Distributed : public Training<distributed>
* - \ref DistributedInput<step1Local> class
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step1Local, algorithmFPType, method> : public Training<distributed>
class Distributed<step1Local, algorithmFPType, method> : public Training<distributed>
{
public:
typedef algorithms::implicit_als::training::DistributedInput<step1Local> InputType;
Expand Down Expand Up @@ -307,7 +307,7 @@ class DAAL_EXPORT Distributed<step1Local, algorithmFPType, method> : public Trai
* - \ref DistributedInput<step2Master> class
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step2Master, algorithmFPType, method> : public Training<distributed>
class Distributed<step2Master, algorithmFPType, method> : public Training<distributed>
{
public:
typedef algorithms::implicit_als::training::DistributedInput<step2Master> InputType;
Expand Down Expand Up @@ -414,7 +414,7 @@ class DAAL_EXPORT Distributed<step2Master, algorithmFPType, method> : public Tra
* - \ref DistributedInput<step3Local> class
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step3Local, algorithmFPType, method> : public Training<distributed>
class Distributed<step3Local, algorithmFPType, method> : public Training<distributed>
{
public:
typedef algorithms::implicit_als::training::DistributedInput<step3Local> InputType;
Expand Down Expand Up @@ -521,7 +521,7 @@ class DAAL_EXPORT Distributed<step3Local, algorithmFPType, method> : public Trai
* - \ref DistributedInput<step4Local> class
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step4Local, algorithmFPType, method> : public Training<distributed>
class Distributed<step4Local, algorithmFPType, method> : public Training<distributed>
{
public:
typedef algorithms::implicit_als::training::DistributedInput<step4Local> InputType;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ class DistributedContainer<step2Local, algorithmFPType, method, cpu> : public Tr
* - \ref Method Initialization methods of the implicit ALS algorithm in the distributed processing mode
*/
template <ComputeStep step, typename algorithmFPType = DAAL_ALGORITHM_FP_TYPE, Method method = fastCSR>
class DAAL_EXPORT Distributed
class Distributed
{};

/**
Expand All @@ -138,7 +138,7 @@ class DAAL_EXPORT Distributed
* - \ref Method Initialization methods of the implicit ALS algorithm in the first step of the distributed processing mode
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step1Local, algorithmFPType, method> : public Training<distributed>
class Distributed<step1Local, algorithmFPType, method> : public Training<distributed>
{
public:
typedef algorithms::implicit_als::training::init::DistributedInput<step1Local> InputType;
Expand Down Expand Up @@ -237,7 +237,7 @@ class DAAL_EXPORT Distributed<step1Local, algorithmFPType, method> : public Trai
* - \ref Method Initialization methods of the implicit ALS algorithm in the second step of the distributed processing mode
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step2Local, algorithmFPType, method> : public Training<distributed>
class Distributed<step2Local, algorithmFPType, method> : public Training<distributed>
{
public:
typedef algorithms::implicit_als::training::init::DistributedInput<step2Local> InputType;
Expand Down
4 changes: 2 additions & 2 deletions cpp/daal/include/algorithms/kmeans/kmeans_distributed.h
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ class DAAL_EXPORT Distributed
* - \ref ResultId Identifiers of results of K-Means algorithm
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step1Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
class Distributed<step1Local, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::kmeans::Input InputType;
Expand Down Expand Up @@ -294,7 +294,7 @@ class DAAL_EXPORT Distributed<step1Local, algorithmFPType, method> : public daal
* - Input class
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step2Master, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
class Distributed<step2Master, algorithmFPType, method> : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::kmeans::DistributedStep2MasterInput InputType;
Expand Down
16 changes: 8 additions & 8 deletions cpp/daal/include/algorithms/kmeans/kmeans_init_distributed.h
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ class DistributedContainer<step5Master, algorithmFPType, method, cpu> : public d
* <a name="DAAL-CLASS-ALGORITHMS__KMEANS__INIT__DISTRIBUTED"></a>
* \brief Base class representing K-Means algorithm initialization in the distributed processing mode
*/
class DAAL_EXPORT DistributedBase : public daal::algorithms::Analysis<distributed>
class DistributedBase : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::kmeans::init::Parameter ParameterType;
Expand Down Expand Up @@ -290,7 +290,7 @@ class DAAL_EXPORT Distributed;
* - Result class
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step1Local, algorithmFPType, method> : public DistributedBase
class Distributed<step1Local, algorithmFPType, method> : public DistributedBase
{
public:
typedef algorithms::kmeans::init::Input InputType;
Expand Down Expand Up @@ -427,7 +427,7 @@ class DAAL_EXPORT Distributed<step1Local, algorithmFPType, method> : public Dist
* - Result class
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step2Master, algorithmFPType, method> : public DistributedBase
class Distributed<step2Master, algorithmFPType, method> : public DistributedBase
{
public:
typedef algorithms::kmeans::init::DistributedStep2MasterInput InputType;
Expand Down Expand Up @@ -572,7 +572,7 @@ class DAAL_EXPORT Distributed<step2Master, algorithmFPType, method> : public Dis
* <a name="DAAL-CLASS-ALGORITHMS__KMEANS__INIT__DISTRIBUTEDPLUSPLUS"></a>
* \brief Base class representing K-Means algorithm initialization in the distributed processing mode
*/
class DAAL_EXPORT DistributedStep2LocalPlusPlusBase : public daal::algorithms::Analysis<distributed>
class DistributedStep2LocalPlusPlusBase : public daal::algorithms::Analysis<distributed>
{
public:
typedef algorithms::kmeans::init::DistributedStep2LocalPlusPlusParameter ParameterType;
Expand Down Expand Up @@ -607,7 +607,7 @@ class DAAL_EXPORT DistributedStep2LocalPlusPlusBase : public daal::algorithms::A
* - DistributedStep2LocalPlusPlusPartialResult class
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step2Local, algorithmFPType, method> : public DistributedStep2LocalPlusPlusBase
class Distributed<step2Local, algorithmFPType, method> : public DistributedStep2LocalPlusPlusBase
{
public:
typedef algorithms::kmeans::init::DistributedStep2LocalPlusPlusInput InputType;
Expand Down Expand Up @@ -725,7 +725,7 @@ class DAAL_EXPORT Distributed<step2Local, algorithmFPType, method> : public Dist
* - DistributedStep3MasterPlusPlusPartialResult class
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step3Master, algorithmFPType, method> : public DistributedBase
class Distributed<step3Master, algorithmFPType, method> : public DistributedBase
{
public:
typedef algorithms::kmeans::init::DistributedStep3MasterPlusPlusInput InputType;
Expand Down Expand Up @@ -841,7 +841,7 @@ class DAAL_EXPORT Distributed<step3Master, algorithmFPType, method> : public Dis
* - DistributedStep4LocalPlusPlusPartialResult class
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step4Local, algorithmFPType, method> : public DistributedBase
class Distributed<step4Local, algorithmFPType, method> : public DistributedBase
{
public:
typedef algorithms::kmeans::init::DistributedStep4LocalPlusPlusInput InputType;
Expand Down Expand Up @@ -953,7 +953,7 @@ class DAAL_EXPORT Distributed<step4Local, algorithmFPType, method> : public Dist
* - DistributedStep5MasterPlusPlusPartialResult class
*/
template <typename algorithmFPType, Method method>
class DAAL_EXPORT Distributed<step5Master, algorithmFPType, method> : public DistributedBase
class Distributed<step5Master, algorithmFPType, method> : public DistributedBase
{
public:
typedef algorithms::kmeans::init::DistributedStep5MasterPlusPlusInput InputType;
Expand Down
Loading
Loading