Apply Trademarks' recent adjustments (backport #2539) (#2543)

* Apply Trademarks' recent adjustments (#2539) (cherry picked from commit 2c2d526) * Fix tail space (#2544) --------- Co-authored-by: Maria Petrova <maria.petrova@intel.com>
uxlfoundation · Oct 6, 2023 · a5b41d6 · a5b41d6
1 parent 5449c70
commit a5b41d6
Showing 19 changed files with 23 additions and 23 deletions.
diff --git a/cpp/daal/include/algorithms/algorithm_container_base_batch.h b/cpp/daal/include/algorithms/algorithm_container_base_batch.h
@@ -139,7 +139,7 @@ class AlgorithmContainerImpl<batch> : public AlgorithmContainer<batch>
  *
  * \tparam mode                 Computation mode of the algorithm, \ref ComputeMode
  * \tparam sse2Container        Implementation for Intel(R) Streaming SIMD Extensions 2 (Intel(R) SSE2)
- * \tparam sse42Container       Implementation for Intel(R) Streaming SIMD Extensions 42 (Intel(R) SSE42)
+ * \tparam sse42Container       Implementation for Intel(R) Streaming SIMD Extensions 4.2 (Intel(R) SSE4.2)
  * \tparam avx2Container        Implementation for Intel(R) Advanced Vector Extensions 2 (Intel(R) AVX2)
  * \tparam avx512Container      Implementation for Intel(R) Xeon(R) processors based on Intel AVX-512
  */

diff --git a/cpp/daal/include/algorithms/algorithm_container_base_common.h b/cpp/daal/include/algorithms/algorithm_container_base_common.h
@@ -49,7 +49,7 @@ namespace interface1
  *
  * \tparam mode                 Computation mode of the algorithm, \ref ComputeMode
  * \tparam sse2Container        Implementation for Intel(R) Streaming SIMD Extensions 2 (Intel(R) SSE2)
- * \tparam sse42Container       Implementation for Intel(R) Streaming SIMD Extensions 42 (Intel(R) SSE42)
+ * \tparam sse42Container       Implementation for Intel(R) Streaming SIMD Extensions 4.2 (Intel(R) SSE4.2)
  * \tparam avx2Container        Implementation for Intel(R) Advanced Vector Extensions 2 (Intel(R) AVX2)
  * \tparam avx512Container      Implementation for Intel(R) Xeon(R) processors based on Intel AVX-512
  */

diff --git a/cpp/daal/include/services/daal_defines.h b/cpp/daal/include/services/daal_defines.h
@@ -130,7 +130,7 @@ namespace daal
 {
 /**
 * <a name="DAAL-ENUM-COMPUTEMODE"></a>
-* Computation modes of Intel(R) oneDAL algorithms
+* Computation modes of Intel(R) oneAPI Data Analytics Library (oneDAL) algorithms
 */
 enum ComputeMode
 {

diff --git a/cpp/daal/include/services/daal_string.h b/cpp/daal/include/services/daal_string.h
@@ -17,7 +17,7 @@
 
 /*
 //++
-//  Intel(R) oneDAL string class.
+//  Intel(R) oneAPI Data Analytics Library (oneDAL) string class.
 //--
 */
 

diff --git a/cpp/daal/include/services/error_handling.h b/cpp/daal/include/services/error_handling.h
@@ -17,7 +17,7 @@
 
 /*
 //++
-//  Handling errors in Intel(R) oneDAL.
+//  Handling errors in Intel(R) oneAPI Data Analytics Library (oneDAL).
 //--
 */
 

diff --git a/cpp/daal/include/services/error_id.h b/cpp/daal/include/services/error_id.h
@@ -17,7 +17,7 @@
 
 /*
 //++
-//  Data types for error handling in Intel(R) oneDAL.
+//  Data types for error handling in Intel(R) oneAPI Data Analytics Library (oneDAL).
 //--
 */
 

diff --git a/cpp/daal/include/services/error_indexes.h b/cpp/daal/include/services/error_indexes.h
@@ -17,7 +17,7 @@
 
 /*
 //++
-//  Details of errors in Intel(R) oneDAL.
+//  Details of errors in Intel(R) oneAPI Data Analytics Library (oneDAL).
 //--
 */
 

diff --git a/cpp/daal/include/services/internal/execution_context.h b/cpp/daal/include/services/internal/execution_context.h
@@ -58,7 +58,7 @@ class ExecutionContext : public Base
         // This branch is needed to avoid problems with deleting SYCL entities
         // after SYCL RT static objects are already released.
         // This is caused by "C++ static initialization order fiasco" problem between
-        // oneDAL static Environment object and internal static contexts of SYCL RT.
+        // Intel(R) oneAPI Data Analytics Library (oneDAL) static Environment object and internal static contexts of SYCL RT.
         // Here we solve this temporary with a small memory leak.
         // TODO: remove this after complete transition to DPC++ kernels.
         if (needEmptyDeleter)

diff --git a/cpp/daal/include/services/internal/sycl/math/mkl_blas.h b/cpp/daal/include/services/internal/sycl/math/mkl_blas.h
@@ -46,7 +46,7 @@ namespace interface1
 
 /**
  *  <a name="DAAL-CLASS-ONEAPI-INTERNAL__MKLGEMM"></a>
- *  \brief Adapter for MKL GEMM routine
+ *  \brief Adapter for Intel(R) MKL GEMM routine
  */
 template <typename algorithmFPType>
 struct MKLGemm
@@ -112,7 +112,7 @@ struct MKLGemm
 
 /**
  *  <a name="DAAL-CLASS-ONEAPI-INTERNAL__MKLSYRK"></a>
- *  \brief Adapter for MKL SYRK routine
+ *  \brief Adapter for Intel(R) MKL SYRK routine
  */
 template <typename algorithmFPType>
 struct MKLSyrk
@@ -171,7 +171,7 @@ struct MKLSyrk
 
 /**
  *  <a name="DAAL-CLASS-ONEAPI-INTERNAL__MKLAXPY"></a>
- *  \brief Adapter for MKL AXPY routine
+ *  \brief Adapter for Intel(R) MKL AXPY routine
  */
 template <typename algorithmFPType>
 struct MKLAxpy

diff --git a/cpp/daal/include/services/internal/sycl/math/mkl_dal_utils.h b/cpp/daal/include/services/internal/sycl/math/mkl_dal_utils.h
@@ -17,7 +17,7 @@
 
 /*
 //++
-//  Utility functions for DAL wrappers over MKL routines.
+//  Utility functions for DAL wrappers over Intel(R) MKL routines.
 //--
 */
 

diff --git a/cpp/daal/include/services/internal/sycl/math/mkl_lapack.h b/cpp/daal/include/services/internal/sycl/math/mkl_lapack.h
@@ -45,7 +45,7 @@ namespace interface1
 
 /**
  *  <a name="DAAL-CLASS-ONEAPI-INTERNAL__MKLPOTRF"></a>
- *  \brief Adapter for MKL POTRF routine
+ *  \brief Adapter for Intel(R) MKL POTRF routine
  */
 template <typename algorithmFPType>
 struct MKLPotrf
@@ -98,7 +98,7 @@ struct MKLPotrf
 
 /**
  *  <a name="DAAL-CLASS-ONEAPI-INTERNAL__MKLPOTRS></a>
- *  \brief Adapter for MKL POTRS routine
+ *  \brief Adapter for Intel(R) MKL POTRS routine
  */
 template <typename algorithmFPType>
 struct MKLPotrs

diff --git a/cpp/daal/include/services/library_version_info.h b/cpp/daal/include/services/library_version_info.h
@@ -17,7 +17,7 @@
 
 /*
 //++
-//  Intel(R) oneDAL version information.
+//  Intel(R) oneAPI Data Analytics Library (oneDAL) version information.
 //--
 */
 

diff --git a/cpp/daal/src/externals/core_threading_win_dll.cpp b/cpp/daal/src/externals/core_threading_win_dll.cpp
@@ -837,7 +837,7 @@ DAAL_EXPORT void * _getThreadPinner(bool create_pinner, void (*read_topo)(int &,
     #define CALL_RET_FUNC_FROM_DLL_CPU_MIC(ret_type, fn_dpref, fn_cpu, fn_name, argdecl, argcall)
 #endif
 
-/* Used directly in Intel oneDAL */
+/* Used directly in Intel(R) oneAPI Data Analytics Library (oneDAL) */
 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),
@@ -1109,7 +1109,7 @@ typedef signed int Ipp32s;
 typedef float Ipp32f;
 typedef double Ipp64f;
 
-/* Used in Intel oneDAL via SS */
+/* Used in Intel(R) oneAPI Data Analytics Library (oneDAL) via SS */
 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));
 

diff --git a/cpp/oneapi/dal/detail/error_messages.hpp b/cpp/oneapi/dal/detail/error_messages.hpp
@@ -51,7 +51,7 @@ namespace v1 {
 // - If a new mathematical operator introduced, stick to LaTeX
 //   conventions as well.
 //
-// - For oneDAL specific terms use the following shortening:
+// - For Intel(R) oneAPI Data Analytics Library (oneDAL) specific terms use the following shortening:
 //
 //   row count      rc
 //   column count   cc

diff --git a/cpp/oneapi/dal/detail/mpi/communicator.hpp b/cpp/oneapi/dal/detail/mpi/communicator.hpp
@@ -229,7 +229,7 @@ class mpi_communicator_impl : public via_host_interface_selector<MemoryAccessKin
         ONEDAL_ASSERT(send_buf);
         ONEDAL_ASSERT(recv_buf);
 
-        // Intel MPI requires buffers to be not aliased
+        // Intel(R) MPI requires buffers to be not aliased
         // However, communicator interface allows aliased buffers
         // TODO: Implement correct aliasing check
         if (send_buf != recv_buf) {

diff --git a/cpp/oneapi/dal/table/detail/access_iface_compat.hpp b/cpp/oneapi/dal/table/detail/access_iface_compat.hpp
@@ -15,7 +15,7 @@
 *******************************************************************************/
 
 /// @file Data access interfaces needed for binary backward compatibility with
-/// the oneDAL 2021.1. This file should be removed in 2022.1.
+/// the Intel(R) oneAPI Data Analytics Library (oneDAL) 2021.1. This file should be removed in 2022.1.
 
 #pragma once
 

diff --git a/cpp/oneapi/dal/table/detail/table_iface.hpp b/cpp/oneapi/dal/table/detail/table_iface.hpp
@@ -42,7 +42,7 @@ namespace oneapi::dal::detail {
 namespace v1 {
 
 // Inheritance from `access_provider_iface` is needed to support binary backward
-// compatibility with the oneDAL 2021.1. This should be removed in 2022.1.
+// compatibility with the Intel(R) oneAPI Data Analytics Library (oneDAL) 2021.1. This should be removed in 2022.1.
 class table_iface : public access_provider_iface {
 public:
     virtual ~table_iface() = default;

diff --git a/examples/daal/cpp/source/optimization_solvers/custom_obj_func.h b/examples/daal/cpp/source/optimization_solvers/custom_obj_func.h
@@ -18,7 +18,7 @@
 /*
 !  Content:
 !    Interface and implementation of user-defined algorithm for computation of
-!    logistic loss function in Intel DAAL style
+!    logistic loss function in Intel(R) DAAL style
 !
 !******************************************************************************/
 

diff --git a/examples/daal/cpp/source/services/library_version_info.cpp b/examples/daal/cpp/source/services/library_version_info.cpp
@@ -17,7 +17,7 @@
 
 /*
 !  Content:
-!    Intel(R) oneDAL version information
+!    Intel(R) oneAPI Data Analytics Library (oneDAL) version information
 !
 !******************************************************************************/
-Original file line number
+Diff line change
@@ @@ -17,7 +17,7 @@ @@
     /*
     //++
-    //  Intel(R) oneDAL string class.
+    //  Intel(R) oneAPI Data Analytics Library (oneDAL) string class.
     //--
     */