Skip to content

Commit

Permalink
Fix invalid trademarks (#3062)
Browse files Browse the repository at this point in the history
Illegal trademarks are fixed:

* DAAL -> Intel(R) DAAL
* Intel oneDAL -> oneDAL
* Intel MPI -> Intel(R) MPI Library
  • Loading branch information
Vika-F authored Feb 6, 2025
1 parent 43d121a commit 8eb6763
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 16 deletions.
2 changes: 1 addition & 1 deletion cpp/daal/include/services/daal_defines.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
#define DAAL_C11_OVERRIDE
#endif

/* Intel(R) oneDAL 64-bit integer types */
/* oneDAL 64-bit integer types */
#if !(defined(__INTEL_COMPILER) || defined(__INTEL_LLVM_COMPILER)) && defined(_MSC_VER)
#define DAAL_INT64 __int64
#define DAAL_UINT64 unsigned __int64
Expand Down
11 changes: 6 additions & 5 deletions cpp/oneapi/dal/detail/mpi/communicator.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*******************************************************************************
* Copyright 2021 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.
Expand All @@ -16,7 +17,7 @@

#pragma once

// IMPORTANT! This file should not be included to any other non-mpi header,
// IMPORTANT! This file should not be included to any other non-MPI header,
// otherwise it creates dependeny on MPI at the user's application compile time
// TODO: In the future this can be solved via __has_include C++17 feature

Expand Down Expand Up @@ -165,8 +166,8 @@ class mpi_communicator_impl : public via_host_interface_selector<MemoryAccessKin
if (sym == nullptr) {
dlclose(handle);

// Check if Intel MPI without MPIX_Query_ze_support
// Intel MPI 2021.1 and greater supports but not all have symbol
// Check if Intel(R) MPI Library without MPIX_Query_ze_support
// Intel(R) MPI Library 2021.1 and greater supports but not all have symbol
char version[MPI_MAX_LIBRARY_VERSION_STRING];
int len = 0;
MPI_Get_library_version(version, &len);
Expand Down Expand Up @@ -292,7 +293,7 @@ class mpi_communicator_impl : public via_host_interface_selector<MemoryAccessKin
ONEDAL_ASSERT(send_buf);
ONEDAL_ASSERT(recv_buf);

// Intel(R) MPI requires buffers to be not aliased
// MPI requires buffers to be not aliased
// However, communicator interface allows aliased buffers
// TODO: Implement correct aliasing check
if (send_buf != recv_buf) {
Expand Down Expand Up @@ -353,7 +354,7 @@ class mpi_communicator_impl : public via_host_interface_selector<MemoryAccessKin
&status));
}
else {
// Standard call to sendrecv_replace of designated mpi backend
// Standard call to sendrecv_replace of designated MPI backend
mpi_call(MPI_Sendrecv_replace(buf,
integral_cast<int>(count),
make_mpi_data_type(dtype),
Expand Down
2 changes: 1 addition & 1 deletion examples/cmake/setup_examples.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ function (set_common_compiler_options)
elseif(UNIX)
add_compile_options(-pedantic -Wall -Wextra -Werror -Wno-unused-parameter)
endif()
#For DAAL interfaces remove deprecated warnings
#For Intel(R) DAAL interfaces remove deprecated warnings
if (ONEDAL_INTERFACE STREQUAL "no")
if (UNIX)
add_compile_options(-Wno-deprecated-declarations)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* file: df_cls_traversed_model_builder.cpp */
/*******************************************************************************
* Copyright 2014 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.
Expand Down Expand Up @@ -50,7 +51,7 @@ const size_t minObservationsInLeafNode = 8;

const size_t nClasses = 5; /* Number of classes */

/** Node structure for representing nodes in trees after traversing DAAL model */
/** Node structure for representing nodes in trees after traversing Intel(R) DAAL model */
struct Node {
Node *left;
Node *right;
Expand All @@ -66,7 +67,7 @@ struct Node {
Node() : left(NULL), right(NULL), classLabel(0), featureIndex(0), featureValue(0) {}
};

/** Tree structure for representing tree after traversing DAAL model */
/** Tree structure for representing tree after traversing Intel(R) DAAL model */
struct Tree {
Node *root;
size_t nNodes;
Expand Down Expand Up @@ -94,7 +95,7 @@ bool buildTree(size_t treeId,
int main(int argc, char *argv[]) {
checkArguments(argc, argv, 1, &trainDatasetFileName);

/* train DAAL DF Classification model */
/* train Intel(R) DAAL DF Classification model */
training::ResultPtr trainingResult = trainModel();
std::cout << "Predict on trained model" << std::endl;
double trainedAccurcy = testModel(trainingResult->get(classifier::training::model));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* file: gbt_cls_traversed_model_builder.cpp */
/*******************************************************************************
* Copyright 2014 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.
Expand Down Expand Up @@ -49,7 +50,7 @@ const size_t minObservationsInLeafNode = 8;

const size_t nClasses = 5; /* Number of classes */
size_t nTrees = 0;
/** Node structure for representing nodes in trees after traversing DAAL model */
/** Node structure for representing nodes in trees after traversing Intel(R) DAAL model */
struct Node {
Node *left;
Node *right;
Expand All @@ -65,7 +66,7 @@ struct Node {
Node() : left(NULL), right(NULL), response(0), featureIndex(0), featureValue(0) {}
};

/** Tree structure for representing tree after traversing DAAL model */
/** Tree structure for representing tree after traversing Intel(R) DAAL model */
struct Tree {
Node *root;
size_t nNodes;
Expand Down Expand Up @@ -175,7 +176,7 @@ bool buildTree(size_t treeId,
int main(int argc, char *argv[]) {
checkArguments(argc, argv, 1, &trainDatasetFileName);

/* train DAAL DF Classification model */
/* train Intel(R) DAAL DF Classification model */
training::ResultPtr trainingResult = trainModel();
std::cout << "Predict on trained model" << std::endl;
ModelPtr trainedModel = trainingResult->get(daal::algorithms::classifier::training::model);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* file: gbt_reg_traversed_model_builder.cpp */
/*******************************************************************************
* Copyright 2014 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.
Expand Down Expand Up @@ -48,7 +49,7 @@ const size_t nFeatures = 13; /* Number of features in training and testing data
const size_t maxIterations = 40;
size_t nTrees = 0;

/** Node structure for representing nodes in trees after traversing DAAL model */
/** Node structure for representing nodes in trees after traversing Intel(R) DAAL model */
struct Node {
Node *left;
Node *right;
Expand All @@ -64,7 +65,7 @@ struct Node {
Node() : left(NULL), right(NULL), response(0), featureIndex(0), featureValue(0) {}
};

/** Tree structure for representing tree after traversing DAAL model */
/** Tree structure for representing tree after traversing Intel(R) DAAL model */
struct Tree {
Node *root;
size_t nNodes;
Expand Down Expand Up @@ -175,7 +176,7 @@ bool buildTree(size_t treeId,
int main(int argc, char *argv[]) {
checkArguments(argc, argv, 1, &trainDatasetFileName);

/* Train DAAL Gradient Boosted Trees Regression model */
/* Train Intel(R) DAAL Gradient Boosted Trees Regression model */
training::ResultPtr trainingResult = trainModel();
std::cout << "Predict on trained model" << std::endl;
ModelPtr trainedModel = trainingResult->get(training::model);
Expand Down

0 comments on commit 8eb6763

Please sign in to comment.