-
Notifications
You must be signed in to change notification settings - Fork 219
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feature: rng primitive refactoring #3040
Open
Alexandr-Solovev
wants to merge
19
commits into
uxlfoundation:main
Choose a base branch
from
Alexandr-Solovev:dev/asolovev_test_rng_incremental
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 9 commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
f9c8265
inc 1
Alexandr-Solovev 0ce01a6
minor fixes
Alexandr-Solovev b6e5135
minor fix
Alexandr-Solovev 91929f3
minor fix for macros
Alexandr-Solovev 50b34e6
add dpc files
Alexandr-Solovev 86d1a8e
minor fix
Alexandr-Solovev 7a31362
fixes
Alexandr-Solovev e850e09
Merge branch 'uxlfoundation:main' into dev/asolovev_test_rng_incremental
Alexandr-Solovev 418e741
fix for bazel tests
Alexandr-Solovev 3d44f9e
fix comments
Alexandr-Solovev a0e6024
minor fixes and bazel test fixes for fp64
Alexandr-Solovev 6c3b22a
fixes for comments
Alexandr-Solovev 9d55ca9
remove templates
Alexandr-Solovev c382d4a
add rf engine selection(will be split in another pr)
Alexandr-Solovev 96fdeff
add teplated uniform function
Alexandr-Solovev 45b42b2
renaming remove forest set func and minor fixes
Alexandr-Solovev 7131ed0
fixes
Alexandr-Solovev ba37951
minor fixes and comments
Alexandr-Solovev b805705
clang format fixes
Alexandr-Solovev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
183 changes: 183 additions & 0 deletions
183
cpp/daal/include/algorithms/engines/mrg32k3a/mrg32k3a.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,183 @@ | ||
/* file: mrg32k3a.h */ | ||
/******************************************************************************* | ||
* 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. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*******************************************************************************/ | ||
|
||
/* | ||
//++ | ||
// Implementation of the MRG32k3a engine: a 32-bit combined multiple recursive generator | ||
// with two components of order 3, optimized for batch processing. | ||
//-- | ||
*/ | ||
|
||
#ifndef __MRG32K3A_H__ | ||
#define __MRG32K3A_H__ | ||
|
||
#include "algorithms/engines/mrg32k3a/mrg32k3a_types.h" | ||
#include "algorithms/engines/engine.h" | ||
|
||
namespace daal | ||
{ | ||
namespace algorithms | ||
{ | ||
namespace engines | ||
{ | ||
namespace mrg32k3a | ||
{ | ||
/** | ||
* @defgroup engines_mrg32k3a_batch Batch | ||
* @ingroup engines_mrg32k3a | ||
* @{ | ||
*/ | ||
namespace interface1 | ||
{ | ||
/** | ||
* <a name="DAAL-CLASS-ALGORITHMS__ENGINES__mrg32k3a__BATCHCONTAINER"></a> | ||
* \brief Provides methods to run implementations of the mrg32k3a engine. | ||
* This class is associated with the \ref mrg32k3a::interface1::Batch "mrg32k3a::Batch" class | ||
* and supports the method of mrg32k3a engine computation in the batch processing mode | ||
* | ||
* \tparam algorithmFPType Data type to use in intermediate computations of mrg32k3a engine, double or float | ||
* \tparam method Computation method of the engine, mrg32k3a::Method | ||
* \tparam cpu Version of the cpu-specific implementation of the engine, daal::CpuType | ||
*/ | ||
template <typename algorithmFPType, Method method, CpuType cpu> | ||
class BatchContainer : public daal::algorithms::AnalysisContainerIface<batch> | ||
{ | ||
public: | ||
/** | ||
* Constructs a container for the mrg32k3a engine with a specified environment | ||
* in the batch processing mode | ||
* \param[in] daalEnv Environment object | ||
*/ | ||
BatchContainer(daal::services::Environment::env * daalEnv); | ||
~BatchContainer(); | ||
/** | ||
* Computes the result of the mrg32k3a engine in the batch processing mode | ||
* | ||
* \return Status of computations | ||
*/ | ||
services::Status compute() DAAL_C11_OVERRIDE; | ||
}; | ||
|
||
/** | ||
* <a name="DAAL-CLASS-ALGORITHMS__ENGINES__mrg32k3a__BATCH"></a> | ||
* \brief Provides methods for mrg32k3a engine computations in the batch processing mode | ||
* | ||
* \tparam algorithmFPType Data type to use in intermediate computations of mrg32k3a engine, double or float | ||
* \tparam method Computation method of the engine, mrg32k3a::Method | ||
* | ||
* \par Enumerations | ||
* - mrg32k3a::Method Computation methods for the mrg32k3a engine | ||
* | ||
* \par References | ||
* - \ref engines::interface1::Input "engines::Input" class | ||
* - \ref engines::interface1::Result "engines::Result" class | ||
*/ | ||
template <typename algorithmFPType = DAAL_ALGORITHM_FP_TYPE, Method method = defaultDense> | ||
class DAAL_EXPORT Batch : public engines::BatchBase | ||
{ | ||
public: | ||
typedef engines::BatchBase super; | ||
|
||
typedef typename super::InputType InputType; | ||
typedef typename super::ResultType ResultType; | ||
|
||
/** | ||
* Creates mrg32k3a engine | ||
* \param[in] seed Initial condition for mrg32k3a engine | ||
* | ||
* \return Pointer to mrg32k3a engine | ||
*/ | ||
static services::SharedPtr<Batch<algorithmFPType, method> > create(size_t seed = 777); | ||
|
||
/** | ||
* Returns method of the engine | ||
* \return Method of the engine | ||
*/ | ||
virtual int getMethod() const DAAL_C11_OVERRIDE { return (int)method; } | ||
|
||
/** | ||
* Returns the structure that contains results of mrg32k3a engine | ||
* \return Structure that contains results of mrg32k3a engine | ||
*/ | ||
ResultPtr getResult() { return _result; } | ||
|
||
/** | ||
* Registers user-allocated memory to store results of mrg32k3a engine | ||
* \param[in] result Structure to store results of mrg32k3a engine | ||
* | ||
* \return Status of computations | ||
*/ | ||
services::Status setResult(const ResultPtr & result) | ||
{ | ||
DAAL_CHECK(result, services::ErrorNullResult) | ||
_result = result; | ||
_res = _result.get(); | ||
return services::Status(); | ||
} | ||
|
||
/** | ||
* Returns a pointer to the newly allocated mrg32k3a engine | ||
* with a copy of input objects and parameters of this mrg32k3a engine | ||
* \return Pointer to the newly allocated engine | ||
*/ | ||
services::SharedPtr<Batch<algorithmFPType, method> > clone() const { return services::SharedPtr<Batch<algorithmFPType, method> >(cloneImpl()); } | ||
|
||
/** | ||
* Allocates memory to store the result of the mrg32k3a engine | ||
* | ||
* \return Status of computations | ||
*/ | ||
virtual services::Status allocateResult() DAAL_C11_OVERRIDE | ||
{ | ||
services::Status s = this->_result->template allocate<algorithmFPType>(&(this->input), NULL, (int)method); | ||
this->_res = this->_result.get(); | ||
return s; | ||
} | ||
|
||
protected: | ||
Batch(size_t seed = 777) { initialize(); } | ||
|
||
Batch(const Batch<algorithmFPType, method> & other) : super(other) { initialize(); } | ||
|
||
virtual Batch<algorithmFPType, method> * cloneImpl() const DAAL_C11_OVERRIDE { return new Batch<algorithmFPType, method>(*this); } | ||
|
||
void initialize() | ||
{ | ||
Analysis<batch>::_ac = new __DAAL_ALGORITHM_CONTAINER(batch, BatchContainer, algorithmFPType, method)(&_env); | ||
_in = &input; | ||
_result.reset(new ResultType()); | ||
} | ||
|
||
private: | ||
ResultPtr _result; | ||
|
||
Batch & operator=(const Batch &); | ||
}; | ||
typedef services::SharedPtr<Batch<> > mrg32k3aPtr; | ||
typedef services::SharedPtr<const Batch<> > mrg32k3aConstPtr; | ||
|
||
} // namespace interface1 | ||
using interface1::BatchContainer; | ||
using interface1::Batch; | ||
using interface1::mrg32k3aPtr; | ||
using interface1::mrg32k3aConstPtr; | ||
/** @} */ | ||
} // namespace mrg32k3a | ||
} // namespace engines | ||
} // namespace algorithms | ||
} // namespace daal | ||
#endif |
65 changes: 65 additions & 0 deletions
65
cpp/daal/include/algorithms/engines/mrg32k3a/mrg32k3a_types.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
/* file: mrg32k3a_types.h */ | ||
/******************************************************************************* | ||
* 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. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*******************************************************************************/ | ||
|
||
/* | ||
//++ | ||
// Implementation of the MRG32k3a engine: a 32-bit combined multiple recursive generator | ||
// with two components of order 3, optimized for batch processing. | ||
//-- | ||
*/ | ||
|
||
#ifndef __MRG32K3A_TYPES_H__ | ||
#define __MRG32K3A_TYPES_H__ | ||
|
||
#include "algorithms/algorithm.h" | ||
#include "services/daal_defines.h" | ||
#include "data_management/data/numeric_table.h" | ||
#include "data_management/data/homogen_numeric_table.h" | ||
|
||
namespace daal | ||
{ | ||
namespace algorithms | ||
{ | ||
namespace engines | ||
{ | ||
/** | ||
* @defgroup engines_mrg32k3a mrg32k3a Engine | ||
* \copydoc daal::algorithms::engines::mrg32k3a | ||
* @ingroup engines | ||
* @{ | ||
*/ | ||
/** | ||
* \brief Contains classes for mrg32k3a engine | ||
*/ | ||
namespace mrg32k3a | ||
{ | ||
/** | ||
* <a name="DAAL-ENUM-ALGORITHMS__ENGINES__mrg32k3a__METHOD"></a> | ||
* Available methods to compute mrg32k3a engine | ||
*/ | ||
enum Method | ||
{ | ||
defaultDense = 0 /*!< Default: performance-oriented method. */ | ||
}; | ||
|
||
} // namespace mrg32k3a | ||
/** @} */ | ||
} // namespace engines | ||
} // namespace algorithms | ||
} // namespace daal | ||
|
||
#endif |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The files in
cpp/daal/include/*
seems to follow exactly the layout of the other RNG engines, so I have glanced through to make sure that they are the same, but didn't look super close. @Alexandr-Solovev let me know if there is anything specific tomrg32k3a
orphilox4x32x10
in these folders that are different. This implies that there isn't any architectural change to the RNG engines on the DAAL side of things outside of the inclusion of the two new ones. Is that so? (on second glance, it looks that we are doing a better standardization of the error codes, but thats it?)