From 02db74367b2b4e4551e54309dbbd30d8fe3fb8da Mon Sep 17 00:00:00 2001 From: Aleksandr Solovev Date: Mon, 2 Sep 2024 16:48:14 +0200 Subject: [PATCH] Migrate make to ICX/ICPX for Windows (#2712) --- .ci/pipeline/ci.yml | 2 +- .ci/scripts/describe_system.sh | 4 + .../algorithm_container_base_batch.h | 8 +- cpp/daal/include/algorithms/algorithm_types.h | 4 +- .../covariance/covariance_distributed.h | 10 +- .../algorithms/dbscan/dbscan_distributed.h | 26 ++-- cpp/daal/include/algorithms/engines/engine.h | 2 +- .../implicit_als_training_distributed.h | 10 +- .../implicit_als_training_init_distributed.h | 6 +- .../algorithms/kmeans/kmeans_distributed.h | 4 +- .../kmeans/kmeans_init_distributed.h | 16 +- .../linear_regression_training_distributed.h | 6 +- cpp/daal/include/algorithms/model.h | 2 +- .../moments/low_order_moments_distributed.h | 6 +- ...inomial_naive_bayes_training_distributed.h | 6 +- .../algorithms/normalization/zscore_types.h | 10 +- cpp/daal/include/algorithms/pca/pca_batch.h | 2 +- .../include/algorithms/pca/pca_distributed.h | 8 +- .../pca/pca_explained_variance_batch.h | 2 +- .../pca/pca_explained_variance_types.h | 6 +- cpp/daal/include/algorithms/pca/pca_online.h | 6 +- .../pca/pca_quality_metric_set_batch.h | 4 +- .../pca/pca_quality_metric_set_types.h | 14 +- cpp/daal/include/algorithms/pca/pca_types.h | 36 ++--- .../pca/transform/pca_transform_batch.h | 2 +- .../include/algorithms/qr/qr_distributed.h | 8 +- .../ridge_regression_training_distributed.h | 6 +- .../include/algorithms/svd/svd_distributed.h | 6 +- cpp/daal/include/algorithms/svd/svd_types.h | 6 +- cpp/daal/include/daal_win.h | 2 +- .../data_management/data/data_dictionary.h | 2 +- .../data_source/data_source_dictionary.h | 2 +- .../bernoulli/bernoulli_types_fpt.cpp | 4 +- .../distributions/normal/normal_types_fpt.cpp | 4 +- .../uniform/uniform_types_fpt.cpp | 4 +- .../elastic_net_training_result_fpt.cpp | 5 +- ...mplicit_als_predict_ratings_result_fpt.cpp | 5 +- .../bf_knn_classification_model_impl.h | 2 - .../lasso_regression_training_result_fpt.cpp | 5 +- .../linear_model_predict_batch_fpt.cpp | 5 +- .../linear_regression_training_result.h | 4 +- .../low_order_moments/moments_batch.h | 5 +- .../normalization/minmax/minmax_fpt.cpp | 4 +- .../normalization/minmax/minmax_parameter.cpp | 4 +- .../minmax/minmax_parameter_fpt.cpp | 8 +- .../normalization/zscore/zscore_fpt.cpp | 9 +- .../zscore/zscore_parameter_fpt.cpp | 12 +- .../pca/metrics/pca_quality_metric.h | 2 +- .../pca/metrics/pca_quality_metric_fpt.cpp | 4 +- .../algorithms/pca/pca_baseparameter_fpt.cpp | 6 +- .../pca_batchparameter_correlation_fpt.cpp | 8 +- .../pca/pca_batchparameter_svd_fpt.cpp | 4 +- .../pca_distributedparameter_correlation.h | 4 +- .../pca/pca_onlineparameter_correlation.h | 4 +- .../algorithms/pca/pca_onlineparameter_svd.h | 4 +- .../pca/pca_onlineparameter_svd_fpt.cpp | 4 +- .../pca/pca_partialresult_correlation.h | 8 +- .../pca/pca_partialresult_correlation_fpt.cpp | 10 +- .../algorithms/pca/pca_partialresult_svd.h | 8 +- .../pca/pca_partialresult_svd_fpt.cpp | 9 +- .../src/algorithms/pca/pca_result_fpt.cpp | 13 +- .../pca/transform/pca_transform_batch_fpt.cpp | 5 +- .../algorithms/qr/qr_dense_default_batch.h | 6 +- .../ridge_regression_training_result.h | 4 +- .../algorithms/svd/svd_dense_default_batch.h | 6 +- .../svd/svd_dense_default_batch_fpt.cpp | 10 +- .../svd/svd_dense_default_distr_step2.h | 5 +- .../svd/svd_dense_default_distr_step2_fpt.cpp | 9 +- .../svd/svd_dense_default_distr_step3.h | 5 +- .../svd/svd_dense_default_distr_step3_fpt.cpp | 8 +- .../algorithms/svd/svd_dense_default_online.h | 8 +- .../svd/svd_dense_default_online_fpt.cpp | 10 +- .../src/data_management/data_collection.cpp | 4 +- .../src/externals/core_threading_win_dll.cpp | 145 +++++++++--------- cpp/daal/src/externals/service_stat_mkl.h | 20 +-- cpp/daal/src/externals/service_stat_ref.h | 20 +-- cpp/daal/src/services/dll.rc | 4 +- cpp/daal/src/services/service_defines.h | 2 +- dev/bazel/toolchains/common.bzl | 2 + dev/make/compiler_definitions/icx.mkl.32e.mk | 33 ++-- .../onedal/build_app/build-application.rst | 14 +- makefile | 7 +- makefile.ver | 2 +- 83 files changed, 362 insertions(+), 369 deletions(-) mode change 100755 => 100644 cpp/daal/include/algorithms/svd/svd_types.h mode change 100755 => 100644 cpp/daal/src/algorithms/elastic_net/elastic_net_training_result_fpt.cpp mode change 100755 => 100644 cpp/daal/src/algorithms/lasso_regression/lasso_regression_training_result_fpt.cpp mode change 100755 => 100644 cpp/daal/src/algorithms/svd/svd_dense_default_distr_step2.h mode change 100755 => 100644 cpp/daal/src/algorithms/svd/svd_dense_default_online.h diff --git a/.ci/pipeline/ci.yml b/.ci/pipeline/ci.yml index d6a534708b4..a0620f66e9d 100755 --- a/.ci/pipeline/ci.yml +++ b/.ci/pipeline/ci.yml @@ -404,7 +404,7 @@ jobs: - job: 'LinuxMakeDPCPP' timeoutInMinutes: 0 variables: - release.dir: '__release_lnx_icx' + release.dir: '__release_lnx' platform.type : 'lnx32e' pool: vmImage: '$(VM_IMAGE)' diff --git a/.ci/scripts/describe_system.sh b/.ci/scripts/describe_system.sh index 498e91dce0d..bca87e85263 100755 --- a/.ci/scripts/describe_system.sh +++ b/.ci/scripts/describe_system.sh @@ -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 if [ -x "$(command -v icpx)" ]; then echo "ICPX:" icpx --version diff --git a/cpp/daal/include/algorithms/algorithm_container_base_batch.h b/cpp/daal/include/algorithms/algorithm_container_base_batch.h index 94d8fb000cb..71e147961aa 100644 --- a/cpp/daal/include/algorithms/algorithm_container_base_batch.h +++ b/cpp/daal/include/algorithms/algorithm_container_base_batch.h @@ -147,14 +147,14 @@ class AlgorithmContainerImpl : public AlgorithmContainer #if defined(TARGET_X86_64) template -class DAAL_EXPORT AlgorithmDispatchContainer : public AlgorithmContainerImpl +class AlgorithmDispatchContainer : public AlgorithmContainerImpl #elif defined(TARGET_ARM) template -class DAAL_EXPORT AlgorithmDispatchContainer : public AlgorithmContainerImpl +class AlgorithmDispatchContainer : public AlgorithmContainerImpl #elif defined(TARGET_RISCV64) template -class DAAL_EXPORT AlgorithmDispatchContainer : public AlgorithmContainerImpl +class AlgorithmDispatchContainer : public AlgorithmContainerImpl #endif { public: diff --git a/cpp/daal/include/algorithms/algorithm_types.h b/cpp/daal/include/algorithms/algorithm_types.h index aeea6b1b8ce..76719f80f2d 100644 --- a/cpp/daal/include/algorithms/algorithm_types.h +++ b/cpp/daal/include/algorithms/algorithm_types.h @@ -352,7 +352,7 @@ class PartialResult : public SerializableArgument /** * \copydoc daal::data_management::interface1::SerializationIface::getSerializationTag() */ - virtual int getSerializationTag() const { return 0; } + DAAL_EXPORT virtual int getSerializationTag() const { return 0; } /** * Retrieves the initialization flag @@ -423,7 +423,7 @@ class Result : public SerializableArgument /** * \copydoc daal::data_management::interface1::SerializationIface::getSerializationTag() */ - virtual int getSerializationTag() const { return 0; } + DAAL_EXPORT virtual int getSerializationTag() const { return 0; } /** * Checks the correctness of the final results structure diff --git a/cpp/daal/include/algorithms/covariance/covariance_distributed.h b/cpp/daal/include/algorithms/covariance/covariance_distributed.h index 3e0e8f5628a..f3cfad98338 100644 --- a/cpp/daal/include/algorithms/covariance/covariance_distributed.h +++ b/cpp/daal/include/algorithms/covariance/covariance_distributed.h @@ -302,7 +302,7 @@ class DistributedContainer : public D * - Result class */ template -class DAAL_EXPORT DistributedIface : public daal::algorithms::Analysis +class DistributedIface : public daal::algorithms::Analysis {}; /** @@ -383,7 +383,7 @@ class DistributedIface : public OnlineImpl * - Result class */ template <> -class DAAL_EXPORT DistributedIface : public daal::algorithms::Analysis +class DistributedIface : public daal::algorithms::Analysis { public: typedef algorithms::covariance::DistributedInput InputType; @@ -529,7 +529,7 @@ class DAAL_EXPORT DistributedIface : public daal::algorithms::Analy * - Result class */ template -class DAAL_EXPORT Distributed : public DistributedIface +class Distributed : public DistributedIface {}; /** @@ -554,7 +554,7 @@ class DAAL_EXPORT Distributed : public DistributedIface * - Result class */ template -class DAAL_EXPORT Distributed : public Online +class Distributed : public Online { public: typedef Online super; @@ -615,7 +615,7 @@ class DAAL_EXPORT Distributed : public Onli * - Result class */ template -class DAAL_EXPORT Distributed : public DistributedIface +class Distributed : public DistributedIface { public: typedef DistributedIface super; diff --git a/cpp/daal/include/algorithms/dbscan/dbscan_distributed.h b/cpp/daal/include/algorithms/dbscan/dbscan_distributed.h index 4badaf2f495..8b2ea059014 100644 --- a/cpp/daal/include/algorithms/dbscan/dbscan_distributed.h +++ b/cpp/daal/include/algorithms/dbscan/dbscan_distributed.h @@ -465,7 +465,7 @@ class DAAL_EXPORT Distributed * - \ref ResultId Identifiers of results of the DBSCAN algorithm */ template -class DAAL_EXPORT Distributed : public daal::algorithms::Analysis +class Distributed : public daal::algorithms::Analysis { public: typedef algorithms::dbscan::DistributedInput InputType; @@ -585,7 +585,7 @@ class DAAL_EXPORT Distributed : public daal * - \ref ResultId Identifiers of results of the DBSCAN algorithm */ template -class DAAL_EXPORT Distributed : public daal::algorithms::Analysis +class Distributed : public daal::algorithms::Analysis { public: typedef algorithms::dbscan::DistributedInput InputType; @@ -705,7 +705,7 @@ class DAAL_EXPORT Distributed : public daal * - \ref ResultId Identifiers of results of the DBSCAN algorithm */ template -class DAAL_EXPORT Distributed : public daal::algorithms::Analysis +class Distributed : public daal::algorithms::Analysis { public: typedef algorithms::dbscan::DistributedInput InputType; @@ -827,7 +827,7 @@ class DAAL_EXPORT Distributed : public daal * - \ref ResultId Identifiers of results of the DBSCAN algorithm */ template -class DAAL_EXPORT Distributed : public daal::algorithms::Analysis +class Distributed : public daal::algorithms::Analysis { public: typedef algorithms::dbscan::DistributedInput InputType; @@ -949,7 +949,7 @@ class DAAL_EXPORT Distributed : public daal * - \ref ResultId Identifiers of results of the DBSCAN algorithm */ template -class DAAL_EXPORT Distributed : public daal::algorithms::Analysis +class Distributed : public daal::algorithms::Analysis { public: typedef algorithms::dbscan::DistributedInput InputType; @@ -1070,7 +1070,7 @@ class DAAL_EXPORT Distributed : public daal * - \ref ResultId Identifiers of results of the DBSCAN algorithm */ template -class DAAL_EXPORT Distributed : public daal::algorithms::Analysis +class Distributed : public daal::algorithms::Analysis { public: typedef algorithms::dbscan::DistributedInput InputType; @@ -1192,7 +1192,7 @@ class DAAL_EXPORT Distributed : public daal * - \ref ResultId Identifiers of results of the DBSCAN algorithm */ template -class DAAL_EXPORT Distributed : public daal::algorithms::Analysis +class Distributed : public daal::algorithms::Analysis { public: typedef algorithms::dbscan::DistributedInput InputType; @@ -1298,7 +1298,7 @@ class DAAL_EXPORT Distributed : public daa * - \ref ResultId Identifiers of results of the DBSCAN algorithm */ template -class DAAL_EXPORT Distributed : public daal::algorithms::Analysis +class Distributed : public daal::algorithms::Analysis { public: typedef algorithms::dbscan::DistributedInput InputType; @@ -1418,7 +1418,7 @@ class DAAL_EXPORT Distributed : public daal * - \ref ResultId Identifiers of results of the DBSCAN algorithm */ template -class DAAL_EXPORT Distributed : public daal::algorithms::Analysis +class Distributed : public daal::algorithms::Analysis { public: typedef algorithms::dbscan::DistributedInput InputType; @@ -1544,7 +1544,7 @@ class DAAL_EXPORT Distributed : public daa * - \ref ResultId Identifiers of results of the DBSCAN algorithm */ template -class DAAL_EXPORT Distributed : public daal::algorithms::Analysis +class Distributed : public daal::algorithms::Analysis { public: typedef algorithms::dbscan::DistributedInput InputType; @@ -1664,7 +1664,7 @@ class DAAL_EXPORT Distributed : public daa * - \ref ResultId Identifiers of results of the DBSCAN algorithm */ template -class DAAL_EXPORT Distributed : public daal::algorithms::Analysis +class Distributed : public daal::algorithms::Analysis { public: typedef algorithms::dbscan::DistributedInput InputType; @@ -1784,7 +1784,7 @@ class DAAL_EXPORT Distributed : public daa * - \ref ResultId Identifiers of results of the DBSCAN algorithm */ template -class DAAL_EXPORT Distributed : public daal::algorithms::Analysis +class Distributed : public daal::algorithms::Analysis { public: typedef algorithms::dbscan::DistributedInput InputType; @@ -1904,7 +1904,7 @@ class DAAL_EXPORT Distributed : public daa * - \ref ResultId Identifiers of results of the DBSCAN algorithm */ template -class DAAL_EXPORT Distributed : public daal::algorithms::Analysis +class Distributed : public daal::algorithms::Analysis { public: typedef algorithms::dbscan::DistributedInput InputType; diff --git a/cpp/daal/include/algorithms/engines/engine.h b/cpp/daal/include/algorithms/engines/engine.h index e96bd18be62..25d0fb02790 100644 --- a/cpp/daal/include/algorithms/engines/engine.h +++ b/cpp/daal/include/algorithms/engines/engine.h @@ -42,7 +42,7 @@ namespace interface1 * * \brief Class representing an engine */ -class DAAL_EXPORT BatchBase : public daal::algorithms::Analysis +class BatchBase : public daal::algorithms::Analysis { public: typedef algorithms::engines::Input InputType; diff --git a/cpp/daal/include/algorithms/implicit_als/implicit_als_training_distributed.h b/cpp/daal/include/algorithms/implicit_als/implicit_als_training_distributed.h index 5b6f9c7234c..582929de2db 100644 --- a/cpp/daal/include/algorithms/implicit_als/implicit_als_training_distributed.h +++ b/cpp/daal/include/algorithms/implicit_als/implicit_als_training_distributed.h @@ -181,7 +181,7 @@ class DistributedContainer : public Tr * - \ref Method %Training methods of the implicit ALS algorithm in the first step of the distributed processing mode */ template -class DAAL_EXPORT Distributed : public Training +class Distributed : public Training {}; /** @@ -200,7 +200,7 @@ class DAAL_EXPORT Distributed : public Training * - \ref DistributedInput class */ template -class DAAL_EXPORT Distributed : public Training +class Distributed : public Training { public: typedef algorithms::implicit_als::training::DistributedInput InputType; @@ -307,7 +307,7 @@ class DAAL_EXPORT Distributed : public Trai * - \ref DistributedInput class */ template -class DAAL_EXPORT Distributed : public Training +class Distributed : public Training { public: typedef algorithms::implicit_als::training::DistributedInput InputType; @@ -414,7 +414,7 @@ class DAAL_EXPORT Distributed : public Tra * - \ref DistributedInput class */ template -class DAAL_EXPORT Distributed : public Training +class Distributed : public Training { public: typedef algorithms::implicit_als::training::DistributedInput InputType; @@ -521,7 +521,7 @@ class DAAL_EXPORT Distributed : public Trai * - \ref DistributedInput class */ template -class DAAL_EXPORT Distributed : public Training +class Distributed : public Training { public: typedef algorithms::implicit_als::training::DistributedInput InputType; diff --git a/cpp/daal/include/algorithms/implicit_als/implicit_als_training_init_distributed.h b/cpp/daal/include/algorithms/implicit_als/implicit_als_training_init_distributed.h index 20a1a5966aa..ee8c15f5bf3 100644 --- a/cpp/daal/include/algorithms/implicit_als/implicit_als_training_init_distributed.h +++ b/cpp/daal/include/algorithms/implicit_als/implicit_als_training_init_distributed.h @@ -123,7 +123,7 @@ class DistributedContainer : public Tr * - \ref Method Initialization methods of the implicit ALS algorithm in the distributed processing mode */ template -class DAAL_EXPORT Distributed +class Distributed {}; /** @@ -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 -class DAAL_EXPORT Distributed : public Training +class Distributed : public Training { public: typedef algorithms::implicit_als::training::init::DistributedInput InputType; @@ -237,7 +237,7 @@ class DAAL_EXPORT Distributed : public Trai * - \ref Method Initialization methods of the implicit ALS algorithm in the second step of the distributed processing mode */ template -class DAAL_EXPORT Distributed : public Training +class Distributed : public Training { public: typedef algorithms::implicit_als::training::init::DistributedInput InputType; diff --git a/cpp/daal/include/algorithms/kmeans/kmeans_distributed.h b/cpp/daal/include/algorithms/kmeans/kmeans_distributed.h index a3fb7e8cd2f..86a93f895ed 100644 --- a/cpp/daal/include/algorithms/kmeans/kmeans_distributed.h +++ b/cpp/daal/include/algorithms/kmeans/kmeans_distributed.h @@ -146,7 +146,7 @@ class DAAL_EXPORT Distributed * - \ref ResultId Identifiers of results of K-Means algorithm */ template -class DAAL_EXPORT Distributed : public daal::algorithms::Analysis +class Distributed : public daal::algorithms::Analysis { public: typedef algorithms::kmeans::Input InputType; @@ -294,7 +294,7 @@ class DAAL_EXPORT Distributed : public daal * - Input class */ template -class DAAL_EXPORT Distributed : public daal::algorithms::Analysis +class Distributed : public daal::algorithms::Analysis { public: typedef algorithms::kmeans::DistributedStep2MasterInput InputType; diff --git a/cpp/daal/include/algorithms/kmeans/kmeans_init_distributed.h b/cpp/daal/include/algorithms/kmeans/kmeans_init_distributed.h index 5beeaf3a67e..9669ec1a4b3 100644 --- a/cpp/daal/include/algorithms/kmeans/kmeans_init_distributed.h +++ b/cpp/daal/include/algorithms/kmeans/kmeans_init_distributed.h @@ -233,7 +233,7 @@ class DistributedContainer : public d * * \brief Base class representing K-Means algorithm initialization in the distributed processing mode */ -class DAAL_EXPORT DistributedBase : public daal::algorithms::Analysis +class DistributedBase : public daal::algorithms::Analysis { public: typedef algorithms::kmeans::init::Parameter ParameterType; @@ -290,7 +290,7 @@ class DAAL_EXPORT Distributed; * - Result class */ template -class DAAL_EXPORT Distributed : public DistributedBase +class Distributed : public DistributedBase { public: typedef algorithms::kmeans::init::Input InputType; @@ -427,7 +427,7 @@ class DAAL_EXPORT Distributed : public Dist * - Result class */ template -class DAAL_EXPORT Distributed : public DistributedBase +class Distributed : public DistributedBase { public: typedef algorithms::kmeans::init::DistributedStep2MasterInput InputType; @@ -572,7 +572,7 @@ class DAAL_EXPORT Distributed : public Dis * * \brief Base class representing K-Means algorithm initialization in the distributed processing mode */ -class DAAL_EXPORT DistributedStep2LocalPlusPlusBase : public daal::algorithms::Analysis +class DistributedStep2LocalPlusPlusBase : public daal::algorithms::Analysis { public: typedef algorithms::kmeans::init::DistributedStep2LocalPlusPlusParameter ParameterType; @@ -607,7 +607,7 @@ class DAAL_EXPORT DistributedStep2LocalPlusPlusBase : public daal::algorithms::A * - DistributedStep2LocalPlusPlusPartialResult class */ template -class DAAL_EXPORT Distributed : public DistributedStep2LocalPlusPlusBase +class Distributed : public DistributedStep2LocalPlusPlusBase { public: typedef algorithms::kmeans::init::DistributedStep2LocalPlusPlusInput InputType; @@ -725,7 +725,7 @@ class DAAL_EXPORT Distributed : public Dist * - DistributedStep3MasterPlusPlusPartialResult class */ template -class DAAL_EXPORT Distributed : public DistributedBase +class Distributed : public DistributedBase { public: typedef algorithms::kmeans::init::DistributedStep3MasterPlusPlusInput InputType; @@ -841,7 +841,7 @@ class DAAL_EXPORT Distributed : public Dis * - DistributedStep4LocalPlusPlusPartialResult class */ template -class DAAL_EXPORT Distributed : public DistributedBase +class Distributed : public DistributedBase { public: typedef algorithms::kmeans::init::DistributedStep4LocalPlusPlusInput InputType; @@ -953,7 +953,7 @@ class DAAL_EXPORT Distributed : public Dist * - DistributedStep5MasterPlusPlusPartialResult class */ template -class DAAL_EXPORT Distributed : public DistributedBase +class Distributed : public DistributedBase { public: typedef algorithms::kmeans::init::DistributedStep5MasterPlusPlusInput InputType; diff --git a/cpp/daal/include/algorithms/linear_regression/linear_regression_training_distributed.h b/cpp/daal/include/algorithms/linear_regression/linear_regression_training_distributed.h index 25909e86ba8..3f613bfacd8 100644 --- a/cpp/daal/include/algorithms/linear_regression/linear_regression_training_distributed.h +++ b/cpp/daal/include/algorithms/linear_regression/linear_regression_training_distributed.h @@ -111,7 +111,7 @@ class DistributedContainer : public T * - \ref prediction::interface1::Batch "prediction::Batch" class */ template -class DAAL_EXPORT Distributed : public Training +class Distributed : public Training {}; /** @@ -134,7 +134,7 @@ class DAAL_EXPORT Distributed : public Training * - \ref prediction::interface1::Batch class */ template -class DAAL_EXPORT Distributed : public Online +class Distributed : public Online { public: typedef Online super; @@ -194,7 +194,7 @@ class DAAL_EXPORT Distributed : public Onli * - \ref prediction::interface1::Batch class */ template -class DAAL_EXPORT Distributed : public Training +class Distributed : public Training { public: typedef algorithms::linear_regression::training::DistributedInput InputType; diff --git a/cpp/daal/include/algorithms/model.h b/cpp/daal/include/algorithms/model.h index 064bcbf93d6..40265bfe7c5 100644 --- a/cpp/daal/include/algorithms/model.h +++ b/cpp/daal/include/algorithms/model.h @@ -62,7 +62,7 @@ class Model : public data_management::SerializationIface /** * \copydoc daal::data_management::interface1::SerializationIface::getSerializationTag() */ - int getSerializationTag() const DAAL_C11_OVERRIDE { return 0; } + DAAL_EXPORT int getSerializationTag() const DAAL_C11_OVERRIDE { return 0; } protected: template diff --git a/cpp/daal/include/algorithms/moments/low_order_moments_distributed.h b/cpp/daal/include/algorithms/moments/low_order_moments_distributed.h index 048c11bea60..156d45e3197 100644 --- a/cpp/daal/include/algorithms/moments/low_order_moments_distributed.h +++ b/cpp/daal/include/algorithms/moments/low_order_moments_distributed.h @@ -109,7 +109,7 @@ class DistributedContainer : public d * - Result class */ template -class DAAL_EXPORT Distributed +class Distributed {}; /** @@ -128,7 +128,7 @@ class DAAL_EXPORT Distributed * - \ref ResultId Identifiers of the results of the low order moments algorithm */ template -class DAAL_EXPORT Distributed : public Online +class Distributed : public Online { public: typedef Online super; @@ -185,7 +185,7 @@ class DAAL_EXPORT Distributed : public Onli * - \ref ResultId Identifiers of the results of the low order moments algorithm */ template -class DAAL_EXPORT Distributed : public daal::algorithms::Analysis +class Distributed : public daal::algorithms::Analysis { public: typedef algorithms::low_order_moments::DistributedInput InputType; diff --git a/cpp/daal/include/algorithms/naive_bayes/multinomial_naive_bayes_training_distributed.h b/cpp/daal/include/algorithms/naive_bayes/multinomial_naive_bayes_training_distributed.h index 34836f48895..3e2f106b388 100644 --- a/cpp/daal/include/algorithms/naive_bayes/multinomial_naive_bayes_training_distributed.h +++ b/cpp/daal/include/algorithms/naive_bayes/multinomial_naive_bayes_training_distributed.h @@ -100,7 +100,7 @@ class DistributedContainer : public T * */ template -class DAAL_EXPORT Distributed +class Distributed {}; /** @@ -117,7 +117,7 @@ class DAAL_EXPORT Distributed * */ template -class DAAL_EXPORT Distributed : public Online +class Distributed : public Online { public: typedef Online super; @@ -175,7 +175,7 @@ class DAAL_EXPORT Distributed : public Onli * */ template -class DAAL_EXPORT Distributed : public Training +class Distributed : public Training { public: typedef algorithms::multinomial_naive_bayes::training::DistributedInput InputType; diff --git a/cpp/daal/include/algorithms/normalization/zscore_types.h b/cpp/daal/include/algorithms/normalization/zscore_types.h index c806f30a728..9edc9e00eea 100644 --- a/cpp/daal/include/algorithms/normalization/zscore_types.h +++ b/cpp/daal/include/algorithms/normalization/zscore_types.h @@ -190,7 +190,7 @@ class DAAL_EXPORT Result : public daal::algorithms::Result * \return Status of computations */ template - DAAL_EXPORT services::Status allocate(const daal::algorithms::Input * input, const int method); + services::Status allocate(const daal::algorithms::Input * input, const int method); /** * Returns the final result of the z-score normalization algorithm @@ -245,14 +245,14 @@ namespace interface3 * \brief Class that specifies the parameters of the algorithm in the batch computing mode */ template -class DAAL_EXPORT Parameter +class Parameter {}; /** * * \brief Class that specifies the base parameters of the algorithm in the batch computing mode */ -class DAAL_EXPORT BaseParameter : public daal::algorithms::Parameter +class BaseParameter : public daal::algorithms::Parameter { public: BaseParameter(const bool doScale = true); @@ -265,7 +265,7 @@ class DAAL_EXPORT BaseParameter : public daal::algorithms::Parameter // * \brief Class that specifies the parameters of the default algorithm in the batch computing mode // */ template -class DAAL_EXPORT Parameter : public BaseParameter +class Parameter : public BaseParameter { public: Parameter(const bool doScale = true); @@ -276,7 +276,7 @@ class DAAL_EXPORT Parameter : public BaseParameter // * \brief Class that specifies the parameters of the default algorithm in the batch computing mode // */ template -class DAAL_EXPORT Parameter : public BaseParameter +class Parameter : public BaseParameter { public: /** Constructs z-score normalization parameters */ diff --git a/cpp/daal/include/algorithms/pca/pca_batch.h b/cpp/daal/include/algorithms/pca/pca_batch.h index bb3c73d0b3b..63e80ca6dea 100644 --- a/cpp/daal/include/algorithms/pca/pca_batch.h +++ b/cpp/daal/include/algorithms/pca/pca_batch.h @@ -105,7 +105,7 @@ class BatchContainer : public AnalysisContainerI * - \ref Method Computation methods for the algorithm */ template -class DAAL_EXPORT Batch : public Analysis +class Batch : public Analysis { public: typedef algorithms::pca::Input InputType; diff --git a/cpp/daal/include/algorithms/pca/pca_distributed.h b/cpp/daal/include/algorithms/pca/pca_distributed.h index d573e3458f9..3a80ed2a40a 100644 --- a/cpp/daal/include/algorithms/pca/pca_distributed.h +++ b/cpp/daal/include/algorithms/pca/pca_distributed.h @@ -152,7 +152,7 @@ class DistributedContainer : public * - \ref interface1::DistributedParameter class */ template -class DAAL_EXPORT Distributed : public Analysis +class Distributed : public Analysis {}; /** @@ -170,7 +170,7 @@ class DAAL_EXPORT Distributed : public Analysis * - \ref interface1::DistributedParameter class */ template -class DAAL_EXPORT Distributed : public Online +class Distributed : public Online { public: typedef Online super; @@ -218,7 +218,7 @@ class DAAL_EXPORT Distributed : public Onli * \tparam algorithmFPType Data type to use in intermediate computations of the PCA algorithm, double or float */ template -class DAAL_EXPORT Distributed : public Analysis +class Distributed : public Analysis { public: typedef algorithms::pca::DistributedInput InputType; @@ -348,7 +348,7 @@ class DAAL_EXPORT Distributed : * \tparam algorithmFPType Data type to use in intermediate computations of the PCA algorithm, double or float */ template -class DAAL_EXPORT Distributed : public Analysis +class Distributed : public Analysis { public: typedef algorithms::pca::DistributedInput InputType; diff --git a/cpp/daal/include/algorithms/pca/pca_explained_variance_batch.h b/cpp/daal/include/algorithms/pca/pca_explained_variance_batch.h index cd3737c60a8..827002ca1c1 100644 --- a/cpp/daal/include/algorithms/pca/pca_explained_variance_batch.h +++ b/cpp/daal/include/algorithms/pca/pca_explained_variance_batch.h @@ -84,7 +84,7 @@ class BatchContainer : public daal::algorithms::AnalysisContainerIface * - \ref ResultId %Result identifiers for the metric algorithm */ template -class DAAL_EXPORT Batch : public daal::algorithms::quality_metric::Batch +class Batch : public daal::algorithms::quality_metric::Batch { public: typedef algorithms::pca::quality_metric::explained_variance::Input InputType; diff --git a/cpp/daal/include/algorithms/pca/pca_explained_variance_types.h b/cpp/daal/include/algorithms/pca/pca_explained_variance_types.h index 5660458865f..02fd0bc26ca 100644 --- a/cpp/daal/include/algorithms/pca/pca_explained_variance_types.h +++ b/cpp/daal/include/algorithms/pca/pca_explained_variance_types.h @@ -87,9 +87,9 @@ namespace interface1 * \snippet pca/pca_explained_variance_types.h Parameter source code */ /* [Parameter source code] */ -struct DAAL_EXPORT Parameter : public daal::algorithms::Parameter +struct Parameter : public daal::algorithms::Parameter { - Parameter(size_t nFeatures, size_t nComponents); + DAAL_EXPORT Parameter(size_t nFeatures, size_t nComponents); virtual ~Parameter() {} size_t nFeatures; /*!< Number of features */ @@ -100,7 +100,7 @@ struct DAAL_EXPORT Parameter : public daal::algorithms::Parameter * * \return Status of computations */ - virtual services::Status check() const; + DAAL_EXPORT virtual services::Status check() const; }; /* [Parameter source code] */ diff --git a/cpp/daal/include/algorithms/pca/pca_online.h b/cpp/daal/include/algorithms/pca/pca_online.h index 61c544bba7e..7ad7bf9e06a 100644 --- a/cpp/daal/include/algorithms/pca/pca_online.h +++ b/cpp/daal/include/algorithms/pca/pca_online.h @@ -113,7 +113,7 @@ class OnlineContainer : public AnalysisContainer * \tparam algorithmFPType Data type to use in intermediate computations of the PCA algorithm, double or float */ template -class DAAL_EXPORT Online : public Analysis +class Online : public Analysis {}; /** @@ -124,7 +124,7 @@ class DAAL_EXPORT Online : public Analysis * \tparam algorithmFPType Data type to use in intermediate computations of the PCA algorithm, double or float */ template -class DAAL_EXPORT Online : public Analysis +class Online : public Analysis { public: typedef algorithms::pca::Input InputType; @@ -250,7 +250,7 @@ class DAAL_EXPORT Online : public Analysis -class DAAL_EXPORT Online : public Analysis +class Online : public Analysis { public: typedef algorithms::pca::Input InputType; diff --git a/cpp/daal/include/algorithms/pca/pca_quality_metric_set_batch.h b/cpp/daal/include/algorithms/pca/pca_quality_metric_set_batch.h index 8ad0f651cd3..5c20f19e462 100644 --- a/cpp/daal/include/algorithms/pca/pca_quality_metric_set_batch.h +++ b/cpp/daal/include/algorithms/pca/pca_quality_metric_set_batch.h @@ -56,7 +56,7 @@ namespace interface1 * \par References * - \ref algorithms::quality_metric_set::interface1::InputAlgorithmsCollection "algorithms::quality_metric_set::InputAlgorithmsCollection" class */ -class DAAL_EXPORT Batch : public algorithms::quality_metric_set::Batch +class Batch : public algorithms::quality_metric_set::Batch { public: Parameter parameter; /*!< Parameters of the algorithm */ @@ -99,7 +99,7 @@ class DAAL_EXPORT Batch : public algorithms::quality_metric_set::Batch } protected: - virtual void initializeQualityMetrics(); + DAAL_EXPORT virtual void initializeQualityMetrics(); }; /** @} */ } // namespace interface1 diff --git a/cpp/daal/include/algorithms/pca/pca_quality_metric_set_types.h b/cpp/daal/include/algorithms/pca/pca_quality_metric_set_types.h index 06badd7b60a..947f9f771a5 100644 --- a/cpp/daal/include/algorithms/pca/pca_quality_metric_set_types.h +++ b/cpp/daal/include/algorithms/pca/pca_quality_metric_set_types.h @@ -64,9 +64,9 @@ namespace interface1 * \snippet pca/pca_quality_metric_set_types.h Parameter source code */ /* [Parameter source code] */ -struct DAAL_EXPORT Parameter : public daal::algorithms::Parameter +struct Parameter : public daal::algorithms::Parameter { - Parameter(size_t nComponents = 0, size_t nFeatures = 0); + DAAL_EXPORT Parameter(size_t nComponents = 0, size_t nFeatures = 0); virtual ~Parameter() {} @@ -78,7 +78,7 @@ struct DAAL_EXPORT Parameter : public daal::algorithms::Parameter * * \return Status of computations */ - virtual services::Status check() const; + DAAL_EXPORT virtual services::Status check() const; }; /* [Parameter source code] */ @@ -87,7 +87,7 @@ struct DAAL_EXPORT Parameter : public daal::algorithms::Parameter * \brief Class that implements functionality of the collection of result objects of the quality metrics algorithm * specialized for using with the pca algorithm */ -class DAAL_EXPORT ResultCollection : public algorithms::quality_metric_set::ResultCollection +class ResultCollection : public algorithms::quality_metric_set::ResultCollection { public: ResultCollection() {} @@ -98,7 +98,7 @@ class DAAL_EXPORT ResultCollection : public algorithms::quality_metric_set::Resu * \param[in] id Identifier of the result * \return Result that corresponds to the given identifier */ - algorithms::ResultPtr getResult(QualityMetricId id) const; + DAAL_EXPORT algorithms::ResultPtr getResult(QualityMetricId id) const; }; typedef services::SharedPtr ResultCollectionPtr; @@ -107,7 +107,7 @@ typedef services::SharedPtr ResultCollectionPtr; * \brief Class that implements functionality of the collection of input objects of the quality metrics algorithm * specialized for using with the pca algorithm */ -class DAAL_EXPORT InputDataCollection : public algorithms::quality_metric_set::InputDataCollection +class InputDataCollection : public algorithms::quality_metric_set::InputDataCollection { public: InputDataCollection() {} @@ -118,7 +118,7 @@ class DAAL_EXPORT InputDataCollection : public algorithms::quality_metric_set::I * \param[in] id Identifier of the input object * \return %Input object that corresponds to the given identifier */ - algorithms::InputPtr getInput(QualityMetricId id) const; + DAAL_EXPORT algorithms::InputPtr getInput(QualityMetricId id) const; }; typedef services::SharedPtr InputDataCollectionPtr; diff --git a/cpp/daal/include/algorithms/pca/pca_types.h b/cpp/daal/include/algorithms/pca/pca_types.h index 9a9daa4f987..c3fb0846cb8 100644 --- a/cpp/daal/include/algorithms/pca/pca_types.h +++ b/cpp/daal/include/algorithms/pca/pca_types.h @@ -167,7 +167,7 @@ namespace interface1 /** * * \brief Abstract class that specifies interface for classes that declare input of the PCA algorithm */ -class DAAL_EXPORT InputIface : public daal::algorithms::Input +class InputIface : public daal::algorithms::Input { public: InputIface(size_t nElements); @@ -465,7 +465,7 @@ class DAAL_EXPORT BaseParameter : public daal::algorithms::Parameter * \brief Class that specifies the parameters of the PCA algorithm in the online computing mode */ template -class OnlineParameter : public BaseParameter +class DAAL_EXPORT OnlineParameter : public BaseParameter {}; /** @@ -473,7 +473,7 @@ class OnlineParameter : public BaseParameter * \brief Class that specifies the parameters of the PCA Correlation algorithm in the online computing mode */ template -class DAAL_EXPORT OnlineParameter : public BaseParameter +class OnlineParameter : public BaseParameter { public: /** Constructs PCA parameters */ @@ -495,7 +495,7 @@ class DAAL_EXPORT OnlineParameter : public Ba * \brief Class that specifies the parameters of the PCA SVD algorithm in the online computing mode */ template -class DAAL_EXPORT OnlineParameter : public BaseParameter +class OnlineParameter : public BaseParameter { public: /** Constructs PCA parameters */ @@ -521,7 +521,7 @@ class DistributedParameter : public BaseParameter * \brief Class that specifies the parameters of the PCA Correlation algorithm in the distributed computing mode */ template -class DAAL_EXPORT DistributedParameter : public BaseParameter +class DistributedParameter : public BaseParameter { public: /** Constructs PCA parameters */ @@ -551,18 +551,18 @@ class DistributedInput * \brief Input objects for the PCA Correlation algorithm in the distributed processing mode */ template <> -class DAAL_EXPORT DistributedInput : public InputIface +class DistributedInput : public InputIface { public: - DistributedInput(); - DistributedInput(const DistributedInput & other); + DAAL_EXPORT DistributedInput(); + DAAL_EXPORT DistributedInput(const DistributedInput & other); /** * Sets input objects for the PCA on the second step in the distributed processing mode * \param[in] id Identifier of the input object * \param[in] ptr Input object that corresponds to the given identifier */ - void set(Step2MasterInputId id, const data_management::DataCollectionPtr & ptr); + DAAL_EXPORT void set(Step2MasterInputId id, const data_management::DataCollectionPtr & ptr); /** * Gets input objects for the PCA on the second step in the distributed processing mode @@ -582,7 +582,7 @@ class DAAL_EXPORT DistributedInput : public InputIface * \param[in] id Identifier of the argument * \param[in] value Pointer to the argument */ - void add(Step2MasterInputId id, const services::SharedPtr > & value); + DAAL_EXPORT void add(Step2MasterInputId id, const services::SharedPtr > & value); /** * Returns the number of columns in the input data set @@ -604,18 +604,18 @@ class DAAL_EXPORT DistributedInput : public InputIface * \brief Input objects of the PCA SVD algorithm in the distributed processing mode */ template <> -class DAAL_EXPORT DistributedInput : public InputIface +class DistributedInput : public InputIface { public: - DistributedInput(); - DistributedInput(const DistributedInput & other); + DAAL_EXPORT DistributedInput(); + DAAL_EXPORT DistributedInput(const DistributedInput & other); /** * Sets input objects for the PCA on the second step in the distributed processing mode * \param[in] id Identifier of the input object * \param[in] ptr Input object that corresponds to the given identifier */ - void set(Step2MasterInputId id, const data_management::DataCollectionPtr & ptr); + DAAL_EXPORT void set(Step2MasterInputId id, const data_management::DataCollectionPtr & ptr); /** * Gets input objects for the PCA algorithm on the second step in the distributed processing mode @@ -629,7 +629,7 @@ class DAAL_EXPORT DistributedInput : public InputIface * \param[in] id Identifier of the input object * \param[in] value Pointer to the input object */ - void add(Step2MasterInputId id, const services::SharedPtr > & value); + DAAL_EXPORT void add(Step2MasterInputId id, const services::SharedPtr > & value); /** * Retrieves specific partial result from the input objects of the PCA algorithm on the second step in the distributed processing mode @@ -681,7 +681,7 @@ class DAAL_EXPORT BaseBatchParameter : public daal::algorithms::Parameter * \brief Class that specifies the parameters of the PCA algorithm in the batch computing mode */ template -class BatchParameter +class DAAL_EXPORT BatchParameter {}; /** @@ -689,7 +689,7 @@ class BatchParameter * \brief Class that specifies the parameters of the PCA Correlation algorithm in the batch computing mode */ template -class DAAL_EXPORT BatchParameter : public BaseBatchParameter +class BatchParameter : public BaseBatchParameter { public: /** Constructs PCA parameters */ @@ -711,7 +711,7 @@ class DAAL_EXPORT BatchParameter : public Bas * \brief Class that specifies the parameters of the PCA SVD algorithm in the batch computing mode */ template -class DAAL_EXPORT BatchParameter : public BaseBatchParameter +class BatchParameter : public BaseBatchParameter { public: /** Constructs PCA parameters */ diff --git a/cpp/daal/include/algorithms/pca/transform/pca_transform_batch.h b/cpp/daal/include/algorithms/pca/transform/pca_transform_batch.h index 34c5a7e4ec3..6bc71acd04d 100644 --- a/cpp/daal/include/algorithms/pca/transform/pca_transform_batch.h +++ b/cpp/daal/include/algorithms/pca/transform/pca_transform_batch.h @@ -82,7 +82,7 @@ class BatchContainer : public daal::algorithms::AnalysisContainerIface * - \ref Method Computation methods for the PCA transformation algorithm */ template -class DAAL_EXPORT Batch : public daal::algorithms::Analysis +class Batch : public daal::algorithms::Analysis { public: typedef algorithms::pca::transform::Input InputType; diff --git a/cpp/daal/include/algorithms/qr/qr_distributed.h b/cpp/daal/include/algorithms/qr/qr_distributed.h index 34310311933..f20020079d8 100644 --- a/cpp/daal/include/algorithms/qr/qr_distributed.h +++ b/cpp/daal/include/algorithms/qr/qr_distributed.h @@ -134,7 +134,7 @@ class DistributedContainer : public da * - \ref Method Computation methods for the QR decomposition algorithm */ template -class DAAL_EXPORT Distributed : public daal::algorithms::Analysis +class Distributed : public daal::algorithms::Analysis {}; /** @@ -149,7 +149,7 @@ class DAAL_EXPORT Distributed : public daal::algorithms::Analysis * - \ref Method Computation methods */ template -class DAAL_EXPORT Distributed : public Online +class Distributed : public Online { public: typedef Online super; @@ -201,7 +201,7 @@ class DAAL_EXPORT Distributed : public Onli * - \ref Method Computation methods */ template -class DAAL_EXPORT Distributed : public daal::algorithms::Analysis +class Distributed : public daal::algorithms::Analysis { public: typedef DistributedStep2Input Input; @@ -328,7 +328,7 @@ class DAAL_EXPORT Distributed : public daa * - \ref Method Computation methods */ template -class DAAL_EXPORT Distributed : public daal::algorithms::Analysis +class Distributed : public daal::algorithms::Analysis { public: typedef DistributedStep3Input Input; diff --git a/cpp/daal/include/algorithms/ridge_regression/ridge_regression_training_distributed.h b/cpp/daal/include/algorithms/ridge_regression/ridge_regression_training_distributed.h index 80a6b7d8f88..cb6eabcbe37 100644 --- a/cpp/daal/include/algorithms/ridge_regression/ridge_regression_training_distributed.h +++ b/cpp/daal/include/algorithms/ridge_regression/ridge_regression_training_distributed.h @@ -106,7 +106,7 @@ class DistributedContainer : public T * - \ref prediction::interface1::Batch "prediction::Batch" class */ template -class DAAL_EXPORT Distributed : public Training +class Distributed : public Training {}; /** @@ -127,7 +127,7 @@ class DAAL_EXPORT Distributed : public Training * - \ref prediction::interface1::Batch "prediction::Batch" class */ template -class DAAL_EXPORT Distributed : public Online +class Distributed : public Online { public: typedef Online super; @@ -186,7 +186,7 @@ class DAAL_EXPORT Distributed : public Onli * - \ref prediction::interface1::Batch "prediction::Batch" class */ template -class DAAL_EXPORT Distributed : public Training +class Distributed : public Training { public: typedef algorithms::ridge_regression::training::DistributedInput InputType; diff --git a/cpp/daal/include/algorithms/svd/svd_distributed.h b/cpp/daal/include/algorithms/svd/svd_distributed.h index f4d07bb16b6..e2e63a53e4b 100644 --- a/cpp/daal/include/algorithms/svd/svd_distributed.h +++ b/cpp/daal/include/algorithms/svd/svd_distributed.h @@ -166,7 +166,7 @@ class DAAL_EXPORT Distributed : public daal::algorithms::Analysis * - \ref Method Computation methods */ template -class DAAL_EXPORT Distributed : public Online +class Distributed : public Online { public: typedef Online super; @@ -218,7 +218,7 @@ class DAAL_EXPORT Distributed : public Onli * - \ref Method SVD computation methods */ template -class DAAL_EXPORT Distributed : public daal::algorithms::Analysis +class Distributed : public daal::algorithms::Analysis { public: typedef algorithms::svd::DistributedStep2Input InputType; @@ -335,7 +335,7 @@ class DAAL_EXPORT Distributed : public daa * - \ref Method SVD computation methods */ template -class DAAL_EXPORT Distributed : public daal::algorithms::Analysis +class Distributed : public daal::algorithms::Analysis { public: typedef algorithms::svd::DistributedStep3Input InputType; diff --git a/cpp/daal/include/algorithms/svd/svd_types.h b/cpp/daal/include/algorithms/svd/svd_types.h old mode 100755 new mode 100644 index 2273a43dab1..cce06a36441 --- a/cpp/daal/include/algorithms/svd/svd_types.h +++ b/cpp/daal/include/algorithms/svd/svd_types.h @@ -161,7 +161,7 @@ namespace interface1 * * \brief Parameters for the computation method of the SVD algorithm */ -struct DAAL_EXPORT Parameter : public daal::algorithms::Parameter +struct Parameter : public daal::algorithms::Parameter { /** * Default constructor @@ -355,7 +355,7 @@ class DAAL_EXPORT OnlinePartialResult : public daal::algorithms::PartialResult * \param[in] par Reference to the object with the algorithm parameters */ template - DAAL_EXPORT services::Status addPartialResultStorage(size_t m, size_t n, Parameter & par); + services::Status addPartialResultStorage(size_t m, size_t n, Parameter & par); /** * Returns partial results of the SVD algorithm @@ -470,7 +470,7 @@ class DAAL_EXPORT Result : public daal::algorithms::Result * \return Status of allocation */ template - DAAL_EXPORT services::Status allocateImpl(size_t m, size_t n); + services::Status allocateImpl(size_t m, size_t n); protected: /** \private */ diff --git a/cpp/daal/include/daal_win.h b/cpp/daal/include/daal_win.h index 203a8e8db65..e17eff16796 100755 --- a/cpp/daal/include/daal_win.h +++ b/cpp/daal/include/daal_win.h @@ -20,7 +20,7 @@ #pragma warning(disable : 809) #if defined(_DAAL_PAR_DYNAMIC) - #pragma comment(lib, "onedal_core_dll.2.lib") + #pragma comment(lib, "onedal_core_dll.3.lib") #pragma comment(lib, "tbb12.lib") #pragma comment(lib, "tbbmalloc.lib") #elif defined(_DAAL_PAR_STATIC) diff --git a/cpp/daal/include/data_management/data/data_dictionary.h b/cpp/daal/include/data_management/data/data_dictionary.h index 55f5c3534a2..2308e152f84 100755 --- a/cpp/daal/include/data_management/data/data_dictionary.h +++ b/cpp/daal/include/data_management/data/data_dictionary.h @@ -128,7 +128,7 @@ class NumericTableFeature : public SerializationIface return services::Status(); } - virtual int getSerializationTag() const DAAL_C11_OVERRIDE { return SERIALIZATION_DATAFEATURE_NT_ID; } + DAAL_EXPORT virtual int getSerializationTag() const DAAL_C11_OVERRIDE { return SERIALIZATION_DATAFEATURE_NT_ID; } features::IndexNumType getIndexType() const { return indexType; } }; diff --git a/cpp/daal/include/data_management/data_source/data_source_dictionary.h b/cpp/daal/include/data_management/data_source/data_source_dictionary.h index 6f69289f171..c13505c17af 100755 --- a/cpp/daal/include/data_management/data_source/data_source_dictionary.h +++ b/cpp/daal/include/data_management/data_source/data_source_dictionary.h @@ -229,7 +229,7 @@ class DataSourceFeature : public SerializationIface return status; } - virtual int getSerializationTag() const DAAL_C11_OVERRIDE { return SERIALIZATION_DATAFEATURE_NT_ID; } + DAAL_EXPORT virtual int getSerializationTag() const DAAL_C11_OVERRIDE { return SERIALIZATION_DATAFEATURE_NT_ID; } features::IndexNumType getIndexType() const { return ntFeature.indexType; } diff --git a/cpp/daal/src/algorithms/distributions/bernoulli/bernoulli_types_fpt.cpp b/cpp/daal/src/algorithms/distributions/bernoulli/bernoulli_types_fpt.cpp index b52c0d62039..4d7c95a3b07 100644 --- a/cpp/daal/src/algorithms/distributions/bernoulli/bernoulli_types_fpt.cpp +++ b/cpp/daal/src/algorithms/distributions/bernoulli/bernoulli_types_fpt.cpp @@ -36,13 +36,13 @@ namespace interface1 * Check the correctness of the %Parameter object */ template -DAAL_EXPORT services::Status Parameter::check() const +services::Status Parameter::check() const { DAAL_CHECK_EX((algorithmFPType)0.0 <= p && p <= (algorithmFPType)1.0, services::ErrorIncorrectParameter, services::ParameterName, pStr()); return services::Status(); } -template DAAL_EXPORT services::Status Parameter::check() const; +template services::Status Parameter::check() const; } // namespace interface1 } // namespace bernoulli diff --git a/cpp/daal/src/algorithms/distributions/normal/normal_types_fpt.cpp b/cpp/daal/src/algorithms/distributions/normal/normal_types_fpt.cpp index 3b079ab700d..0a7cf383ce3 100644 --- a/cpp/daal/src/algorithms/distributions/normal/normal_types_fpt.cpp +++ b/cpp/daal/src/algorithms/distributions/normal/normal_types_fpt.cpp @@ -36,13 +36,13 @@ namespace interface1 * Check the correctness of the %Parameter object */ template -DAAL_EXPORT services::Status Parameter::check() const +services::Status Parameter::check() const { DAAL_CHECK_EX(sigma > 0, services::ErrorIncorrectParameter, services::ParameterName, sigmaStr()); return services::Status(); } -template DAAL_EXPORT services::Status Parameter::check() const; +template services::Status Parameter::check() const; } // namespace interface1 } // namespace normal diff --git a/cpp/daal/src/algorithms/distributions/uniform/uniform_types_fpt.cpp b/cpp/daal/src/algorithms/distributions/uniform/uniform_types_fpt.cpp index f9f21bbe7d0..3918b088169 100644 --- a/cpp/daal/src/algorithms/distributions/uniform/uniform_types_fpt.cpp +++ b/cpp/daal/src/algorithms/distributions/uniform/uniform_types_fpt.cpp @@ -36,13 +36,13 @@ namespace interface1 * Check the correctness of the %Parameter object */ template -DAAL_EXPORT services::Status Parameter::check() const +services::Status Parameter::check() const { DAAL_CHECK_EX(a < b, services::ErrorIncorrectParameter, services::ParameterName, aStr()); return services::Status(); } -template DAAL_EXPORT services::Status Parameter::check() const; +template services::Status Parameter::check() const; } // namespace interface1 } // namespace uniform diff --git a/cpp/daal/src/algorithms/elastic_net/elastic_net_training_result_fpt.cpp b/cpp/daal/src/algorithms/elastic_net/elastic_net_training_result_fpt.cpp old mode 100755 new mode 100644 index 250f8fbec2d..fabfcca4732 --- a/cpp/daal/src/algorithms/elastic_net/elastic_net_training_result_fpt.cpp +++ b/cpp/daal/src/algorithms/elastic_net/elastic_net_training_result_fpt.cpp @@ -40,7 +40,7 @@ using namespace daal::services; * \param[in] method Computation method for the algorithm */ template -DAAL_EXPORT Status Result::allocate(const daal::algorithms::Input * input, const Parameter * parameter, const int method) +Status Result::allocate(const daal::algorithms::Input * input, const Parameter * parameter, const int method) { const Input * const in = static_cast(input); @@ -57,8 +57,7 @@ DAAL_EXPORT Status Result::allocate(const daal::algorithms::Input * input, const return s; } -template DAAL_EXPORT services::Status Result::allocate(const daal::algorithms::Input * input, const Parameter * parameter, - const int method); +template services::Status Result::allocate(const daal::algorithms::Input * input, const Parameter * parameter, const int method); } // namespace training } // namespace elastic_net diff --git a/cpp/daal/src/algorithms/implicit_als/implicit_als_predict_ratings_result_fpt.cpp b/cpp/daal/src/algorithms/implicit_als/implicit_als_predict_ratings_result_fpt.cpp index bae1971fc69..69f446d9a95 100644 --- a/cpp/daal/src/algorithms/implicit_als/implicit_als_predict_ratings_result_fpt.cpp +++ b/cpp/daal/src/algorithms/implicit_als/implicit_als_predict_ratings_result_fpt.cpp @@ -45,7 +45,7 @@ namespace interface1 * \param[in] method Algorithm computation method */ template -DAAL_EXPORT Status Result::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, const int method) +Status Result::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, const int method) { const InputIface * algInput = static_cast(input); @@ -56,8 +56,7 @@ DAAL_EXPORT Status Result::allocate(const daal::algorithms::Input * input, const return st; } -template DAAL_EXPORT Status Result::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, - const int method); +template Status Result::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, const int method); } // namespace interface1 } // namespace ratings diff --git a/cpp/daal/src/algorithms/k_nearest_neighbors/bf_knn_classification_model_impl.h b/cpp/daal/src/algorithms/k_nearest_neighbors/bf_knn_classification_model_impl.h index 5a903d39a46..0383368a486 100644 --- a/cpp/daal/src/algorithms/k_nearest_neighbors/bf_knn_classification_model_impl.h +++ b/cpp/daal/src/algorithms/k_nearest_neighbors/bf_knn_classification_model_impl.h @@ -84,8 +84,6 @@ class Model::ModelImpl data_management::BlockDescriptor destBD, srcBD; DAAL_CHECK_STATUS_VAR(dest->getBlockOfRows(0, dest->getNumberOfRows(), data_management::writeOnly, destBD)); DAAL_CHECK_STATUS_VAR(value->getBlockOfRows(0, value->getNumberOfRows(), data_management::readOnly, srcBD)); - auto source = srcBD.getBlockPtr(); - auto destination = destBD.getBlockPtr(); services::internal::daal_memcpy_s(destBD.getBlockPtr(), destBD.getNumberOfColumns() * destBD.getNumberOfRows() * sizeof(algorithmFPType), srcBD.getBlockPtr(), srcBD.getNumberOfColumns() * srcBD.getNumberOfRows() * sizeof(algorithmFPType)); DAAL_CHECK_STATUS_VAR(dest->releaseBlockOfRows(destBD)); diff --git a/cpp/daal/src/algorithms/lasso_regression/lasso_regression_training_result_fpt.cpp b/cpp/daal/src/algorithms/lasso_regression/lasso_regression_training_result_fpt.cpp old mode 100755 new mode 100644 index 80516608f63..e4a30bc18f2 --- a/cpp/daal/src/algorithms/lasso_regression/lasso_regression_training_result_fpt.cpp +++ b/cpp/daal/src/algorithms/lasso_regression/lasso_regression_training_result_fpt.cpp @@ -40,7 +40,7 @@ using namespace daal::services; * \param[in] method Computation method for the algorithm */ template -DAAL_EXPORT Status Result::allocate(const daal::algorithms::Input * input, const Parameter * parameter, const int method) +Status Result::allocate(const daal::algorithms::Input * input, const Parameter * parameter, const int method) { const Input * const in = static_cast(input); @@ -57,8 +57,7 @@ DAAL_EXPORT Status Result::allocate(const daal::algorithms::Input * input, const return s; } -template DAAL_EXPORT services::Status Result::allocate(const daal::algorithms::Input * input, const Parameter * parameter, - const int method); +template services::Status Result::allocate(const daal::algorithms::Input * input, const Parameter * parameter, const int method); } // namespace training } // namespace lasso_regression diff --git a/cpp/daal/src/algorithms/linear_model/linear_model_predict_batch_fpt.cpp b/cpp/daal/src/algorithms/linear_model/linear_model_predict_batch_fpt.cpp index 329cd671cf2..d77f5b5cb66 100644 --- a/cpp/daal/src/algorithms/linear_model/linear_model_predict_batch_fpt.cpp +++ b/cpp/daal/src/algorithms/linear_model/linear_model_predict_batch_fpt.cpp @@ -36,7 +36,7 @@ using namespace daal::services; using namespace daal::data_management; template -DAAL_EXPORT Status Result::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * par, const int method) +Status Result::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * par, const int method) { const Input * in = static_cast(input); size_t nVectors = in->get(data)->getNumberOfRows(); @@ -48,8 +48,7 @@ DAAL_EXPORT Status Result::allocate(const daal::algorithms::Input * input, const return st; } -template DAAL_EXPORT Status Result::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * par, - const int method); +template Status Result::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * par, const int method); } // namespace prediction } // namespace linear_model diff --git a/cpp/daal/src/algorithms/linear_regression/linear_regression_training_result.h b/cpp/daal/src/algorithms/linear_regression/linear_regression_training_result.h index 8d625911fba..b5eb2423529 100644 --- a/cpp/daal/src/algorithms/linear_regression/linear_regression_training_result.h +++ b/cpp/daal/src/algorithms/linear_regression/linear_regression_training_result.h @@ -45,7 +45,7 @@ using namespace daal::services; * \param[in] parameter %Parameter of linear regression model-based training */ template -DAAL_EXPORT Status Result::allocate(const daal::algorithms::Input * input, const Parameter * parameter, const int method) +Status Result::allocate(const daal::algorithms::Input * input, const Parameter * parameter, const int method) { const Input * in = static_cast(input); @@ -72,7 +72,7 @@ DAAL_EXPORT Status Result::allocate(const daal::algorithms::Input * input, const * \param[in] parameter %Parameter of linear regression model-based training */ template -DAAL_EXPORT Status Result::allocate(const daal::algorithms::PartialResult * partialResult, const Parameter * parameter, const int method) +Status Result::allocate(const daal::algorithms::PartialResult * partialResult, const Parameter * parameter, const int method) { const PartialResult * partialRes = static_cast(partialResult); diff --git a/cpp/daal/src/algorithms/low_order_moments/moments_batch.h b/cpp/daal/src/algorithms/low_order_moments/moments_batch.h index ceb6e0a2804..ebe53de5737 100644 --- a/cpp/daal/src/algorithms/low_order_moments/moments_batch.h +++ b/cpp/daal/src/algorithms/low_order_moments/moments_batch.h @@ -41,7 +41,7 @@ namespace low_order_moments * \param[in] method Computation method */ template -DAAL_EXPORT services::Status Result::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, const int method) +services::Status Result::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, const int method) { services::Status s; size_t nFeatures = 0; @@ -63,8 +63,7 @@ DAAL_EXPORT services::Status Result::allocate(const daal::algorithms::Input * in * \param[in] method Computation method */ template -DAAL_EXPORT services::Status Result::allocate(const daal::algorithms::PartialResult * partialResult, daal::algorithms::Parameter * parameter, - const int method) +services::Status Result::allocate(const daal::algorithms::PartialResult * partialResult, daal::algorithms::Parameter * parameter, const int method) { size_t nFeatures; services::Status s; diff --git a/cpp/daal/src/algorithms/normalization/minmax/minmax_fpt.cpp b/cpp/daal/src/algorithms/normalization/minmax/minmax_fpt.cpp index 1ce1270c8e8..2b5e3496277 100644 --- a/cpp/daal/src/algorithms/normalization/minmax/minmax_fpt.cpp +++ b/cpp/daal/src/algorithms/normalization/minmax/minmax_fpt.cpp @@ -44,7 +44,7 @@ namespace interface1 * \param[in] method Computation method of the minmax normalization algorithm */ template -DAAL_EXPORT Status Result::allocate(const daal::algorithms::Input * input, int method) +Status Result::allocate(const daal::algorithms::Input * input, int method) { DAAL_CHECK(input, ErrorNullInput); @@ -62,7 +62,7 @@ DAAL_EXPORT Status Result::allocate(const daal::algorithms::Input * input, int m return s; } -template DAAL_EXPORT Status Result::allocate(const daal::algorithms::Input * input, int method); +template Status Result::allocate(const daal::algorithms::Input * input, int method); } // namespace interface1 } // namespace minmax diff --git a/cpp/daal/src/algorithms/normalization/minmax/minmax_parameter.cpp b/cpp/daal/src/algorithms/normalization/minmax/minmax_parameter.cpp index 4753dbd98e7..bc98bac50db 100644 --- a/cpp/daal/src/algorithms/normalization/minmax/minmax_parameter.cpp +++ b/cpp/daal/src/algorithms/normalization/minmax/minmax_parameter.cpp @@ -37,14 +37,14 @@ namespace minmax namespace interface1 { /** Constructs min-max normalization parameters */ -DAAL_EXPORT ParameterBase::ParameterBase(double lowerBound, double upperBound, const SharedPtr & moments) +ParameterBase::ParameterBase(double lowerBound, double upperBound, const SharedPtr & moments) : lowerBound(lowerBound), upperBound(upperBound), moments(moments) {} /** * Check the correctness of the %ParameterBase object */ -DAAL_EXPORT Status ParameterBase::check() const +Status ParameterBase::check() const { DAAL_CHECK(moments, ErrorNullParameterNotSupported); DAAL_CHECK(lowerBound < upperBound, ErrorLowerBoundGreaterThanOrEqualToUpperBound); diff --git a/cpp/daal/src/algorithms/normalization/minmax/minmax_parameter_fpt.cpp b/cpp/daal/src/algorithms/normalization/minmax/minmax_parameter_fpt.cpp index 8878d055f4c..7c057c228e1 100644 --- a/cpp/daal/src/algorithms/normalization/minmax/minmax_parameter_fpt.cpp +++ b/cpp/daal/src/algorithms/normalization/minmax/minmax_parameter_fpt.cpp @@ -40,19 +40,19 @@ typedef SharedPtr LowOrderMomentsPtr; /** Constructs min-max normalization parameters with default low order algorithm */ template -DAAL_EXPORT Parameter::Parameter(double lowerBound, double upperBound) +Parameter::Parameter(double lowerBound, double upperBound) : ParameterBase(lowerBound, upperBound, LowOrderMomentsPtr(new low_order_moments::Batch())) {} /** Constructs min-max normalization parameters */ template -DAAL_EXPORT Parameter::Parameter(double lowerBound, double upperBound, const LowOrderMomentsPtr & moments) +Parameter::Parameter(double lowerBound, double upperBound, const LowOrderMomentsPtr & moments) : ParameterBase(lowerBound, upperBound, moments) {} -template DAAL_EXPORT Parameter::Parameter(double lowerBound, double upperBound); +template Parameter::Parameter(double lowerBound, double upperBound); -template DAAL_EXPORT Parameter::Parameter(double lowerBound, double upperBound, const LowOrderMomentsPtr & moments); +template Parameter::Parameter(double lowerBound, double upperBound, const LowOrderMomentsPtr & moments); } // namespace interface1 } // namespace minmax diff --git a/cpp/daal/src/algorithms/normalization/zscore/zscore_fpt.cpp b/cpp/daal/src/algorithms/normalization/zscore/zscore_fpt.cpp index ecddc7b100e..243a0ca679a 100644 --- a/cpp/daal/src/algorithms/normalization/zscore/zscore_fpt.cpp +++ b/cpp/daal/src/algorithms/normalization/zscore/zscore_fpt.cpp @@ -43,7 +43,7 @@ namespace interface2 * \param[in] method Algorithm computation method */ template -DAAL_EXPORT Status Result::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, const int method) +Status Result::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, const int method) { auto impl = ResultImpl::cast(getStorage(*this)); DAAL_CHECK(impl, ErrorNullPtr); @@ -56,14 +56,13 @@ DAAL_EXPORT Status Result::allocate(const daal::algorithms::Input * input, const * \param[in] method Algorithm computation method */ template -DAAL_EXPORT Status Result::allocate(const daal::algorithms::Input * input, const int method) +Status Result::allocate(const daal::algorithms::Input * input, const int method) { return allocate(input, NULL, method); } -template DAAL_EXPORT Status Result::allocate(const daal::algorithms::Input * input, const int method); -template DAAL_EXPORT Status Result::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, - const int method); +template Status Result::allocate(const daal::algorithms::Input * input, const int method); +template Status Result::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, const int method); } // namespace interface2 } // namespace zscore diff --git a/cpp/daal/src/algorithms/normalization/zscore/zscore_parameter_fpt.cpp b/cpp/daal/src/algorithms/normalization/zscore/zscore_parameter_fpt.cpp index 26637f75c7c..619c132be7b 100644 --- a/cpp/daal/src/algorithms/normalization/zscore/zscore_parameter_fpt.cpp +++ b/cpp/daal/src/algorithms/normalization/zscore/zscore_parameter_fpt.cpp @@ -38,26 +38,26 @@ namespace interface3 { /** Constructs z-score normalization parameters */ template -DAAL_EXPORT Parameter::Parameter(const SharedPtr & moments, const bool doScale) +Parameter::Parameter(const SharedPtr & moments, const bool doScale) : BaseParameter(doScale), moments(moments) {}; /** Constructs z-score normalization parameters */ template -DAAL_EXPORT Parameter::Parameter(const bool doScale) : BaseParameter(doScale) {}; +Parameter::Parameter(const bool doScale) : BaseParameter(doScale) {}; /** * Check the correctness of the %Parameter object */ template -DAAL_EXPORT Status Parameter::check() const +Status Parameter::check() const { DAAL_CHECK(moments.get() != 0, ErrorNullParameterNotSupported); return Status(); } -template DAAL_EXPORT Parameter::Parameter(const SharedPtr & moments, const bool doScale); -template DAAL_EXPORT Parameter::Parameter(const bool doScale); -template DAAL_EXPORT Status Parameter::check() const; +template Parameter::Parameter(const SharedPtr & moments, const bool doScale); +template Parameter::Parameter(const bool doScale); +template Status Parameter::check() const; } // namespace interface3 diff --git a/cpp/daal/src/algorithms/pca/metrics/pca_quality_metric.h b/cpp/daal/src/algorithms/pca/metrics/pca_quality_metric.h index 93641a386d4..d73561767ad 100644 --- a/cpp/daal/src/algorithms/pca/metrics/pca_quality_metric.h +++ b/cpp/daal/src/algorithms/pca/metrics/pca_quality_metric.h @@ -43,7 +43,7 @@ namespace explained_variance * \param[in] method Algorithm method */ template -DAAL_EXPORT services::Status Result::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * par, const int method) +services::Status Result::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * par, const int method) { size_t nComponents = (static_cast(par))->nComponents; if (nComponents == 0) diff --git a/cpp/daal/src/algorithms/pca/metrics/pca_quality_metric_fpt.cpp b/cpp/daal/src/algorithms/pca/metrics/pca_quality_metric_fpt.cpp index 8869651343d..01cbfab9b82 100644 --- a/cpp/daal/src/algorithms/pca/metrics/pca_quality_metric_fpt.cpp +++ b/cpp/daal/src/algorithms/pca/metrics/pca_quality_metric_fpt.cpp @@ -33,8 +33,8 @@ namespace quality_metric { namespace explained_variance { -template services::Status DAAL_EXPORT Result::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * par, - const int method); +template services::Status Result::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * par, + const int method); } // namespace explained_variance } // namespace quality_metric diff --git a/cpp/daal/src/algorithms/pca/pca_baseparameter_fpt.cpp b/cpp/daal/src/algorithms/pca/pca_baseparameter_fpt.cpp index e23643e3a44..e338d70236a 100644 --- a/cpp/daal/src/algorithms/pca/pca_baseparameter_fpt.cpp +++ b/cpp/daal/src/algorithms/pca/pca_baseparameter_fpt.cpp @@ -32,10 +32,10 @@ namespace interface1 { /** Constructs PCA parameters */ template -DAAL_EXPORT BaseParameter::BaseParameter() {}; +BaseParameter::BaseParameter() {}; -template DAAL_EXPORT BaseParameter::BaseParameter(); -template DAAL_EXPORT BaseParameter::BaseParameter(); +template BaseParameter::BaseParameter(); +template BaseParameter::BaseParameter(); } // namespace interface1 } // namespace pca diff --git a/cpp/daal/src/algorithms/pca/pca_batchparameter_correlation_fpt.cpp b/cpp/daal/src/algorithms/pca/pca_batchparameter_correlation_fpt.cpp index e69cd5ac970..32d2bd3fccf 100644 --- a/cpp/daal/src/algorithms/pca/pca_batchparameter_correlation_fpt.cpp +++ b/cpp/daal/src/algorithms/pca/pca_batchparameter_correlation_fpt.cpp @@ -33,18 +33,18 @@ namespace interface3 { /** Constructs PCA parameters */ template -DAAL_EXPORT BatchParameter::BatchParameter(const services::SharedPtr & covariance) +BatchParameter::BatchParameter(const services::SharedPtr & covariance) : covariance(covariance) {}; template -DAAL_EXPORT services::Status BatchParameter::check() const +services::Status BatchParameter::check() const { DAAL_CHECK(covariance, services::ErrorNullAuxiliaryAlgorithm); return services::Status(); } -template DAAL_EXPORT BatchParameter::BatchParameter(const services::SharedPtr & covariance); -template DAAL_EXPORT services::Status BatchParameter::check() const; +template BatchParameter::BatchParameter(const services::SharedPtr & covariance); +template services::Status BatchParameter::check() const; } // namespace interface3 } // namespace pca } // namespace algorithms diff --git a/cpp/daal/src/algorithms/pca/pca_batchparameter_svd_fpt.cpp b/cpp/daal/src/algorithms/pca/pca_batchparameter_svd_fpt.cpp index 831f8fe56b0..2efc7501e4d 100644 --- a/cpp/daal/src/algorithms/pca/pca_batchparameter_svd_fpt.cpp +++ b/cpp/daal/src/algorithms/pca/pca_batchparameter_svd_fpt.cpp @@ -33,11 +33,11 @@ namespace interface3 { /** Constructs PCA parameters */ template -DAAL_EXPORT BatchParameter::BatchParameter(const services::SharedPtr & normalization) +BatchParameter::BatchParameter(const services::SharedPtr & normalization) : normalization(normalization) {}; template -DAAL_EXPORT services::Status BatchParameter::check() const +services::Status BatchParameter::check() const { DAAL_CHECK(normalization, services::ErrorNullAuxiliaryAlgorithm); return services::Status(); diff --git a/cpp/daal/src/algorithms/pca/pca_distributedparameter_correlation.h b/cpp/daal/src/algorithms/pca/pca_distributedparameter_correlation.h index 1a27e0bc182..8bd4b9800b7 100644 --- a/cpp/daal/src/algorithms/pca/pca_distributedparameter_correlation.h +++ b/cpp/daal/src/algorithms/pca/pca_distributedparameter_correlation.h @@ -34,12 +34,12 @@ namespace pca { /** Constructs PCA parameters */ template -DAAL_EXPORT DistributedParameter::DistributedParameter( +DistributedParameter::DistributedParameter( const services::SharedPtr > & covariance) : covariance(covariance) {}; template -DAAL_EXPORT services::Status DistributedParameter::check() const +services::Status DistributedParameter::check() const { DAAL_CHECK(covariance, services::ErrorNullAuxiliaryAlgorithm); return services::Status(); diff --git a/cpp/daal/src/algorithms/pca/pca_onlineparameter_correlation.h b/cpp/daal/src/algorithms/pca/pca_onlineparameter_correlation.h index 5e4dfd21010..4b3191f4d0c 100644 --- a/cpp/daal/src/algorithms/pca/pca_onlineparameter_correlation.h +++ b/cpp/daal/src/algorithms/pca/pca_onlineparameter_correlation.h @@ -34,11 +34,11 @@ namespace pca { /** Constructs PCA parameters */ template -DAAL_EXPORT OnlineParameter::OnlineParameter(const services::SharedPtr & covariance) +OnlineParameter::OnlineParameter(const services::SharedPtr & covariance) : covariance(covariance) {}; template -DAAL_EXPORT services::Status OnlineParameter::check() const +services::Status OnlineParameter::check() const { DAAL_CHECK(covariance, services::ErrorNullAuxiliaryAlgorithm); return services::Status(); diff --git a/cpp/daal/src/algorithms/pca/pca_onlineparameter_svd.h b/cpp/daal/src/algorithms/pca/pca_onlineparameter_svd.h index 721828b1efd..87cffd2abb4 100644 --- a/cpp/daal/src/algorithms/pca/pca_onlineparameter_svd.h +++ b/cpp/daal/src/algorithms/pca/pca_onlineparameter_svd.h @@ -34,10 +34,10 @@ namespace pca { /** Constructs PCA parameters */ template -DAAL_EXPORT OnlineParameter::OnlineParameter() {}; +OnlineParameter::OnlineParameter() {}; template -DAAL_EXPORT services::Status OnlineParameter::check() const +services::Status OnlineParameter::check() const { return services::Status(); } diff --git a/cpp/daal/src/algorithms/pca/pca_onlineparameter_svd_fpt.cpp b/cpp/daal/src/algorithms/pca/pca_onlineparameter_svd_fpt.cpp index 7fe5953d3b5..264f2902201 100644 --- a/cpp/daal/src/algorithms/pca/pca_onlineparameter_svd_fpt.cpp +++ b/cpp/daal/src/algorithms/pca/pca_onlineparameter_svd_fpt.cpp @@ -29,8 +29,8 @@ namespace algorithms { namespace pca { -template DAAL_EXPORT OnlineParameter::OnlineParameter(); -template DAAL_EXPORT services::Status OnlineParameter::check() const; +template OnlineParameter::OnlineParameter(); +template services::Status OnlineParameter::check() const; } // namespace pca } // namespace algorithms diff --git a/cpp/daal/src/algorithms/pca/pca_partialresult_correlation.h b/cpp/daal/src/algorithms/pca/pca_partialresult_correlation.h index dfb7afeac99..2612ba3eb49 100644 --- a/cpp/daal/src/algorithms/pca/pca_partialresult_correlation.h +++ b/cpp/daal/src/algorithms/pca/pca_partialresult_correlation.h @@ -41,8 +41,8 @@ namespace pca * \param[in] method Computation method */ template -DAAL_EXPORT services::Status PartialResult::allocate(const daal::algorithms::Input * input, - const daal::algorithms::Parameter * parameter, const int method) +services::Status PartialResult::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, + const int method) { services::Status s; @@ -59,8 +59,8 @@ DAAL_EXPORT services::Status PartialResult::allocate(const daa }; template -DAAL_EXPORT services::Status PartialResult::initialize(const daal::algorithms::Input * input, - const daal::algorithms::Parameter * parameter, const int method) +services::Status PartialResult::initialize(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, + const int method) { services::Status s; DAAL_CHECK_STATUS(s, get(nObservationsCorrelation)->assign((algorithmFPType)0.0)) diff --git a/cpp/daal/src/algorithms/pca/pca_partialresult_correlation_fpt.cpp b/cpp/daal/src/algorithms/pca/pca_partialresult_correlation_fpt.cpp index ba577dedc2b..cc403b6ca3b 100644 --- a/cpp/daal/src/algorithms/pca/pca_partialresult_correlation_fpt.cpp +++ b/cpp/daal/src/algorithms/pca/pca_partialresult_correlation_fpt.cpp @@ -29,12 +29,10 @@ namespace algorithms { namespace pca { -template DAAL_EXPORT services::Status PartialResult::allocate(const daal::algorithms::Input * input, - const daal::algorithms::Parameter * parameter, - const int method); -template DAAL_EXPORT services::Status PartialResult::initialize(const daal::algorithms::Input * input, - const daal::algorithms::Parameter * parameter, - const int method); +template services::Status PartialResult::allocate(const daal::algorithms::Input * input, + const daal::algorithms::Parameter * parameter, const int method); +template services::Status PartialResult::initialize(const daal::algorithms::Input * input, + const daal::algorithms::Parameter * parameter, const int method); } // namespace pca } // namespace algorithms diff --git a/cpp/daal/src/algorithms/pca/pca_partialresult_svd.h b/cpp/daal/src/algorithms/pca/pca_partialresult_svd.h index a4ffc43435a..4d45de1a8f8 100644 --- a/cpp/daal/src/algorithms/pca/pca_partialresult_svd.h +++ b/cpp/daal/src/algorithms/pca/pca_partialresult_svd.h @@ -41,8 +41,8 @@ namespace pca * \param[in] method Computation method */ template -DAAL_EXPORT services::Status PartialResult::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, - const int method) +services::Status PartialResult::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, + const int method) { services::Status s; set(nObservationsSVD, HomogenNumericTable::create(1, 1, NumericTableIface::doAllocate, 0, &s)); @@ -55,8 +55,8 @@ DAAL_EXPORT services::Status PartialResult::allocate(const daal::algor }; template -DAAL_EXPORT services::Status PartialResult::initialize(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, - const int method) +services::Status PartialResult::initialize(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, + const int method) { services::Status s; DAAL_CHECK_STATUS(s, get(nObservationsSVD)->assign((algorithmFPType)0.0)) diff --git a/cpp/daal/src/algorithms/pca/pca_partialresult_svd_fpt.cpp b/cpp/daal/src/algorithms/pca/pca_partialresult_svd_fpt.cpp index 25456e4dbb5..f0697662c99 100644 --- a/cpp/daal/src/algorithms/pca/pca_partialresult_svd_fpt.cpp +++ b/cpp/daal/src/algorithms/pca/pca_partialresult_svd_fpt.cpp @@ -29,11 +29,10 @@ namespace algorithms { namespace pca { -template DAAL_EXPORT services::Status PartialResult::allocate(const daal::algorithms::Input * input, - const daal::algorithms::Parameter * parameter, const int method); -template DAAL_EXPORT services::Status PartialResult::initialize(const daal::algorithms::Input * input, - const daal::algorithms::Parameter * parameter, - const int method); +template services::Status PartialResult::allocate(const daal::algorithms::Input * input, + const daal::algorithms::Parameter * parameter, const int method); +template services::Status PartialResult::initialize(const daal::algorithms::Input * input, + const daal::algorithms::Parameter * parameter, const int method); } // namespace pca } // namespace algorithms diff --git a/cpp/daal/src/algorithms/pca/pca_result_fpt.cpp b/cpp/daal/src/algorithms/pca/pca_result_fpt.cpp index 23586838dcc..58ecaeb939c 100644 --- a/cpp/daal/src/algorithms/pca/pca_result_fpt.cpp +++ b/cpp/daal/src/algorithms/pca/pca_result_fpt.cpp @@ -38,7 +38,7 @@ namespace interface3 * \param[in] method Computation method */ template -DAAL_EXPORT services::Status Result::allocate(const daal::algorithms::Input * input, daal::algorithms::Parameter * parameter, const Method method) +services::Status Result::allocate(const daal::algorithms::Input * input, daal::algorithms::Parameter * parameter, const Method method) { size_t nComponents = 0; DAAL_UINT64 resultsToCompute = eigenvalue; @@ -63,8 +63,7 @@ DAAL_EXPORT services::Status Result::allocate(const daal::algorithms::Input * in * \param[in] method Computation method */ template -DAAL_EXPORT services::Status Result::allocate(const daal::algorithms::PartialResult * partialResult, daal::algorithms::Parameter * parameter, - const Method method) +services::Status Result::allocate(const daal::algorithms::PartialResult * partialResult, daal::algorithms::Parameter * parameter, const Method method) { size_t nComponents = 0; DAAL_UINT64 resultsToCompute = eigenvalue; @@ -75,10 +74,10 @@ DAAL_EXPORT services::Status Result::allocate(const daal::algorithms::PartialRes return impl->allocate(partialResult, nComponents, resultsToCompute); } -template DAAL_EXPORT services::Status Result::allocate(const daal::algorithms::Input * input, daal::algorithms::Parameter * parameter, - const Method method); -template DAAL_EXPORT services::Status Result::allocate(const daal::algorithms::PartialResult * partialResult, - daal::algorithms::Parameter * parameter, const Method method); +template services::Status Result::allocate(const daal::algorithms::Input * input, daal::algorithms::Parameter * parameter, + const Method method); +template services::Status Result::allocate(const daal::algorithms::PartialResult * partialResult, + daal::algorithms::Parameter * parameter, const Method method); } // namespace interface3 } // namespace pca diff --git a/cpp/daal/src/algorithms/pca/transform/pca_transform_batch_fpt.cpp b/cpp/daal/src/algorithms/pca/transform/pca_transform_batch_fpt.cpp index 57c66fd4853..85229f3d1d8 100644 --- a/cpp/daal/src/algorithms/pca/transform/pca_transform_batch_fpt.cpp +++ b/cpp/daal/src/algorithms/pca/transform/pca_transform_batch_fpt.cpp @@ -39,7 +39,7 @@ using namespace daal::services; using namespace daal::data_management; template -DAAL_EXPORT Status Result::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * par, const int method) +Status Result::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * par, const int method) { const Input * in = static_cast(input); const Parameter * parameter = static_cast(par); @@ -65,8 +65,7 @@ DAAL_EXPORT Status Result::allocate(const daal::algorithms::Input * input, const return status; } -template DAAL_EXPORT Status Result::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * par, - const int method); +template Status Result::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * par, const int method); } // namespace transform } // namespace pca diff --git a/cpp/daal/src/algorithms/qr/qr_dense_default_batch.h b/cpp/daal/src/algorithms/qr/qr_dense_default_batch.h index 9f994f03dc6..5bb57c09ccc 100644 --- a/cpp/daal/src/algorithms/qr/qr_dense_default_batch.h +++ b/cpp/daal/src/algorithms/qr/qr_dense_default_batch.h @@ -42,7 +42,7 @@ namespace interface1 * \param[in] method Algorithm method */ template -DAAL_EXPORT Status Result::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, const int method) +Status Result::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, const int method) { const Input * in = static_cast(input); return allocateImpl(in->get(data)->getNumberOfColumns(), in->get(data)->getNumberOfRows()); @@ -55,7 +55,7 @@ DAAL_EXPORT Status Result::allocate(const daal::algorithms::Input * input, const * \param[in] method Algorithm method */ template -DAAL_EXPORT Status Result::allocate(const daal::algorithms::PartialResult * partialResult, daal::algorithms::Parameter * parameter, const int method) +Status Result::allocate(const daal::algorithms::PartialResult * partialResult, daal::algorithms::Parameter * parameter, const int method) { const OnlinePartialResult * in = static_cast(partialResult); return allocateImpl(in->getNumberOfColumns(), in->getNumberOfRows()); @@ -68,7 +68,7 @@ DAAL_EXPORT Status Result::allocate(const daal::algorithms::PartialResult * part * \param[in] n Number of rows in the input data set */ template -DAAL_EXPORT Status Result::allocateImpl(size_t m, size_t n) +Status Result::allocateImpl(size_t m, size_t n) { Status s; if (n == 0) diff --git a/cpp/daal/src/algorithms/ridge_regression/ridge_regression_training_result.h b/cpp/daal/src/algorithms/ridge_regression/ridge_regression_training_result.h index d03ed2933f1..873ccc46a72 100644 --- a/cpp/daal/src/algorithms/ridge_regression/ridge_regression_training_result.h +++ b/cpp/daal/src/algorithms/ridge_regression/ridge_regression_training_result.h @@ -44,7 +44,7 @@ using namespace daal::services; * \param[in] method Computation method for the algorithm */ template -DAAL_EXPORT Status Result::allocate(const daal::algorithms::Input * input, const Parameter * parameter, const int method) +Status Result::allocate(const daal::algorithms::Input * input, const Parameter * parameter, const int method) { const Input * const in = static_cast(input); @@ -66,7 +66,7 @@ DAAL_EXPORT Status Result::allocate(const daal::algorithms::Input * input, const // * \param[in] parameter %Parameter of ridge regression model-based training template -DAAL_EXPORT Status Result::allocate(const daal::algorithms::PartialResult * partialResult, const Parameter * parameter, int method) +Status Result::allocate(const daal::algorithms::PartialResult * partialResult, const Parameter * parameter, int method) { const PartialResult * const partialRes = static_cast(partialResult); diff --git a/cpp/daal/src/algorithms/svd/svd_dense_default_batch.h b/cpp/daal/src/algorithms/svd/svd_dense_default_batch.h index fb008e0956b..14e3e396003 100644 --- a/cpp/daal/src/algorithms/svd/svd_dense_default_batch.h +++ b/cpp/daal/src/algorithms/svd/svd_dense_default_batch.h @@ -43,7 +43,7 @@ namespace interface1 * \param[in] method Algorithm computation method */ template -DAAL_EXPORT Status Result::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, const int method) +Status Result::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, const int method) { const Input * in = static_cast(input); return allocateImpl(in->get(data)->getNumberOfColumns(), in->get(data)->getNumberOfRows()); @@ -56,7 +56,7 @@ DAAL_EXPORT Status Result::allocate(const daal::algorithms::Input * input, const * \param[in] method Algorithm computation method */ template -DAAL_EXPORT Status Result::allocate(const daal::algorithms::PartialResult * partialResult, daal::algorithms::Parameter * parameter, const int method) +Status Result::allocate(const daal::algorithms::PartialResult * partialResult, daal::algorithms::Parameter * parameter, const int method) { const OnlinePartialResult * in = static_cast(partialResult); return allocateImpl(in->getNumberOfColumns(), in->getNumberOfRows()); @@ -69,7 +69,7 @@ DAAL_EXPORT Status Result::allocate(const daal::algorithms::PartialResult * part * \param[in] n Number of rows in the input data set */ template -DAAL_EXPORT Status Result::allocateImpl(size_t m, size_t n) +Status Result::allocateImpl(size_t m, size_t n) { Status st; set(singularValues, HomogenNumericTable::create(m, 1, NumericTable::doAllocate, &st)); diff --git a/cpp/daal/src/algorithms/svd/svd_dense_default_batch_fpt.cpp b/cpp/daal/src/algorithms/svd/svd_dense_default_batch_fpt.cpp index bfd9e8dafa2..865eb20d6f1 100644 --- a/cpp/daal/src/algorithms/svd/svd_dense_default_batch_fpt.cpp +++ b/cpp/daal/src/algorithms/svd/svd_dense_default_batch_fpt.cpp @@ -30,11 +30,11 @@ namespace svd { namespace interface1 { -template DAAL_EXPORT services::Status Result::allocate(const daal::algorithms::Input * input, - const daal::algorithms::Parameter * parameter, const int method); -template DAAL_EXPORT services::Status Result::allocate(const daal::algorithms::PartialResult * partialResult, - daal::algorithms::Parameter * parameter, const int method); -template DAAL_EXPORT services::Status Result::allocateImpl(size_t m, size_t n); +template services::Status Result::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, + const int method); +template services::Status Result::allocate(const daal::algorithms::PartialResult * partialResult, + daal::algorithms::Parameter * parameter, const int method); +template services::Status Result::allocateImpl(size_t m, size_t n); } // namespace interface1 } // namespace svd diff --git a/cpp/daal/src/algorithms/svd/svd_dense_default_distr_step2.h b/cpp/daal/src/algorithms/svd/svd_dense_default_distr_step2.h old mode 100755 new mode 100644 index 4ed9839beb1..4d44d952bcf --- a/cpp/daal/src/algorithms/svd/svd_dense_default_distr_step2.h +++ b/cpp/daal/src/algorithms/svd/svd_dense_default_distr_step2.h @@ -41,8 +41,7 @@ namespace interface1 * Allocates memory to store partial results of the SVD algorithm */ template -DAAL_EXPORT Status DistributedPartialResult::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, - const int method) +Status DistributedPartialResult::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, const int method) { set(outputOfStep2ForStep3, KeyValueDataCollectionPtr(new KeyValueDataCollection())); Argument::set(finalResultFromStep2Master, ResultPtr(new Result())); @@ -62,7 +61,7 @@ DAAL_EXPORT Status DistributedPartialResult::allocate(const daal::algorithms::In * \param[out] nBlocks Number of rows in the input data set */ template -DAAL_EXPORT Status DistributedPartialResult::setPartialResultStorage(KeyValueDataCollection * inCollection, size_t & nBlocks) +Status DistributedPartialResult::setPartialResultStorage(KeyValueDataCollection * inCollection, size_t & nBlocks) { KeyValueDataCollectionPtr partialCollection = staticPointerCast(Argument::get(outputOfStep2ForStep3)); if (!partialCollection) diff --git a/cpp/daal/src/algorithms/svd/svd_dense_default_distr_step2_fpt.cpp b/cpp/daal/src/algorithms/svd/svd_dense_default_distr_step2_fpt.cpp index a9b1845e0a3..c41ef6b87a4 100644 --- a/cpp/daal/src/algorithms/svd/svd_dense_default_distr_step2_fpt.cpp +++ b/cpp/daal/src/algorithms/svd/svd_dense_default_distr_step2_fpt.cpp @@ -30,11 +30,10 @@ namespace svd { namespace interface1 { -template DAAL_EXPORT services::Status DistributedPartialResult::allocate(const daal::algorithms::Input * input, - const daal::algorithms::Parameter * parameter, - const int method); -template DAAL_EXPORT services::Status DistributedPartialResult::setPartialResultStorage( - data_management::KeyValueDataCollection * inCollection, size_t & nBlocks); +template services::Status DistributedPartialResult::allocate(const daal::algorithms::Input * input, + const daal::algorithms::Parameter * parameter, const int method); +template services::Status DistributedPartialResult::setPartialResultStorage(data_management::KeyValueDataCollection * inCollection, + size_t & nBlocks); } // namespace interface1 } // namespace svd diff --git a/cpp/daal/src/algorithms/svd/svd_dense_default_distr_step3.h b/cpp/daal/src/algorithms/svd/svd_dense_default_distr_step3.h index f2be0f34797..e7b8e664c3e 100644 --- a/cpp/daal/src/algorithms/svd/svd_dense_default_distr_step3.h +++ b/cpp/daal/src/algorithms/svd/svd_dense_default_distr_step3.h @@ -42,8 +42,7 @@ namespace interface1 * \param[in] method Algorithm computation method */ template -DAAL_EXPORT Status DistributedPartialResultStep3::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, - const int method) +Status DistributedPartialResultStep3::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, const int method) { Argument::set(finalResultFromStep3, ResultPtr(new Result())); return Status(); @@ -55,7 +54,7 @@ DAAL_EXPORT Status DistributedPartialResultStep3::allocate(const daal::algorithm * \param[in] qCollection DataCollection of all partial results from step 1 of the SVD algorithm in the distributed processing mode */ template -DAAL_EXPORT Status DistributedPartialResultStep3::setPartialResultStorage(data_management::DataCollection * qCollection) +Status DistributedPartialResultStep3::setPartialResultStorage(data_management::DataCollection * qCollection) { size_t qSize = qCollection->size(); size_t m = 0; diff --git a/cpp/daal/src/algorithms/svd/svd_dense_default_distr_step3_fpt.cpp b/cpp/daal/src/algorithms/svd/svd_dense_default_distr_step3_fpt.cpp index 24892f71a28..1e5ec49aea0 100644 --- a/cpp/daal/src/algorithms/svd/svd_dense_default_distr_step3_fpt.cpp +++ b/cpp/daal/src/algorithms/svd/svd_dense_default_distr_step3_fpt.cpp @@ -30,11 +30,9 @@ namespace svd { namespace interface1 { -template DAAL_EXPORT services::Status DistributedPartialResultStep3::allocate(const daal::algorithms::Input * input, - const daal::algorithms::Parameter * parameter, - const int method); -template DAAL_EXPORT services::Status DistributedPartialResultStep3::setPartialResultStorage( - data_management::DataCollection * qCollection); +template services::Status DistributedPartialResultStep3::allocate(const daal::algorithms::Input * input, + const daal::algorithms::Parameter * parameter, const int method); +template services::Status DistributedPartialResultStep3::setPartialResultStorage(data_management::DataCollection * qCollection); } // namespace interface1 } // namespace svd diff --git a/cpp/daal/src/algorithms/svd/svd_dense_default_online.h b/cpp/daal/src/algorithms/svd/svd_dense_default_online.h old mode 100755 new mode 100644 index c3e00bf3614..30475167f3b --- a/cpp/daal/src/algorithms/svd/svd_dense_default_online.h +++ b/cpp/daal/src/algorithms/svd/svd_dense_default_online.h @@ -46,8 +46,7 @@ using namespace daal::services; * \param[in] method Algorithm computation method */ template -DAAL_EXPORT Status OnlinePartialResult::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, - const int method) +Status OnlinePartialResult::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, const int method) { auto pDataCollection13 = new DataCollection(); auto pDataCollection12 = new DataCollection(); @@ -58,8 +57,7 @@ DAAL_EXPORT Status OnlinePartialResult::allocate(const daal::algorithms::Input * } template -DAAL_EXPORT Status OnlinePartialResult::initialize(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, - const int method) +Status OnlinePartialResult::initialize(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, const int method) { get(outputOfStep1ForStep3)->clear(); get(outputOfStep1ForStep2)->clear(); @@ -74,7 +72,7 @@ DAAL_EXPORT Status OnlinePartialResult::initialize(const daal::algorithms::Input * \param[in] par Reference to the object with the algorithm parameters */ template -DAAL_EXPORT Status OnlinePartialResult::addPartialResultStorage(size_t m, size_t n, Parameter & par) +Status OnlinePartialResult::addPartialResultStorage(size_t m, size_t n, Parameter & par) { DataCollectionPtr rCollection = staticPointerCast(Argument::get(outputOfStep1ForStep2)); Status st; diff --git a/cpp/daal/src/algorithms/svd/svd_dense_default_online_fpt.cpp b/cpp/daal/src/algorithms/svd/svd_dense_default_online_fpt.cpp index 3042502723e..dc5c90fdd06 100644 --- a/cpp/daal/src/algorithms/svd/svd_dense_default_online_fpt.cpp +++ b/cpp/daal/src/algorithms/svd/svd_dense_default_online_fpt.cpp @@ -30,11 +30,11 @@ namespace svd { namespace interface1 { -template DAAL_EXPORT Status OnlinePartialResult::allocate(const daal::algorithms::Input * input, - const daal::algorithms::Parameter * parameter, const int method); -template DAAL_EXPORT Status OnlinePartialResult::initialize(const daal::algorithms::Input * input, - const daal::algorithms::Parameter * parameter, const int method); -template DAAL_EXPORT Status OnlinePartialResult::addPartialResultStorage(size_t m, size_t n, Parameter & par); +template Status OnlinePartialResult::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, + const int method); +template Status OnlinePartialResult::initialize(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, + const int method); +template Status OnlinePartialResult::addPartialResultStorage(size_t m, size_t n, Parameter & par); } // namespace interface1 } // namespace svd diff --git a/cpp/daal/src/data_management/data_collection.cpp b/cpp/daal/src/data_management/data_collection.cpp index d41e1eded54..46032725c94 100644 --- a/cpp/daal/src/data_management/data_collection.cpp +++ b/cpp/daal/src/data_management/data_collection.cpp @@ -25,7 +25,7 @@ namespace data_management namespace interface1 { template -DAAL_EXPORT services::SharedPtr & KeyValueCollection::operator[](size_t k) +services::SharedPtr & KeyValueCollection::operator[](size_t k) { size_t i; for (i = 0; i < _keys.size(); i++) @@ -40,7 +40,7 @@ DAAL_EXPORT services::SharedPtr & KeyValueCollection::operator[](size_t k) return _values[i]; } -#define DAAL_INSTANTIATE_KEYVALUECOLLECTION(T) template DAAL_EXPORT services::SharedPtr & KeyValueCollection::operator[](size_t k); +#define DAAL_INSTANTIATE_KEYVALUECOLLECTION(T) template services::SharedPtr & KeyValueCollection::operator[](size_t k); DAAL_INSTANTIATE_KEYVALUECOLLECTION(SerializationIface) DAAL_INSTANTIATE_KEYVALUECOLLECTION(algorithms::Input) diff --git a/cpp/daal/src/externals/core_threading_win_dll.cpp b/cpp/daal/src/externals/core_threading_win_dll.cpp index 37c4f7d0e2b..7a25a0eddd1 100644 --- a/cpp/daal/src/externals/core_threading_win_dll.cpp +++ b/cpp/daal/src/externals/core_threading_win_dll.cpp @@ -29,19 +29,15 @@ static HMODULE daal_thr_dll_handle = NULL; daal::services::Environment::LibraryThreadingType __daal_serv_get_thr_set(); -#define __GLUE__(a, b) a##b - -#ifdef _DEBUG - #define _DLL_SUFFIX(name) __GLUE__(name, "d.2.dll") -#else - #define _DLL_SUFFIX(name) __GLUE__(name, ".2.dll") -#endif - #define DAAL_LOAD_DLL(name) _daal_load_win_dynamic_lib(name) DAAL_EXPORT HMODULE load_onedal_thread_dll() { - return DAAL_LOAD_DLL(_DLL_SUFFIX("onedal_thread")); +#ifdef _DEBUG + return DAAL_LOAD_DLL("onedal_threadd.3.dll"); +#else + return DAAL_LOAD_DLL("onedal_thread.3.dll"); +#endif } static void load_daal_thr_dll(void) @@ -58,7 +54,7 @@ static void load_daal_thr_dll(void) daal_thr_dll_handle = load_onedal_thread_dll(); if (daal_thr_dll_handle == NULL) { - printf("Intel oneDAL FATAL ERROR: Cannot load onedal_thread.2.dll.\n"); + printf("Intel oneDAL FATAL ERROR: Cannot load onedal_thread.3.dll.\n"); exit(1); } break; @@ -71,13 +67,13 @@ static void load_daal_thr_dll(void) return; } - printf("Intel oneDAL FATAL ERROR: Cannot load onedal_thread.2.dll.\n"); + printf("Intel oneDAL FATAL ERROR: Cannot load onedal_thread.3.dll.\n"); exit(1); } } } -FARPROC load_daal_thr_func(char * ordinal) +FARPROC load_daal_thr_func(const char * ordinal) { FARPROC FuncAddress; @@ -794,68 +790,68 @@ DAAL_EXPORT void * _getThreadPinner(bool create_pinner, void (*read_topo)(int &, #endif #define CALL_VOID_FUNC_FROM_DLL(fn_dpref, fn_name, argdecl, argcall) \ - typedef void(*##fn_dpref##fn_name##_t)##argdecl; \ + typedef void(*fn_dpref##fn_name##_t) argdecl; \ static fn_dpref##fn_name##_t fn_dpref##fn_name##_ptr = NULL; \ CALL_VOID_FUNC_FROM_DLL_CPU(fn_dpref, avx512_, fn_name, argdecl, argcall) \ CALL_VOID_FUNC_FROM_DLL_CPU(fn_dpref, avx2_, fn_name, argdecl, argcall) \ CALL_VOID_FUNC_FROM_DLL_CPU(fn_dpref, sse42_, fn_name, argdecl, argcall) \ CALL_VOID_FUNC_FROM_DLL_CPU(fn_dpref, sse2_, fn_name, argdecl, argcall) -#define CALL_VOID_FUNC_FROM_DLL_CPU(fn_dpref, fn_cpu, fn_name, argdecl, argcall) \ - extern "C" DAAL_EXPORT void fn_dpref##fn_cpu##fn_name##argdecl \ - { \ - load_daal_thr_dll(); \ - if (##fn_dpref##fn_name##_ptr == NULL) \ - { \ - ##fn_dpref##fn_name##_ptr = (##fn_dpref##fn_name##_t)load_daal_thr_func(#fn_dpref #fn_cpu #fn_name); \ - } \ - ##fn_dpref##fn_name##_ptr##argcall; \ +#define CALL_VOID_FUNC_FROM_DLL_CPU(fn_dpref, fn_cpu, fn_name, argdecl, argcall) \ + extern "C" DAAL_EXPORT void fn_dpref##fn_cpu##fn_name argdecl \ + { \ + load_daal_thr_dll(); \ + if (fn_dpref##fn_name##_ptr == NULL) \ + { \ + fn_dpref##fn_name##_ptr = (fn_dpref##fn_name##_t)load_daal_thr_func(#fn_dpref #fn_cpu #fn_name); \ + } \ + fn_dpref##fn_name##_ptr argcall; \ } #if defined(_WIN64) - #define CALL_VOID_FUNC_FROM_DLL_CPU_MIC(fn_dpref, fn_cpu, fn_name, argdecl, argcall) \ - extern "C" DAAL_EXPORT void fn_dpref##fn_cpu##fn_name##argdecl \ - { \ - load_daal_thr_dll(); \ - if (##fn_dpref##fn_name##_ptr == NULL) \ - { \ - ##fn_dpref##fn_name##_ptr = (##fn_dpref##fn_name##_t)load_daal_thr_func(#fn_dpref #fn_cpu #fn_name); \ - } \ - ##fn_dpref##fn_name##_ptr##argcall; \ + #define CALL_VOID_FUNC_FROM_DLL_CPU_MIC(fn_dpref, fn_cpu, fn_name, argdecl, argcall) \ + extern "C" DAAL_EXPORT void fn_dpref##fn_cpu##fn_name argdecl \ + { \ + load_daal_thr_dll(); \ + if (fn_dpref##fn_name##_ptr == NULL) \ + { \ + fn_dpref##fn_name##_ptr = (fn_dpref##fn_name##_t)load_daal_thr_func(#fn_dpref #fn_cpu #fn_name); \ + } \ + fn_dpref##fn_name##_ptr argcall; \ } #else #define CALL_VOID_FUNC_FROM_DLL_CPU_MIC(fn_dpref, fn_cpu, fn_name, argdecl, argcall) #endif #define CALL_RET_FUNC_FROM_DLL(ret_type, fn_dpref, fn_name, argdecl, argcall) \ - typedef ret_type(*##fn_dpref##fn_name##_t)##argdecl; \ + typedef ret_type(*fn_dpref##fn_name##_t) argdecl; \ static fn_dpref##fn_name##_t fn_dpref##fn_name##_ptr = NULL; \ CALL_RET_FUNC_FROM_DLL_CPU(ret_type, fn_dpref, avx512_, fn_name, argdecl, argcall) \ CALL_RET_FUNC_FROM_DLL_CPU(ret_type, fn_dpref, avx2_, fn_name, argdecl, argcall) \ CALL_RET_FUNC_FROM_DLL_CPU(ret_type, fn_dpref, sse42_, fn_name, argdecl, argcall) \ CALL_RET_FUNC_FROM_DLL_CPU(ret_type, fn_dpref, sse2_, fn_name, argdecl, argcall) -#define CALL_RET_FUNC_FROM_DLL_CPU(ret_type, fn_dpref, fn_cpu, fn_name, argdecl, argcall) \ - extern "C" DAAL_EXPORT ret_type fn_dpref##fn_cpu##fn_name##argdecl \ - { \ - load_daal_thr_dll(); \ - if (##fn_dpref##fn_name##_ptr == NULL) \ - { \ - ##fn_dpref##fn_name##_ptr = (##fn_dpref##fn_name##_t)load_daal_thr_func(#fn_dpref #fn_cpu #fn_name); \ - } \ - return fn_dpref##fn_name##_ptr##argcall; \ +#define CALL_RET_FUNC_FROM_DLL_CPU(ret_type, fn_dpref, fn_cpu, fn_name, argdecl, argcall) \ + extern "C" DAAL_EXPORT ret_type fn_dpref##fn_cpu##fn_name argdecl \ + { \ + load_daal_thr_dll(); \ + if (fn_dpref##fn_name##_ptr == NULL) \ + { \ + fn_dpref##fn_name##_ptr = (fn_dpref##fn_name##_t)load_daal_thr_func(#fn_dpref #fn_cpu #fn_name); \ + } \ + return fn_dpref##fn_name##_ptr argcall; \ } #if defined(_WIN64) - #define CALL_RET_FUNC_FROM_DLL_CPU_MIC(ret_type, fn_dpref, fn_cpu, fn_name, argdecl, argcall) \ - extern "C" DAAL_EXPORT ret_type fn_dpref##fn_cpu##fn_name##argdecl \ - { \ - load_daal_thr_dll(); \ - if (##fn_dpref##fn_name##_ptr == NULL) \ - { \ - ##fn_dpref##fn_name##_ptr = (##fn_dpref##fn_name##_t)load_daal_thr_func(#fn_dpref #fn_cpu #fn_name); \ - } \ - return fn_dpref##fn_name##_ptr##argcall; \ + #define CALL_RET_FUNC_FROM_DLL_CPU_MIC(ret_type, fn_dpref, fn_cpu, fn_name, argdecl, argcall) \ + extern "C" DAAL_EXPORT ret_type fn_dpref##fn_cpu##fn_name argdecl \ + { \ + load_daal_thr_dll(); \ + if (fn_dpref##fn_name##_ptr == NULL) \ + { \ + fn_dpref##fn_name##_ptr = (fn_dpref##fn_name##_t)load_daal_thr_func(#fn_dpref #fn_cpu #fn_name); \ + } \ + return fn_dpref##fn_name##_ptr argcall; \ } #else #define CALL_RET_FUNC_FROM_DLL_CPU_MIC(ret_type, fn_dpref, fn_cpu, fn_name, argdecl, argcall) @@ -866,6 +862,7 @@ CALL_VOID_FUNC_FROM_DLL(fpk_blas_, dsyrk, (const char * uplo, const char * trans, const DAAL_INT * n, const DAAL_INT * k, const double * alpha, const double * a, const DAAL_INT * lda, const double * beta, double * c, const DAAL_INT * ldc), (uplo, trans, n, k, alpha, a, lda, beta, c, ldc)); + CALL_VOID_FUNC_FROM_DLL(fpk_blas_, ssyrk, (const char * uplo, const char * trans, const DAAL_INT * n, const DAAL_INT * k, const float * alpha, const float * a, const DAAL_INT * lda, const float * beta, float * c, const DAAL_INT * ldc), @@ -1137,30 +1134,30 @@ typedef double Ipp64f; CALL_RET_FUNC_FROM_DLL(IppStatus, fpk_dft_, ippsSortRadixAscend_64f_I, (Ipp64f * pSrcDst, Ipp64f * pTmp, Ipp32s len), (pSrcDst, pTmp, len)); CALL_RET_FUNC_FROM_DLL(IppStatus, fpk_dft_, ippsSortRadixAscend_32f_I, (Ipp32f * pSrcDst, Ipp32f * pTmp, Ipp32s len), (pSrcDst, pTmp, len)); -#define CALL_VOID_FUNC_FROM_DLL_ALONE(fn_dpref, fn_name, argdecl, argcall) \ - typedef void(*##fn_dpref##fn_name##_t)##argdecl; \ - static fn_dpref##fn_name##_t fn_dpref##fn_name##_ptr = NULL; \ - extern "C" DAAL_EXPORT void fn_dpref##fn_name##argdecl \ - { \ - load_daal_thr_dll(); \ - if (##fn_dpref##fn_name##_ptr == NULL) \ - { \ - ##fn_dpref##fn_name##_ptr = (##fn_dpref##fn_name##_t)load_daal_thr_func(#fn_dpref #fn_name); \ - } \ - ##fn_dpref##fn_name##_ptr##argcall; \ - } - -#define CALL_RET_FUNC_FROM_DLL_ALONE(ret_type, fn_dpref, fn_name, argdecl, argcall) \ - typedef ret_type(*##fn_dpref##fn_name##_t)##argdecl; \ - static fn_dpref##fn_name##_t fn_dpref##fn_name##_ptr = NULL; \ - extern "C" DAAL_EXPORT ret_type fn_dpref##fn_name##argdecl \ - { \ - load_daal_thr_dll(); \ - if (##fn_dpref##fn_name##_ptr == NULL) \ - { \ - ##fn_dpref##fn_name##_ptr = (##fn_dpref##fn_name##_t)load_daal_thr_func(#fn_dpref #fn_name); \ - } \ - return fn_dpref##fn_name##_ptr##argcall; \ +#define CALL_VOID_FUNC_FROM_DLL_ALONE(fn_dpref, fn_name, argdecl, argcall) \ + typedef void(*fn_dpref##fn_name##_t) argdecl; \ + static fn_dpref##fn_name##_t fn_dpref##fn_name##_ptr = NULL; \ + extern "C" DAAL_EXPORT void fn_dpref##fn_name argdecl \ + { \ + load_daal_thr_dll(); \ + if (fn_dpref##fn_name##_ptr == NULL) \ + { \ + fn_dpref##fn_name##_ptr = (fn_dpref##fn_name##_t)load_daal_thr_func(#fn_dpref #fn_name); \ + } \ + fn_dpref##fn_name##_ptr argcall; \ + } + +#define CALL_RET_FUNC_FROM_DLL_ALONE(ret_type, fn_dpref, fn_name, argdecl, argcall) \ + typedef ret_type(*fn_dpref##fn_name##_t) argdecl; \ + static fn_dpref##fn_name##_t fn_dpref##fn_name##_ptr = NULL; \ + extern "C" DAAL_EXPORT ret_type fn_dpref##fn_name argdecl \ + { \ + load_daal_thr_dll(); \ + if (fn_dpref##fn_name##_ptr == NULL) \ + { \ + fn_dpref##fn_name##_ptr = (fn_dpref##fn_name##_t)load_daal_thr_func(#fn_dpref #fn_name); \ + } \ + return fn_dpref##fn_name##_ptr argcall; \ } CALL_VOID_FUNC_FROM_DLL_ALONE(fpk_serv_, set_num_threads, (int nth), (nth)); diff --git a/cpp/daal/src/externals/service_stat_mkl.h b/cpp/daal/src/externals/service_stat_mkl.h index 8d184cba43e..05ab508589a 100644 --- a/cpp/daal/src/externals/service_stat_mkl.h +++ b/cpp/daal/src/externals/service_stat_mkl.h @@ -93,7 +93,7 @@ extern "C" threadgetlimit getlimit; }; - static void _daal_mkl_threader_for_sequential(DAAL_INT n, DAAL_INT threads_request, void * a, func_type func) + [[maybe_unused]] static void _daal_mkl_threader_for_sequential(DAAL_INT n, DAAL_INT threads_request, void * a, func_type func) { DAAL_INT i; @@ -103,7 +103,7 @@ extern "C" } } - static void _daal_mkl_threader_for_ordered_sequential(DAAL_INT n, DAAL_INT threads_request, void * a, func_type func) + [[maybe_unused]] static void _daal_mkl_threader_for_ordered_sequential(DAAL_INT n, DAAL_INT threads_request, void * a, func_type func) { DAAL_INT i; @@ -113,42 +113,42 @@ extern "C" } } - static void _daal_mkl_threader_sections_sequential(DAAL_INT threads_request, void * a, func_type func) + [[maybe_unused]] static void _daal_mkl_threader_sections_sequential(DAAL_INT threads_request, void * a, func_type func) { func(0, 0, 1, a); } - static void _daal_mkl_threader_ordered_sequential(DAAL_INT i, DAAL_INT th_idx, DAAL_INT th_num, void * a, func_type func) + [[maybe_unused]] static void _daal_mkl_threader_ordered_sequential(DAAL_INT i, DAAL_INT th_idx, DAAL_INT th_num, void * a, func_type func) { func(i, th_idx, th_num, a); } - static DAAL_INT _daal_mkl_threader_get_max_threads_sequential() + [[maybe_unused]] static DAAL_INT _daal_mkl_threader_get_max_threads_sequential() { return 1; } - static void _daal_mkl_threader_for(DAAL_INT n, DAAL_INT threads_request, void * a, func_type func) + [[maybe_unused]] static void _daal_mkl_threader_for(DAAL_INT n, DAAL_INT threads_request, void * a, func_type func) { fpk_vsl_serv_threader_for(n, threads_request, a, func); } - static void _daal_mkl_threader_for_ordered(DAAL_INT n, DAAL_INT threads_request, void * a, func_type func) + [[maybe_unused]] static void _daal_mkl_threader_for_ordered(DAAL_INT n, DAAL_INT threads_request, void * a, func_type func) { fpk_vsl_serv_threader_for_ordered(n, threads_request, a, func); } - static void _daal_mkl_threader_sections(DAAL_INT threads_request, void * a, func_type func) + [[maybe_unused]] static void _daal_mkl_threader_sections(DAAL_INT threads_request, void * a, func_type func) { fpk_vsl_serv_threader_sections(threads_request, a, func); } - static void _daal_mkl_threader_ordered(DAAL_INT i, DAAL_INT th_idx, DAAL_INT th_num, void * a, func_type func) + [[maybe_unused]] static void _daal_mkl_threader_ordered(DAAL_INT i, DAAL_INT th_idx, DAAL_INT th_num, void * a, func_type func) { //not used. To be implemented if needed. } - static DAAL_INT _daal_mkl_threader_get_max_threads() + [[maybe_unused]] static DAAL_INT _daal_mkl_threader_get_max_threads() { return fpk_vsl_serv_threader_get_num_threads_limit(); } diff --git a/cpp/daal/src/externals/service_stat_ref.h b/cpp/daal/src/externals/service_stat_ref.h index d01eef06d55..0ff35505527 100644 --- a/cpp/daal/src/externals/service_stat_ref.h +++ b/cpp/daal/src/externals/service_stat_ref.h @@ -88,7 +88,7 @@ extern "C" threadgetlimit getlimit; }; - static void _daal_mkl_threader_for_sequential(DAAL_INT n, DAAL_INT threads_request, void * a, func_type func) + [[maybe_unused]] static void _daal_mkl_threader_for_sequential(DAAL_INT n, DAAL_INT threads_request, void * a, func_type func) { DAAL_INT i; @@ -98,7 +98,7 @@ extern "C" } } - static void _daal_mkl_threader_for_ordered_sequential(DAAL_INT n, DAAL_INT threads_request, void * a, func_type func) + [[maybe_unused]] static void _daal_mkl_threader_for_ordered_sequential(DAAL_INT n, DAAL_INT threads_request, void * a, func_type func) { DAAL_INT i; @@ -108,42 +108,42 @@ extern "C" } } - static void _daal_mkl_threader_sections_sequential(DAAL_INT threads_request, void * a, func_type func) + [[maybe_unused]] static void _daal_mkl_threader_sections_sequential(DAAL_INT threads_request, void * a, func_type func) { func(0, 0, 1, a); } - static void _daal_mkl_threader_ordered_sequential(DAAL_INT i, DAAL_INT th_idx, DAAL_INT th_num, void * a, func_type func) + [[maybe_unused]] static void _daal_mkl_threader_ordered_sequential(DAAL_INT i, DAAL_INT th_idx, DAAL_INT th_num, void * a, func_type func) { func(i, th_idx, th_num, a); } - static DAAL_INT _daal_mkl_threader_get_max_threads_sequential() + [[maybe_unused]] static DAAL_INT _daal_mkl_threader_get_max_threads_sequential() { return 1; } - static void _daal_mkl_threader_for(DAAL_INT n, DAAL_INT threads_request, void * a, func_type func) + [[maybe_unused]] static void _daal_mkl_threader_for(DAAL_INT n, DAAL_INT threads_request, void * a, func_type func) { //fpk_vsl_serv_threader_for(n, threads_request, a, func); } - static void _daal_mkl_threader_for_ordered(DAAL_INT n, DAAL_INT threads_request, void * a, func_type func) + [[maybe_unused]] static void _daal_mkl_threader_for_ordered(DAAL_INT n, DAAL_INT threads_request, void * a, func_type func) { //fpk_vsl_serv_threader_for_ordered(n, threads_request, a, func); } - static void _daal_mkl_threader_sections(DAAL_INT threads_request, void * a, func_type func) + [[maybe_unused]] static void _daal_mkl_threader_sections(DAAL_INT threads_request, void * a, func_type func) { //fpk_vsl_serv_threader_sections(threads_request, a, func); } - static void _daal_mkl_threader_ordered(DAAL_INT i, DAAL_INT th_idx, DAAL_INT th_num, void * a, func_type func) + [[maybe_unused]] static void _daal_mkl_threader_ordered(DAAL_INT i, DAAL_INT th_idx, DAAL_INT th_num, void * a, func_type func) { //not used. To be implemented if needed. } - static DAAL_INT _daal_mkl_threader_get_max_threads() + [[maybe_unused]] static DAAL_INT _daal_mkl_threader_get_max_threads() { return 1; } diff --git a/cpp/daal/src/services/dll.rc b/cpp/daal/src/services/dll.rc index 1fc21a3ceec..fc99628d6d2 100644 --- a/cpp/daal/src/services/dll.rc +++ b/cpp/daal/src/services/dll.rc @@ -21,11 +21,11 @@ #if defined(_DAAL_THR_TBB) #define FILE_COMMENT "Parallel version.\0" - #define ORIG_FILE_NAME "onedal_thread.2.dll \0" + #define ORIG_FILE_NAME "onedal_thread.3.dll \0" #define INTERNAL_FILE_NAME "onedal_thread\0" #else #define FILE_COMMENT "Analitics algorithms optimized for IA.\0" - #define ORIG_FILE_NAME "onedal_core.2.dll\0" + #define ORIG_FILE_NAME "onedal_core.3.dll\0" #define INTERNAL_FILE_NAME "onedal_core\0" #endif diff --git a/cpp/daal/src/services/service_defines.h b/cpp/daal/src/services/service_defines.h index a891fa36071..954dfbecc9f 100644 --- a/cpp/daal/src/services/service_defines.h +++ b/cpp/daal/src/services/service_defines.h @@ -73,7 +73,7 @@ DAAL_EXPORT bool daal_check_is_intel_cpu(); #define PRAGMA_ICC_TO_STR(ARGS) #define PRAGMA_ICC_OMP(ARGS) #define PRAGMA_ICC_NO16(ARGS) - #define DAAL_TYPENAME + #define DAAL_TYPENAME typename #else #define PRAGMA_IVDEP #define PRAGMA_NOVECTOR diff --git a/dev/bazel/toolchains/common.bzl b/dev/bazel/toolchains/common.bzl index 6f926f6c27f..73b846d1f46 100644 --- a/dev/bazel/toolchains/common.bzl +++ b/dev/bazel/toolchains/common.bzl @@ -64,6 +64,8 @@ def detect_compiler(repo_ctx, os_id): return "cl" elif "icx" in compiler_path: return "icx" + elif "icpx" in compiler_path: + return "icpx" elif "icc" in compiler_path: return "icc" diff --git a/dev/make/compiler_definitions/icx.mkl.32e.mk b/dev/make/compiler_definitions/icx.mkl.32e.mk index 766f792c148..af18b3fe0ec 100644 --- a/dev/make/compiler_definitions/icx.mkl.32e.mk +++ b/dev/make/compiler_definitions/icx.mkl.32e.mk @@ -18,29 +18,40 @@ # Intel compiler definitions for makefile #-- -PLATs.icx = lnx32e mac32e +PLATs.icx = lnx32e win32e -CMPLRDIRSUFF.icx = _icx +CMPLRDIRSUFF.icx = CORE.SERV.COMPILER.icx = generic --Zl.icx = -no-intel-lib --DEBC.icx = -g -COMPILER.lnx.icx = icpx -m64 \ - -Werror -Wreturn-type +-Zl.icx = $(if $(OS_is_win),-Zl,) $(-Q)no-intel-lib +-DEBC.icx = $(if $(OS_is_win),-debug:all -Z7,-g) +-Qopt = $(if $(OS_is_win),-Qopt-,-qopt-) -link.dynamic.lnx.icx = icpx -m64 -no-intel-lib +COMPILER.lnx.icx = icx -m64 \ + -Werror -Wreturn-type -qopenmp-simd + +COMPILER.win.icx = icx $(if $(MSVC_RT_is_release),-MD, -MDd) -nologo -WX -Qopenmp-simd -Wno-deprecated-declarations + +link.dynamic.lnx.icx = icx -m64 -no-intel-lib pedantic.opts.icx = -pedantic \ -Wall \ -Wextra \ + -Wwritable-strings \ + -Wno-unused-parameter + +pedantic.opts.icx_win = -Wall \ + -Wextra \ + -Wwritable-strings \ -Wno-unused-parameter pedantic.opts.lnx.icx = $(pedantic.opts.icx) +pedantic.opts.win.icx = $(pedantic.opts.icx_win) -p4_OPT.icx = $(-Q)march=nocona -mc3_OPT.icx = $(-Q)march=nehalem -avx2_OPT.icx = $(-Q)march=haswell -skx_OPT.icx = $(-Q)march=skx +p4_OPT.icx = -march=nocona +mc3_OPT.icx = -march=nehalem +avx2_OPT.icx = -march=haswell +skx_OPT.icx = -march=skx diff --git a/docs/source/onedal/build_app/build-application.rst b/docs/source/onedal/build_app/build-application.rst index 5e7249b29bb..4092a3256ad 100644 --- a/docs/source/onedal/build_app/build-application.rst +++ b/docs/source/onedal/build_app/build-application.rst @@ -142,13 +142,13 @@ Applications on Windows* OS | onedal_threadd.lib * - Dynamic linking - - | onedal_cored_dll.lib (onedal_cored_dll.2.lib), - | onedald_dll.lib (onedald_dll.2.lib), - | onedal_dpcd_dll.lib (onedal_dpcd_dll.2.lib), - | onedald.2.dll, - | onedal_cored.2.dll, - | onedal_dpcd.2.dll, - | onedal_threadd.2.dll + | onedal_cored_dll.lib (onedal_cored_dll.3.lib), + | onedald_dll.lib (onedald_dll.3.lib), + | onedal_dpcd_dll.lib (onedal_dpcd_dll.3.lib), + | onedald.3.dll, + | onedal_cored.3.dll, + | onedal_dpcd.3.dll, + | onedal_threadd.3.dll Examples ******** diff --git a/makefile b/makefile index 0def208b0e0..d4d3ee6bc55 100644 --- a/makefile +++ b/makefile @@ -118,7 +118,6 @@ scr := $(if $(OS_is_win),bat,sh) y := $(notdir $(filter $(_OS)/%,lnx/so win/dll mac/dylib)) -Fo := $(if $(OS_is_win),-Fo,-o) -Q := $(if $(OS_is_win),$(if $(COMPILER_is_vc),-,-Q),-) --cxx11 := $(if $(COMPILER_is_vc),,$(-Q)std=c++11) -cxx17 := $(if $(COMPILER_is_vc),/std:c++17,$(-Q)std=c++17) -fPIC := $(if $(OS_is_win),,-fPIC) -Zl := $(-Zl.$(COMPILER)) @@ -474,7 +473,7 @@ $(WORKDIR.lib)/$(core_y): $(daaldep.math_backend.ext) \ $(CORE.tmpdir_y)/$(core_y:%.$y=%_link.txt) ; $(LINK.DYNAMIC) ; $(LINK.DYNAMIC.POST) $(CORE.objs_a): $(CORE.tmpdir_a)/inc_a_folders.txt -$(CORE.objs_a): COPT += $(-fPIC) $(-cxx11) $(-Zl) $(-DEBC) +$(CORE.objs_a): COPT += $(-fPIC) $(-cxx17) $(-Zl) $(-DEBC) $(CORE.objs_a): COPT += -D__TBB_NO_IMPLICIT_LINKAGE -DDAAL_NOTHROW_EXCEPTIONS \ -DDAAL_HIDE_DEPRECATED -DTBB_USE_ASSERT=0 -D_ENABLE_ATOMIC_ALIGNMENT_FIX \ $(if $(CHECK_DLL_SIG),-DDAAL_CHECK_DLL_SIG) @@ -483,7 +482,7 @@ $(CORE.objs_a): COPT += @$(CORE.tmpdir_a)/inc_a_folders.txt $(eval $(call append_uarch_copt,$(CORE.objs_a))) $(CORE.objs_y): $(CORE.tmpdir_y)/inc_y_folders.txt -$(CORE.objs_y): COPT += $(-fPIC) $(-cxx11) $(-Zl) $(-DEBC) +$(CORE.objs_y): COPT += $(-fPIC) $(-cxx17) $(-Zl) $(-DEBC) $(CORE.objs_y): COPT += -D__DAAL_IMPLEMENTATION \ -D__TBB_NO_IMPLICIT_LINKAGE -DDAAL_NOTHROW_EXCEPTIONS \ -DDAAL_HIDE_DEPRECATED -DTBB_USE_ASSERT=0 -D_ENABLE_ATOMIC_ALIGNMENT_FIX \ @@ -829,7 +828,7 @@ THR.objs_y := $(THR_TBB.objs_y) THR_TBB.objs := $(THR_TBB.objs_a) $(THR_TBB.objs_y) THR.objs := $(THR.objs_a) $(THR.objs_y) -$(THR.objs): COPT += $(-fPIC) $(-cxx11) $(-Zl) $(-DEBC) -DDAAL_HIDE_DEPRECATED -DTBB_USE_ASSERT=0 -D_ENABLE_ATOMIC_ALIGNMENT_FIX +$(THR.objs): COPT += $(-fPIC) $(-cxx17) $(-Zl) $(-DEBC) -DDAAL_HIDE_DEPRECATED -DTBB_USE_ASSERT=0 -D_ENABLE_ATOMIC_ALIGNMENT_FIX $(THR.objs_a): $(THR.tmpdir_a)/thr_inc_a_folders.txt $(THR.objs_a): COPT += @$(THR.tmpdir_a)/thr_inc_a_folders.txt diff --git a/makefile.ver b/makefile.ver index 5dd325388c7..9ffe0b05dc5 100644 --- a/makefile.ver +++ b/makefile.ver @@ -21,7 +21,7 @@ BUILD = $(shell date +'%Y%m%d') STATUS = P BUILDREV ?= work -MAJORBINARY = 2 +MAJORBINARY = 3 MINORBINARY = 0 #-------------------------------------------------------------------------------