fixes for daal_exports

oneapi-src · Sep 24, 2024 · 29f4852 · 29f4852
1 parent 488c400
commit 29f4852
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 32 deletions.
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
@@ -40,7 +40,7 @@ using namespace daal::services;
  * \param[in] method Computation method for the algorithm
  */
 template <typename algorithmFPType>
-Status Result::allocate(const daal::algorithms::Input * input, const Parameter * parameter, const int method)
+DAAL_EXPORT services::Status Result::allocate(const daal::algorithms::Input * input, const Parameter * parameter, const int method)
 {
     const Input * const in = static_cast<const Input *>(input);
 
@@ -57,7 +57,8 @@ Status Result::allocate(const daal::algorithms::Input * input, const Parameter *
     return s;
 }
 
-template services::Status Result::allocate<DAAL_FPTYPE>(const daal::algorithms::Input * input, const Parameter * parameter, const int method);
+template DAAL_EXPORT services::Status Result::allocate<DAAL_FPTYPE>(const daal::algorithms::Input * input, const Parameter * parameter,
+                                                                    const int method);
 
 } // namespace training
 } // namespace elastic_net

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
@@ -40,7 +40,7 @@ using namespace daal::services;
  * \param[in] method Computation method for the algorithm
  */
 template <typename algorithmFPType>
-Status Result::allocate(const daal::algorithms::Input * input, const Parameter * parameter, const int method)
+DAAL_EXPORT services::Status Result::allocate(const daal::algorithms::Input * input, const Parameter * parameter, const int method)
 {
     const Input * const in = static_cast<const Input *>(input);
 
@@ -57,7 +57,8 @@ Status Result::allocate(const daal::algorithms::Input * input, const Parameter *
     return s;
 }
 
-template services::Status Result::allocate<DAAL_FPTYPE>(const daal::algorithms::Input * input, const Parameter * parameter, const int method);
+template DAAL_EXPORT services::Status Result::allocate<DAAL_FPTYPE>(const daal::algorithms::Input * input, const Parameter * parameter,
+                                                                    const int method);
 
 } // namespace training
 } // namespace lasso_regression

diff --git 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 <typename algorithmFPType>
-Status Result::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, const int method)
+DAAL_EXPORT services::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);
@@ -61,8 +61,9 @@ Status Result::allocate(const daal::algorithms::Input * input, const int method)
     return allocate<algorithmFPType>(input, NULL, method);
 }
 
+template DAAL_EXPORT services::Status Result::allocate<DAAL_FPTYPE>(const daal::algorithms::Input * input,
+                                                                    const daal::algorithms::Parameter * parameter, const int method);
 template Status Result::allocate<DAAL_FPTYPE>(const daal::algorithms::Input * input, const int method);
-template Status Result::allocate<DAAL_FPTYPE>(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, const int method);
 
 } // namespace interface2
 } // namespace zscore

diff --git a/cpp/daal/src/algorithms/pca/pca_partialresult_correlation_fpt.cpp b/cpp/daal/src/algorithms/pca/pca_partialresult_correlation_fpt.cpp
@@ -29,10 +29,12 @@ namespace algorithms
 {
 namespace pca
 {
-template services::Status PartialResult<correlationDense>::allocate<DAAL_FPTYPE>(const daal::algorithms::Input * input,
-                                                                                 const daal::algorithms::Parameter * parameter, const int method);
-template services::Status PartialResult<correlationDense>::initialize<DAAL_FPTYPE>(const daal::algorithms::Input * input,
-                                                                                   const daal::algorithms::Parameter * parameter, const int method);
+template DAAL_EXPORT services::Status PartialResult<correlationDense>::allocate<DAAL_FPTYPE>(const daal::algorithms::Input * input,
+                                                                                             const daal::algorithms::Parameter * parameter,
+                                                                                             const int method);
+template DAAL_EXPORT services::Status PartialResult<correlationDense>::initialize<DAAL_FPTYPE>(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
@@ -41,8 +41,8 @@ namespace pca
  * \param[in] method    Computation method
  */
 template <typename algorithmFPType>
-services::Status PartialResult<svdDense>::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter,
-                                                   const int method)
+DAAL_EXPORT services::Status PartialResult<svdDense>::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter,
+                                                               const int method)
 {
     services::Status s;
     set(nObservationsSVD, HomogenNumericTable<algorithmFPType>::create(1, 1, NumericTableIface::doAllocate, 0, &s));
@@ -55,8 +55,8 @@ services::Status PartialResult<svdDense>::allocate(const daal::algorithms::Input
 };
 
 template <typename algorithmFPType>
-services::Status PartialResult<svdDense>::initialize(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter,
-                                                     const int method)
+DAAL_EXPORT services::Status PartialResult<svdDense>::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
@@ -29,10 +29,11 @@ namespace algorithms
 {
 namespace pca
 {
-template services::Status PartialResult<svdDense>::allocate<DAAL_FPTYPE>(const daal::algorithms::Input * input,
-                                                                         const daal::algorithms::Parameter * parameter, const int method);
-template services::Status PartialResult<svdDense>::initialize<DAAL_FPTYPE>(const daal::algorithms::Input * input,
-                                                                           const daal::algorithms::Parameter * parameter, const int method);
+template DAAL_EXPORT services::Status PartialResult<svdDense>::allocate<DAAL_FPTYPE>(const daal::algorithms::Input * input,
+                                                                                     const daal::algorithms::Parameter * parameter, const int method);
+template DAAL_EXPORT services::Status PartialResult<svdDense>::initialize<DAAL_FPTYPE>(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
@@ -63,7 +63,8 @@ DAAL_EXPORT services::Status Result::allocate(const daal::algorithms::Input * in
  * \param[in] method        Computation method
  */
 template <typename algorithmFPType>
-services::Status Result::allocate(const daal::algorithms::PartialResult * partialResult, daal::algorithms::Parameter * parameter, const Method method)
+DAAL_EXPORT services::Status Result::allocate(const daal::algorithms::PartialResult * partialResult, daal::algorithms::Parameter * parameter,
+                                              const Method method)
 {
     size_t nComponents           = 0;
     DAAL_UINT64 resultsToCompute = eigenvalue;
@@ -76,8 +77,8 @@ services::Status Result::allocate(const daal::algorithms::PartialResult * partia
 
 template DAAL_EXPORT services::Status Result::allocate<DAAL_FPTYPE>(const daal::algorithms::Input * input, daal::algorithms::Parameter * parameter,
                                                                     const Method method);
-template services::Status Result::allocate<DAAL_FPTYPE>(const daal::algorithms::PartialResult * partialResult,
-                                                        daal::algorithms::Parameter * parameter, const Method method);
+template DAAL_EXPORT services::Status Result::allocate<DAAL_FPTYPE>(const daal::algorithms::PartialResult * partialResult,
+                                                                    daal::algorithms::Parameter * parameter, const Method method);
 
 } // namespace interface3
 } // namespace pca

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
@@ -41,7 +41,8 @@ namespace interface1
  * Allocates memory to store partial results of the SVD algorithm
  */
 template <typename algorithmFPType>
-Status DistributedPartialResult::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, const int method)
+DAAL_EXPORT services::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()));
@@ -61,7 +62,7 @@ Status DistributedPartialResult::allocate(const daal::algorithms::Input * input,
  * \param[out] nBlocks         Number of rows in the input data set
  */
 template <typename algorithmFPType>
-Status DistributedPartialResult::setPartialResultStorage(KeyValueDataCollection * inCollection, size_t & nBlocks)
+DAAL_EXPORT services::Status DistributedPartialResult::setPartialResultStorage(KeyValueDataCollection * inCollection, size_t & nBlocks)
 {
     KeyValueDataCollectionPtr partialCollection = staticPointerCast<KeyValueDataCollection, SerializationIface>(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
@@ -30,10 +30,11 @@ namespace svd
 {
 namespace interface1
 {
-template services::Status DistributedPartialResult::allocate<DAAL_FPTYPE>(const daal::algorithms::Input * input,
-                                                                          const daal::algorithms::Parameter * parameter, const int method);
-template services::Status DistributedPartialResult::setPartialResultStorage<DAAL_FPTYPE>(data_management::KeyValueDataCollection * inCollection,
-                                                                                         size_t & nBlocks);
+template DAAL_EXPORT services::Status DistributedPartialResult::allocate<DAAL_FPTYPE>(const daal::algorithms::Input * input,
+                                                                                      const daal::algorithms::Parameter * parameter,
+                                                                                      const int method);
+template DAAL_EXPORT services::Status DistributedPartialResult::setPartialResultStorage<DAAL_FPTYPE>(
+    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
@@ -42,7 +42,8 @@ namespace interface1
  * \param[in] method    Algorithm computation method
  */
 template <typename algorithmFPType>
-Status DistributedPartialResultStep3::allocate(const daal::algorithms::Input * input, const daal::algorithms::Parameter * parameter, const int method)
+DAAL_EXPORT services::Status DistributedPartialResultStep3::allocate(const daal::algorithms::Input * input,
+                                                                     const daal::algorithms::Parameter * parameter, const int method)
 {
     Argument::set(finalResultFromStep3, ResultPtr(new Result()));
     return Status();
@@ -54,7 +55,7 @@ Status DistributedPartialResultStep3::allocate(const daal::algorithms::Input * i
  * \param[in]  qCollection  DataCollection of all partial results from step 1 of the SVD algorithm in the distributed processing mode
  */
 template <typename algorithmFPType>
-Status DistributedPartialResultStep3::setPartialResultStorage(data_management::DataCollection * qCollection)
+DAAL_EXPORT services::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
@@ -30,9 +30,11 @@ namespace svd
 {
 namespace interface1
 {
-template services::Status DistributedPartialResultStep3::allocate<DAAL_FPTYPE>(const daal::algorithms::Input * input,
-                                                                               const daal::algorithms::Parameter * parameter, const int method);
-template services::Status DistributedPartialResultStep3::setPartialResultStorage<DAAL_FPTYPE>(data_management::DataCollection * qCollection);
+template DAAL_EXPORT services::Status DistributedPartialResultStep3::allocate<DAAL_FPTYPE>(const daal::algorithms::Input * input,
+                                                                                           const daal::algorithms::Parameter * parameter,
+                                                                                           const int method);
+template DAAL_EXPORT services::Status DistributedPartialResultStep3::setPartialResultStorage<DAAL_FPTYPE>(
+    data_management::DataCollection * qCollection);
 
 } // namespace interface1
 } // namespace svd