Skip to content

Commit

Permalink
fix clang format
Browse files Browse the repository at this point in the history
  • Loading branch information
andrey.gilev committed Feb 25, 2020
1 parent 2c50721 commit aa4e13a
Show file tree
Hide file tree
Showing 12 changed files with 48 additions and 30 deletions.
4 changes: 3 additions & 1 deletion include/algorithms/algorithm_base_mode_impl.h
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ class DAAL_EXPORT AlgorithmImpl : public Algorithm<mode>
/** Deafult constructor */
AlgorithmImpl() : wasSetup(false), resetFlag(true), wasFinalizeSetup(false), resetFinalizeFlag(true) {}

AlgorithmImpl(const AlgorithmImpl & /*other*/) : Algorithm<mode>(), wasSetup(false), resetFlag(true), wasFinalizeSetup(false), resetFinalizeFlag(true) {}
AlgorithmImpl(const AlgorithmImpl & /*other*/)
: Algorithm<mode>(), wasSetup(false), resetFlag(true), wasFinalizeSetup(false), resetFinalizeFlag(true)
{}

virtual ~AlgorithmImpl()
{
Expand Down
5 changes: 4 additions & 1 deletion include/algorithms/algorithm_types.h
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,10 @@ class Result : public SerializableArgument
* \param[in] parameter Pointer to the parameters of the algorithm
* \param[in] method Computation method
*/
virtual services::Status check(const PartialResult * /*partialResult*/, const Parameter * /*parameter*/, int /*method*/) const { return services::Status(); }
virtual services::Status check(const PartialResult * /*partialResult*/, const Parameter * /*parameter*/, int /*method*/) const
{
return services::Status();
}

protected:
/** \private */
Expand Down
4 changes: 3 additions & 1 deletion include/algorithms/boosting/boosting_model.h
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ struct DAAL_EXPORT Parameter : public classifier::interface1::Parameter
const services::SharedPtr<weak_learner::prediction::Batch> & wlPredictForParameter);

/** Copy constructor */
Parameter(const Parameter & other) : classifier::interface1::Parameter(), weakLearnerTraining(other.weakLearnerTraining), weakLearnerPrediction(other.weakLearnerPrediction) {}
Parameter(const Parameter & other)
: classifier::interface1::Parameter(), weakLearnerTraining(other.weakLearnerTraining), weakLearnerPrediction(other.weakLearnerPrediction)
{}

/** The algorithm for weak learner model training */
services::SharedPtr<weak_learner::training::Batch> weakLearnerTraining;
Expand Down
6 changes: 4 additions & 2 deletions include/algorithms/optimization_solver/objective_function/sum_of_functions_batch.h
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ class DAAL_EXPORT Batch : public objective_function::Batch
* \param[in] other An algorithm to be used as the source to initialize the input objects
* and parameters of the algorithm
*/
Batch(const Batch & other) : objective_function::Batch(), sumOfFunctionsParameter(other.sumOfFunctionsParameter), sumOfFunctionsInput(other.sumOfFunctionsInput)
Batch(const Batch & other)
: objective_function::Batch(), sumOfFunctionsParameter(other.sumOfFunctionsParameter), sumOfFunctionsInput(other.sumOfFunctionsInput)
{
initialize();
}
Expand Down Expand Up @@ -165,7 +166,8 @@ class DAAL_EXPORT Batch : public objective_function::Batch
* \param[in] other An algorithm to be used as the source to initialize the input objects
* and parameters of the algorithm
*/
Batch(const Batch & other) : objective_function::Batch(), sumOfFunctionsParameter(other.sumOfFunctionsParameter), sumOfFunctionsInput(other.sumOfFunctionsInput)
Batch(const Batch & other)
: objective_function::Batch(), sumOfFunctionsParameter(other.sumOfFunctionsParameter), sumOfFunctionsInput(other.sumOfFunctionsInput)
{
initialize();
}
Expand Down
4 changes: 2 additions & 2 deletions include/algorithms/outlier_detection/outlier_detection_multivariate_types.h
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ struct DAAL_EXPORT DefaultInit : public InitIface
* \param[in] scatter Measure of spread, the variance-covariance matrix of size p x p
* \param[in] threshold Limit that defines the outlier region, the array of size 1 x 1 containing a non-negative number
*/
virtual void operator()(data_management::NumericTable * /*data*/, data_management::NumericTable * /*location*/, data_management::NumericTable * /*scatter*/,
data_management::NumericTable * /*threshold*/) DAAL_C11_OVERRIDE
virtual void operator()(data_management::NumericTable * /*data*/, data_management::NumericTable * /*location*/,
data_management::NumericTable * /*scatter*/, data_management::NumericTable * /*threshold*/) DAAL_C11_OVERRIDE
{}
};

Expand Down
4 changes: 2 additions & 2 deletions include/algorithms/outlier_detection/outlier_detection_univariate_types.h
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ struct DAAL_EXPORT DefaultInit : public InitIface
* \param[in] scatter Measure of spread, the array of standard deviations of size 1 x p
* \param[in] threshold Limit that defines the outlier region, the array of non-negative numbers of size 1 x p
*/
virtual void operator()(data_management::NumericTable * /*data*/, data_management::NumericTable * /*location*/, data_management::NumericTable * /*scatter*/,
data_management::NumericTable * /*threshold*/)
virtual void operator()(data_management::NumericTable * /*data*/, data_management::NumericTable * /*location*/,
data_management::NumericTable * /*scatter*/, data_management::NumericTable * /*threshold*/)
{}
};

Expand Down
2 changes: 1 addition & 1 deletion include/algorithms/svm/svm_model_builder.h
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class DAAL_EXPORT ModelBuilder
* \param[in] nSupportVectors Number of support vectors in model
*/
ModelBuilder(size_t nFeatures, size_t nSupportVectors)
: _modelPtr(Model::create<modelFPType>(nFeatures)),_nFeatures(nFeatures), _nSupportVectors(nSupportVectors)
: _modelPtr(Model::create<modelFPType>(nFeatures)), _nFeatures(nFeatures), _nSupportVectors(nSupportVectors)
{
_supportV = _modelPtr->getSupportVectors();
_supportI = _modelPtr->getSupportIndices();
Expand Down
3 changes: 2 additions & 1 deletion include/data_management/data/data_dictionary.h
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,8 @@ class DAAL_EXPORT Dictionary : public SerializationIface, public DictionaryIface
}
}

Dictionary(services::Status & /*st*/) : _nfeat(0), _featuresEqual(DictionaryIface::notEqual), _dict(0), _errors(new services::KernelErrorCollection())
Dictionary(services::Status & /*st*/)
: _nfeat(0), _featuresEqual(DictionaryIface::notEqual), _dict(0), _errors(new services::KernelErrorCollection())
{}

private:
Expand Down
6 changes: 3 additions & 3 deletions include/data_management/data/data_serialize.h
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,9 @@ public: \
DECLARE_SERIALIZABLE() \
DAAL_CAST_OPERATOR(ClassName)

#define DECLARE_MODEL(DstClassName, SrcClassName) \
DECLARE_SERIALIZABLE() \
DAAL_CAST_OPERATOR(DstClassName) \
#define DECLARE_MODEL(DstClassName, SrcClassName) \
DECLARE_SERIALIZABLE() \
DAAL_CAST_OPERATOR(DstClassName) \
DAAL_DOWN_CAST_OPERATOR(DstClassName, SrcClassName)

#define DECLARE_MODEL_IFACE(DstClassName, SrcClassName) \
Expand Down
5 changes: 4 additions & 1 deletion include/data_management/data/row_merged_numeric_table.h
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,10 @@ class DAAL_EXPORT RowMergedNumericTable : public NumericTable
return setNumberOfRowsImpl(_obsnum + obs);
}

services::Status resize(size_t /*nrows*/) DAAL_C11_OVERRIDE { return services::Status(services::throwIfPossible(services::ErrorMethodNotSupported)); }
services::Status resize(size_t /*nrows*/) DAAL_C11_OVERRIDE
{
return services::Status(services::throwIfPossible(services::ErrorMethodNotSupported));
}

MemoryStatus getDataMemoryStatus() const DAAL_C11_OVERRIDE
{
Expand Down
29 changes: 17 additions & 12 deletions include/oneapi/internal/execution_context.h
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -391,31 +391,35 @@ class CpuExecutionContextImpl : public Base, public ExecutionContextIface
_infoDevice.max_work_group_size = 0;
}

void run(const KernelRange & /*range*/, const KernelPtr & /*kernel*/, const KernelArguments & /*args*/, services::Status * status = NULL) DAAL_C11_OVERRIDE
void run(const KernelRange & /*range*/, const KernelPtr & /*kernel*/, const KernelArguments & /*args*/,
services::Status * status = NULL) DAAL_C11_OVERRIDE
{
services::internal::tryAssignStatus(status, services::ErrorMethodNotImplemented);
}

void run(const KernelNDRange & /*range*/, const KernelPtr & /*kernel*/, const KernelArguments & /*args*/, services::Status * status = NULL) DAAL_C11_OVERRIDE
void run(const KernelNDRange & /*range*/, const KernelPtr & /*kernel*/, const KernelArguments & /*args*/,
services::Status * status = NULL) DAAL_C11_OVERRIDE
{
services::internal::tryAssignStatus(status, services::ErrorMethodNotImplemented);
}

void gemm(math::Transpose /*transa*/, math::Transpose /*transb*/, size_t /*m*/, size_t /*n*/, size_t /*k*/, double /*alpha*/, const UniversalBuffer & /*a_buffer*/,
size_t /*lda*/, size_t /*offsetA*/, const UniversalBuffer & /*b_buffer*/, size_t /*ldb*/, size_t /*offsetB*/, double /*beta*/, UniversalBuffer & /*c_buffer*/,
size_t /*ldc*/, size_t /*offsetC*/, services::Status * status = NULL) DAAL_C11_OVERRIDE
void gemm(math::Transpose /*transa*/, math::Transpose /*transb*/, size_t /*m*/, size_t /*n*/, size_t /*k*/, double /*alpha*/,
const UniversalBuffer & /*a_buffer*/, size_t /*lda*/, size_t /*offsetA*/, const UniversalBuffer & /*b_buffer*/, size_t /*ldb*/,
size_t /*offsetB*/, double /*beta*/, UniversalBuffer & /*c_buffer*/, size_t /*ldc*/, size_t /*offsetC*/,
services::Status * status = NULL) DAAL_C11_OVERRIDE
{
services::internal::tryAssignStatus(status, services::ErrorMethodNotImplemented);
}

void syrk(math::UpLo /*upper_lower*/, math::Transpose /*trans*/, size_t /*n*/, size_t /*k*/, double /*alpha*/, const UniversalBuffer & /*a_buffer*/, size_t /*lda*/,
size_t /*offsetA*/, double /*beta*/, UniversalBuffer & /*c_buffer*/, size_t /*ldc*/, size_t /*offsetC*/, services::Status * status = NULL) DAAL_C11_OVERRIDE
void syrk(math::UpLo /*upper_lower*/, math::Transpose /*trans*/, size_t /*n*/, size_t /*k*/, double /*alpha*/,
const UniversalBuffer & /*a_buffer*/, size_t /*lda*/, size_t /*offsetA*/, double /*beta*/, UniversalBuffer & /*c_buffer*/,
size_t /*ldc*/, size_t /*offsetC*/, services::Status * status = NULL) DAAL_C11_OVERRIDE
{
services::internal::tryAssignStatus(status, services::ErrorMethodNotImplemented);
}

void axpy(const uint32_t /*n*/, const double /*a*/, const UniversalBuffer /*x_buffer*/, const int /*incx*/, const UniversalBuffer /*y_buffer*/, const int /*incy*/,
services::Status * status = NULL) DAAL_C11_OVERRIDE
void axpy(const uint32_t /*n*/, const double /*a*/, const UniversalBuffer /*x_buffer*/, const int /*incx*/, const UniversalBuffer /*y_buffer*/,
const int /*incy*/, services::Status * status = NULL) DAAL_C11_OVERRIDE
{
services::internal::tryAssignStatus(status, services::ErrorMethodNotImplemented);
}
Expand All @@ -425,8 +429,8 @@ class CpuExecutionContextImpl : public Base, public ExecutionContextIface
services::internal::tryAssignStatus(status, services::ErrorMethodNotImplemented);
}

void potrs(math::UpLo /*uplo*/, size_t /*n*/, size_t /*ny*/, UniversalBuffer & /*a_buffer*/, size_t /*lda*/, UniversalBuffer & /*b_buffer*/, size_t /*ldb*/,
services::Status * status = NULL) DAAL_C11_OVERRIDE
void potrs(math::UpLo /*uplo*/, size_t /*n*/, size_t /*ny*/, UniversalBuffer & /*a_buffer*/, size_t /*lda*/, UniversalBuffer & /*b_buffer*/,
size_t /*ldb*/, services::Status * status = NULL) DAAL_C11_OVERRIDE
{
services::internal::tryAssignStatus(status, services::ErrorMethodNotImplemented);
}
Expand All @@ -452,7 +456,8 @@ class CpuExecutionContextImpl : public Base, public ExecutionContextIface

InfoDevice & getInfoDevice() DAAL_C11_OVERRIDE { return _infoDevice; }

void copy(UniversalBuffer /*dest*/, size_t /*desOffset*/, void * /*src*/, size_t /*srcOffset*/, size_t /*count*/, services::Status * status = NULL) DAAL_C11_OVERRIDE
void copy(UniversalBuffer /*dest*/, size_t /*desOffset*/, void * /*src*/, size_t /*srcOffset*/, size_t /*count*/,
services::Status * status = NULL) DAAL_C11_OVERRIDE
{
services::internal::tryAssignStatus(status, services::ErrorMethodNotImplemented);
}
Expand Down
6 changes: 3 additions & 3 deletions include/services/daal_defines.h
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -401,9 +401,9 @@ const int SERIALIZATION_DBSCAN_DISTRIBUTED_PARTIAL_RESULT_STEP13_ID = 121310;

} // namespace daal

#define DAAL_NEW_DELETE() \
static void * operator new(std::size_t sz) { return daal::services::daal_calloc(sz); } \
static void * operator new[](std::size_t sz) { return daal::services::daal_calloc(sz); } \
#define DAAL_NEW_DELETE() \
static void * operator new(std::size_t sz) { return daal::services::daal_calloc(sz); } \
static void * operator new[](std::size_t sz) { return daal::services::daal_calloc(sz); } \
static void * operator new(std::size_t /*sz*/, void * where) { return where; } \
static void * operator new[](std::size_t /*sz*/, void * where) { return where; } \
static void operator delete(void * ptr, std::size_t /*sz*/) { daal::services::daal_free(ptr); } \
Expand Down

0 comments on commit aa4e13a

Please sign in to comment.