Add DAAL_EXPORT, update copyrights, address comments

uxlfoundation · Aug 22, 2024 · b0c3428 · b0c3428
1 parent 90b149f
commit b0c3428
Show file tree

Hide file tree

Showing 18 changed files with 35 additions and 47 deletions.
diff --git a/cpp/daal/src/algorithms/spectral_embedding/spectral_embedding_default_dense_fpt_cpu.cpp b/cpp/daal/src/algorithms/spectral_embedding/spectral_embedding_default_dense_fpt_cpu.cpp
@@ -1,6 +1,6 @@
 /* file: spectral_embedding_default_dense_fpt_cpu.cpp */
 /*******************************************************************************
-* Copyright 2024 Intel Corporation
+* Copyright contributors to the oneDAL project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -36,4 +36,4 @@ template class SpectralEmbeddingKernel<DAAL_FPTYPE, defaultDense, DAAL_CPU>;
 } // namespace internal
 } // namespace spectral_embedding
 } // namespace algorithms
-} // namespace daal
+} // namespace daal
diff --git a/cpp/daal/src/algorithms/spectral_embedding/spectral_embedding_default_dense_impl.i b/cpp/daal/src/algorithms/spectral_embedding/spectral_embedding_default_dense_impl.i
@@ -1,6 +1,6 @@
 /* file: spectral_embedding_default_dense_impl.i */
 /*******************************************************************************
-* Copyright 2024 Intel Corporation
+* Copyright contributors to the oneDAL project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -66,41 +66,32 @@ services::Status computeEigenvectorsInplace(size_t nFeatures, algorithmFPType *
  *  \brief Kernel for Spectral Embedding calculation
  */
 template <typename algorithmFPType, Method method, CpuType cpu>
-services::Status SpectralEmbeddingKernel<algorithmFPType, method, cpu>::compute(const NumericTable * xTable, NumericTable * eTable,
-                                                                                const KernelParameter & par)
+DAAL_EXPORT services::Status SpectralEmbeddingKernel<algorithmFPType, method, cpu>::compute(const NumericTable * xTable, NumericTable * eTable,
+                                                                                            const KernelParameter & par)
 {
-    services::Status safeStat;
+    services::Status status;
     std::cout << "inside DAAL kernel" << std::endl;
     std::cout << "Params: " << par.numEmb << " " << par.numNeighbors << std::endl;
     size_t k       = par.numEmb;
     size_t filtNum = par.numNeighbors + 1;
     size_t n       = xTable->getNumberOfRows(); /* Number of input feature vectors   */
 
     SharedPtr<HomogenNumericTable<algorithmFPType> > tmpMatrixPtr =
-        HomogenNumericTable<algorithmFPType>::create(n, n, NumericTable::doAllocate, &safeStat);
-    if (!safeStat)
+        HomogenNumericTable<algorithmFPType>::create(n, n, NumericTable::doAllocate, &status);
+    if (!status)
     {
-        return safeStat;
+        return status;
     }
     NumericTable * covOutput = tmpMatrixPtr.get();
-
-    NumericTable * a0 = const_cast<NumericTable *>(xTable);
-    NumericTable ** a = &a0;
-    NumericTable ** r = &covOutput;
+    NumericTable * a0        = const_cast<NumericTable *>(xTable);
 
     // Compute cosine distances matrix
-    auto * cosDistKernelPtr = new cosine_distance::internal::DistanceKernel<algorithmFPType, cosine_distance::Method::defaultDense, cpu>();
-
-    services::Status cosDistStatus = cosDistKernelPtr->compute(0, a, 0, r, nullptr);
-
-    delete cosDistKernelPtr;
-
-    if (!cosDistStatus)
     {
-        return cosDistStatus;
+        auto cosDistanceKernel = cosine_distance::internal::DistanceKernel<algorithmFPType, cosine_distance::Method::defaultDense, cpu>();
+        DAAL_CHECK_STATUS(status, cosDistanceKernel.compute(0, &a0, 0, &covOutput, nullptr));
     }
 
-    WriteRows<algorithmFPType, cpu> xMatrix(*r, 0, n);
+    WriteRows<algorithmFPType, cpu> xMatrix(covOutput, 0, n);
     DAAL_CHECK_BLOCK_STATUS(xMatrix);
     algorithmFPType * x = xMatrix.get();
 
@@ -112,7 +103,7 @@ services::Status SpectralEmbeddingKernel<algorithmFPType, method, cpu>::compute(
     {
         L    = 0; // min possible cos distance
         R    = 2; // max possible cos distance
-        lcnt = 0; // numer of elements with cos distance <= L
+        lcnt = 0; // number of elements with cos distance <= L
         rcnt = n; // number of elements with cos distance <= R
         for (size_t ij = 0; ij < binarySearchIterNum; ++ij)
         {
@@ -182,11 +173,8 @@ services::Status SpectralEmbeddingKernel<algorithmFPType, method, cpu>::compute(
     TArray<algorithmFPType, cpu> eigenvalues(n);
     DAAL_CHECK_MALLOC(eigenvalues.get());
 
-    services::Status eigen_vectors_st = computeEigenvectorsInplace<algorithmFPType, cpu>(n, x, eigenvalues.get());
-    if (!eigen_vectors_st)
-    {
-        return eigen_vectors_st;
-    }
+    status |= computeEigenvectorsInplace<algorithmFPType, cpu>(n, x, eigenvalues.get());
+    DAAL_CHECK_STATUS_VAR(status);
 
     // std::cout << "Eigen vectors: " << std::endl;
     // for (int i = 0; i < n; ++i) {
@@ -209,7 +197,7 @@ services::Status SpectralEmbeddingKernel<algorithmFPType, method, cpu>::compute(
         }
     }
 
-    return safeStat;
+    return status;
 }
 
 } // namespace internal

diff --git a/cpp/daal/src/algorithms/spectral_embedding/spectral_embedding_kernel.h b/cpp/daal/src/algorithms/spectral_embedding/spectral_embedding_kernel.h
@@ -1,6 +1,6 @@
 /* file: spectral_embedding_kernel.h */
 /*******************************************************************************
-* Copyright 2024 Intel Corporation
+* Copyright contributors to the oneDAL project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/cpp/oneapi/dal/algo/spectral_embedding/backend/cpu/compute_kernel.cpp b/cpp/oneapi/dal/algo/spectral_embedding/backend/cpu/compute_kernel.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright 2024 Intel Corporation
+* Copyright contributors to the oneDAL project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/cpp/oneapi/dal/algo/spectral_embedding/backend/cpu/compute_kernel.hpp b/cpp/oneapi/dal/algo/spectral_embedding/backend/cpu/compute_kernel.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright 2024 Intel Corporation
+* Copyright contributors to the oneDAL project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/cpp/oneapi/dal/algo/spectral_embedding/backend/gpu/compute_kernel.hpp b/cpp/oneapi/dal/algo/spectral_embedding/backend/gpu/compute_kernel.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright 2024 Intel Corporation
+* Copyright contributors to the oneDAL project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/cpp/oneapi/dal/algo/spectral_embedding/backend/gpu/compute_kernel_dpc.cpp b/cpp/oneapi/dal/algo/spectral_embedding/backend/gpu/compute_kernel_dpc.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright 2024 Intel Corporation
+* Copyright contributors to the oneDAL project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -33,4 +33,4 @@ struct compute_kernel_gpu<Float, method::dense_batch, Task> {
 template struct compute_kernel_gpu<float, method::dense_batch, task::compute>;
 template struct compute_kernel_gpu<double, method::dense_batch, task::compute>;
 
-} // namespace oneapi::dal::spectral_embedding::backend
+} // namespace oneapi::dal::spectral_embedding::backend
diff --git a/cpp/oneapi/dal/algo/spectral_embedding/common.cpp b/cpp/oneapi/dal/algo/spectral_embedding/common.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright 2024 Intel Corporation
+* Copyright contributors to the oneDAL project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/cpp/oneapi/dal/algo/spectral_embedding/common.hpp b/cpp/oneapi/dal/algo/spectral_embedding/common.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright 2024 Intel Corporation
+* Copyright contributors to the oneDAL project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/cpp/oneapi/dal/algo/spectral_embedding/compute.hpp b/cpp/oneapi/dal/algo/spectral_embedding/compute.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright 2024 Intel Corporation
+* Copyright contributors to the oneDAL project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/cpp/oneapi/dal/algo/spectral_embedding/compute_types.cpp b/cpp/oneapi/dal/algo/spectral_embedding/compute_types.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright 2024 Intel Corporation
+* Copyright contributors to the oneDAL project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/cpp/oneapi/dal/algo/spectral_embedding/compute_types.hpp b/cpp/oneapi/dal/algo/spectral_embedding/compute_types.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright 2024 Intel Corporation
+* Copyright contributors to the oneDAL project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/cpp/oneapi/dal/algo/spectral_embedding/detail/compute_ops.cpp b/cpp/oneapi/dal/algo/spectral_embedding/detail/compute_ops.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright 2024 Intel Corporation
+* Copyright contributors to the oneDAL project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/cpp/oneapi/dal/algo/spectral_embedding/detail/compute_ops.hpp b/cpp/oneapi/dal/algo/spectral_embedding/detail/compute_ops.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright 2024 Intel Corporation
+* Copyright contributors to the oneDAL project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/cpp/oneapi/dal/algo/spectral_embedding/detail/compute_ops_dpc.cpp b/cpp/oneapi/dal/algo/spectral_embedding/detail/compute_ops_dpc.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright 2024 Intel Corporation
+* Copyright contributors to the oneDAL project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/cpp/oneapi/dal/algo/spectral_embedding/test/batch.cpp b/cpp/oneapi/dal/algo/spectral_embedding/test/batch.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright 2024 Intel Corporation
+* Copyright contributors to the oneDAL project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/cpp/oneapi/dal/algo/spectral_embedding/test/fixture.hpp b/cpp/oneapi/dal/algo/spectral_embedding/test/fixture.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright 2024 Intel Corporation
+* Copyright contributors to the oneDAL project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/examples/oneapi/cpp/source/spectral_clustering/spectral_clustering_pipeline.cpp b/examples/oneapi/cpp/source/spectral_clustering/spectral_clustering_pipeline.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright 2024 Intel Corporation
+* Copyright contributors to the oneDAL project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -84,4 +84,4 @@ int main(int argc, char const *argv[]) {
     std::cout << "Centroids:\n"
               << spectral_clustering_result.get_model().get_centroids() << std::endl;
     return 0;
-}
+}