diff --git a/NeoOnnx/src/GraphInitializer.cpp b/NeoOnnx/src/GraphInitializer.cpp index 21948b707..89723498a 100644 --- a/NeoOnnx/src/GraphInitializer.cpp +++ b/NeoOnnx/src/GraphInitializer.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2020 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,6 +21,8 @@ limitations under the License. #include "GraphInitializer.h" #include "TensorUtils.h" +using namespace NeoML; + namespace NeoOnnx { CGraphInitializer::CGraphInitializer( const onnx::TensorProto& _initializer ) : diff --git a/NeoOnnx/src/GraphOutput.cpp b/NeoOnnx/src/GraphOutput.cpp index 3e97b90f9..bf4e0cf37 100644 --- a/NeoOnnx/src/GraphOutput.cpp +++ b/NeoOnnx/src/GraphOutput.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2020 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,6 +21,8 @@ limitations under the License. #include "GraphOutput.h" #include "TensorUtils.h" +using namespace NeoML; + namespace NeoOnnx { CGraphOutput::CGraphOutput( const onnx::ValueInfoProto& output ) : diff --git a/NeoOnnx/src/LayerOperator.cpp b/NeoOnnx/src/LayerOperator.cpp index 615a182f7..e5de999f8 100644 --- a/NeoOnnx/src/LayerOperator.cpp +++ b/NeoOnnx/src/LayerOperator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2020 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -18,6 +18,8 @@ limitations under the License. #include "LayerOperator.h" +using namespace NeoML; + namespace NeoOnnx { // Returns true if some of the inputs are CUserTensor diff --git a/NeoOnnx/src/NeoOnnxImport.cpp b/NeoOnnx/src/NeoOnnxImport.cpp index fc2815b82..161bf14b7 100644 --- a/NeoOnnx/src/NeoOnnxImport.cpp +++ b/NeoOnnx/src/NeoOnnxImport.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2023 ABBYY +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -30,6 +30,8 @@ limitations under the License. #include "GraphOutput.h" #include "Optimization/DnnOptimizer.h" +using namespace NeoML; + namespace NeoOnnx { // Checks if all of the operators are supported by NeoOnnx diff --git a/NeoOnnx/src/Operator.cpp b/NeoOnnx/src/Operator.cpp index 6494ef6ac..dd8dd8cca 100644 --- a/NeoOnnx/src/Operator.cpp +++ b/NeoOnnx/src/Operator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2023 ABBYY +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -63,6 +63,8 @@ limitations under the License. #include "Operators/UnsqueezeOperator.h" #include "Operators/UpsampleOperator.h" +using namespace NeoML; + namespace NeoOnnx { // Registers the given NeoOnnx class (e.g. CConvOperator) as an onnx operator with given opType ('Conv') diff --git a/NeoOnnx/src/Operators/ArgMaxOperator.cpp b/NeoOnnx/src/Operators/ArgMaxOperator.cpp index c51a5f744..93f7306b3 100644 --- a/NeoOnnx/src/Operators/ArgMaxOperator.cpp +++ b/NeoOnnx/src/Operators/ArgMaxOperator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2022 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,6 +21,8 @@ limitations under the License. #include "ArgMaxOperator.h" #include "NeoOnnxCheck.h" +using namespace NeoML; + namespace NeoOnnx { CArgMaxOperator::CArgMaxOperator( const onnx::NodeProto& argMax, int opsetVersion ) : diff --git a/NeoOnnx/src/Operators/BatchNormalizationOperator.cpp b/NeoOnnx/src/Operators/BatchNormalizationOperator.cpp index 999f1ec82..cba233ce0 100644 --- a/NeoOnnx/src/Operators/BatchNormalizationOperator.cpp +++ b/NeoOnnx/src/Operators/BatchNormalizationOperator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2020 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,6 +22,8 @@ limitations under the License. #include "NeoOnnxCheck.h" #include "TensorUtils.h" +using namespace NeoML; + namespace NeoOnnx { // Calculates NeoML::CBatchNormalizationLayer's final params blob from onnx operator's inputs diff --git a/NeoOnnx/src/Operators/CastOperator.cpp b/NeoOnnx/src/Operators/CastOperator.cpp index 60b4109be..fa91c2ac1 100644 --- a/NeoOnnx/src/Operators/CastOperator.cpp +++ b/NeoOnnx/src/Operators/CastOperator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2021 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -23,6 +23,8 @@ limitations under the License. #include +using namespace NeoML; + namespace NeoOnnx { CCastOperator::CCastOperator( const onnx::NodeProto& cast, int opsetVersion ) : diff --git a/NeoOnnx/src/Operators/ConcatOperator.cpp b/NeoOnnx/src/Operators/ConcatOperator.cpp index 0773535c5..f5430861b 100644 --- a/NeoOnnx/src/Operators/ConcatOperator.cpp +++ b/NeoOnnx/src/Operators/ConcatOperator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2020 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -24,6 +24,8 @@ limitations under the License. #include +using namespace NeoML; + namespace NeoOnnx { CConcatOperator::CConcatOperator( const onnx::NodeProto& concat, int opsetVersion ) : diff --git a/NeoOnnx/src/Operators/ConstantOfShapeOperator.cpp b/NeoOnnx/src/Operators/ConstantOfShapeOperator.cpp index 78b3dc762..9f8fe371b 100644 --- a/NeoOnnx/src/Operators/ConstantOfShapeOperator.cpp +++ b/NeoOnnx/src/Operators/ConstantOfShapeOperator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2020 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -23,6 +23,8 @@ limitations under the License. #include +using namespace NeoML; + namespace NeoOnnx { CConstantOfShapeOperator::CConstantOfShapeOperator( const onnx::NodeProto& constantOfShape, int opsetVersion ) : diff --git a/NeoOnnx/src/Operators/ConstantOperator.cpp b/NeoOnnx/src/Operators/ConstantOperator.cpp index 423493fad..a7d763123 100644 --- a/NeoOnnx/src/Operators/ConstantOperator.cpp +++ b/NeoOnnx/src/Operators/ConstantOperator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2020 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,6 +21,8 @@ limitations under the License. #include "onnx.pb.h" +using namespace NeoML; + namespace NeoOnnx { CConstantOperator::CConstantOperator( const onnx::NodeProto& constant, int opsetVersion ) : diff --git a/NeoOnnx/src/Operators/ConvTransposeOperator.cpp b/NeoOnnx/src/Operators/ConvTransposeOperator.cpp index 6c8f8e972..79316b413 100644 --- a/NeoOnnx/src/Operators/ConvTransposeOperator.cpp +++ b/NeoOnnx/src/Operators/ConvTransposeOperator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2023 ABBYY +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -24,6 +24,8 @@ limitations under the License. #include +using namespace NeoML; + namespace NeoOnnx { // Gets kernel shape diff --git a/NeoOnnx/src/Operators/CumSumOperator.cpp b/NeoOnnx/src/Operators/CumSumOperator.cpp index 425b8432f..a0be614b6 100644 --- a/NeoOnnx/src/Operators/CumSumOperator.cpp +++ b/NeoOnnx/src/Operators/CumSumOperator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2022 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -18,6 +18,8 @@ limitations under the License. #include "CumSumOperator.h" +using namespace NeoML; + namespace NeoOnnx { CCumSumOperator::CCumSumOperator( const onnx::NodeProto& cumSum, int opsetVersion ) : diff --git a/NeoOnnx/src/Operators/DropoutOperator.cpp b/NeoOnnx/src/Operators/DropoutOperator.cpp index 4c12b7140..6b99e0ae5 100644 --- a/NeoOnnx/src/Operators/DropoutOperator.cpp +++ b/NeoOnnx/src/Operators/DropoutOperator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2020 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,6 +21,8 @@ limitations under the License. #include "onnx.pb.h" +using namespace NeoML; + namespace NeoOnnx { CDropoutOperator::CDropoutOperator( const onnx::NodeProto& dropout, int opsetVersion ) : diff --git a/NeoOnnx/src/Operators/ExpandOperator.cpp b/NeoOnnx/src/Operators/ExpandOperator.cpp index 8363ee1c1..246032edb 100644 --- a/NeoOnnx/src/Operators/ExpandOperator.cpp +++ b/NeoOnnx/src/Operators/ExpandOperator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2022 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,6 +22,8 @@ limitations under the License. #include "NeoOnnxCheck.h" #include +using namespace NeoML; + namespace NeoOnnx { CExpandOperator::CExpandOperator( const onnx::NodeProto& expand, int opsetVersion ) : diff --git a/NeoOnnx/src/Operators/FlattenOperator.cpp b/NeoOnnx/src/Operators/FlattenOperator.cpp index e65a89601..b3e41fbdd 100644 --- a/NeoOnnx/src/Operators/FlattenOperator.cpp +++ b/NeoOnnx/src/Operators/FlattenOperator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2020 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,6 +21,8 @@ limitations under the License. #include "onnx.pb.h" +using namespace NeoML; + namespace NeoOnnx { CTransformLayer* createTransformLayer( const CLayerOutput& link, const CString& name ) diff --git a/NeoOnnx/src/Operators/GatherOperator.cpp b/NeoOnnx/src/Operators/GatherOperator.cpp index 4c8ec7349..36c3508ed 100644 --- a/NeoOnnx/src/Operators/GatherOperator.cpp +++ b/NeoOnnx/src/Operators/GatherOperator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2021 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -25,6 +25,8 @@ limitations under the License. #include +using namespace NeoML; + namespace NeoOnnx { CGatherOperator::CGatherOperator( const onnx::NodeProto& gather, int opsetVersion ) : diff --git a/NeoOnnx/src/Operators/GemmOperator.cpp b/NeoOnnx/src/Operators/GemmOperator.cpp index bc9a41aa6..08e902419 100644 --- a/NeoOnnx/src/Operators/GemmOperator.cpp +++ b/NeoOnnx/src/Operators/GemmOperator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2020 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,6 +22,8 @@ limitations under the License. #include "onnx.pb.h" +using namespace NeoML; + namespace NeoOnnx { CGemmOperator::CGemmOperator( const onnx::NodeProto& gemm, int opsetVersion ) : diff --git a/NeoOnnx/src/Operators/IdentityOperator.cpp b/NeoOnnx/src/Operators/IdentityOperator.cpp index 906636490..14a7c5b0f 100644 --- a/NeoOnnx/src/Operators/IdentityOperator.cpp +++ b/NeoOnnx/src/Operators/IdentityOperator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2020 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,6 +21,8 @@ limitations under the License. #include "onnx.pb.h" +using namespace NeoML; + namespace NeoOnnx { CIdentityOperator::CIdentityOperator( const onnx::NodeProto& identity, int opsetVersion ) : diff --git a/NeoOnnx/src/Operators/InstanceNormalizationOperator.cpp b/NeoOnnx/src/Operators/InstanceNormalizationOperator.cpp index e6c7b5b5d..1ea2292ec 100644 --- a/NeoOnnx/src/Operators/InstanceNormalizationOperator.cpp +++ b/NeoOnnx/src/Operators/InstanceNormalizationOperator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2022 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,6 +22,8 @@ limitations under the License. #include "NeoOnnxCheck.h" #include "TensorUtils.h" +using namespace NeoML; + namespace NeoOnnx { // Validator for InstanceNorm operator diff --git a/NeoOnnx/src/Operators/LogicalOperator.cpp b/NeoOnnx/src/Operators/LogicalOperator.cpp index 541aa8d5e..9ae8163f2 100644 --- a/NeoOnnx/src/Operators/LogicalOperator.cpp +++ b/NeoOnnx/src/Operators/LogicalOperator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2022 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -18,6 +18,8 @@ limitations under the License. #include "LogicalOperator.h" +using namespace NeoML; + namespace NeoOnnx { CNotOperator::CNotOperator( const onnx::NodeProto& notNode, int opsetVersion ) : diff --git a/NeoOnnx/src/Operators/LrnOperator.cpp b/NeoOnnx/src/Operators/LrnOperator.cpp index 2774d83d5..371ce904d 100644 --- a/NeoOnnx/src/Operators/LrnOperator.cpp +++ b/NeoOnnx/src/Operators/LrnOperator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2020 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,6 +22,8 @@ limitations under the License. #include "onnx.pb.h" +using namespace NeoML; + namespace NeoOnnx { CLrnOperator::CLrnOperator( const onnx::NodeProto& lrn, int opsetVersion ) : diff --git a/NeoOnnx/src/Operators/LstmOperator.cpp b/NeoOnnx/src/Operators/LstmOperator.cpp index df9d261b5..6e45db757 100644 --- a/NeoOnnx/src/Operators/LstmOperator.cpp +++ b/NeoOnnx/src/Operators/LstmOperator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2023 ABBYY +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -26,6 +26,8 @@ limitations under the License. #include +using namespace NeoML; + namespace NeoOnnx { CLstmOperator::CLstmOperator( const onnx::NodeProto& lstm, int opsetVersion ) : diff --git a/NeoOnnx/src/Operators/MatMulOperator.cpp b/NeoOnnx/src/Operators/MatMulOperator.cpp index 312491f93..e9aa4c2b8 100644 --- a/NeoOnnx/src/Operators/MatMulOperator.cpp +++ b/NeoOnnx/src/Operators/MatMulOperator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2020 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -24,6 +24,8 @@ limitations under the License. #include "onnx.pb.h" +using namespace NeoML; + namespace NeoOnnx { CMatMulOperator::CMatMulOperator( const onnx::NodeProto& matMul, int opsetVersion ) : diff --git a/NeoOnnx/src/Operators/NonZeroOperator.cpp b/NeoOnnx/src/Operators/NonZeroOperator.cpp index a06d39eff..726df0a26 100644 --- a/NeoOnnx/src/Operators/NonZeroOperator.cpp +++ b/NeoOnnx/src/Operators/NonZeroOperator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2022 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -26,6 +26,8 @@ limitations under the License. #include #include +using namespace NeoML; + namespace NeoOnnx { static CPtr addNonZeroOpSourceHelper( const CString& name, CDnn& dnn, int value ) diff --git a/NeoOnnx/src/Operators/PoolOperator.cpp b/NeoOnnx/src/Operators/PoolOperator.cpp index fcfb255db..e7ed685c9 100644 --- a/NeoOnnx/src/Operators/PoolOperator.cpp +++ b/NeoOnnx/src/Operators/PoolOperator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2020 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,6 +21,8 @@ limitations under the License. #include "PoolOperator.h" #include "TensorUtils.h" +using namespace NeoML; + namespace NeoOnnx { CPoolOperatorBase::CPoolOperatorBase( const onnx::NodeProto& poolNode, int opsetVersion ) : diff --git a/NeoOnnx/src/Operators/RangeOperator.cpp b/NeoOnnx/src/Operators/RangeOperator.cpp index 1dc3d886c..e1a4c980d 100644 --- a/NeoOnnx/src/Operators/RangeOperator.cpp +++ b/NeoOnnx/src/Operators/RangeOperator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2021 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -24,6 +24,8 @@ limitations under the License. #include +using namespace NeoML; + namespace NeoOnnx { CRangeOperator::CRangeOperator( const onnx::NodeProto& range, int opsetVersion ) : diff --git a/NeoOnnx/src/Operators/ReshapeOperator.cpp b/NeoOnnx/src/Operators/ReshapeOperator.cpp index a9d688098..2b86c522e 100644 --- a/NeoOnnx/src/Operators/ReshapeOperator.cpp +++ b/NeoOnnx/src/Operators/ReshapeOperator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2020 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -23,6 +23,8 @@ limitations under the License. #include "onnx.pb.h" +using namespace NeoML; + namespace NeoOnnx { static void calcReshapeOperatorOutputShape( const CShapeTensor& input, const CDnnBlob& newShape, diff --git a/NeoOnnx/src/Operators/ResizeOperator.cpp b/NeoOnnx/src/Operators/ResizeOperator.cpp index 9b882f2b2..e08e2f7df 100644 --- a/NeoOnnx/src/Operators/ResizeOperator.cpp +++ b/NeoOnnx/src/Operators/ResizeOperator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2022 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -27,6 +27,8 @@ limitations under the License. #include +using namespace NeoML; + namespace NeoOnnx { static bool isInputPresent( const CTensorArray& inputs, int index ) diff --git a/NeoOnnx/src/Operators/ScatterOperator.cpp b/NeoOnnx/src/Operators/ScatterOperator.cpp index 652ff2040..343482086 100644 --- a/NeoOnnx/src/Operators/ScatterOperator.cpp +++ b/NeoOnnx/src/Operators/ScatterOperator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2022 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,6 +21,8 @@ limitations under the License. #include "onnx.pb.h" +using namespace NeoML; + namespace NeoOnnx { class CScatterNDLayoutValidator : public ITensorLayoutValidator { diff --git a/NeoOnnx/src/Operators/ShapeOperator.cpp b/NeoOnnx/src/Operators/ShapeOperator.cpp index bc66fdf1c..2cc43a2b2 100644 --- a/NeoOnnx/src/Operators/ShapeOperator.cpp +++ b/NeoOnnx/src/Operators/ShapeOperator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2020 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -25,6 +25,8 @@ limitations under the License. #include "onnx.pb.h" +using namespace NeoML; + namespace NeoOnnx { CShapeOperator::CShapeOperator( const onnx::NodeProto& shape, int opsetVersion ) : diff --git a/NeoOnnx/src/Operators/SoftmaxOperator.cpp b/NeoOnnx/src/Operators/SoftmaxOperator.cpp index fe6b15e88..05ab828fa 100644 --- a/NeoOnnx/src/Operators/SoftmaxOperator.cpp +++ b/NeoOnnx/src/Operators/SoftmaxOperator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2020 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,6 +22,8 @@ limitations under the License. #include "onnx.pb.h" +using namespace NeoML; + namespace NeoOnnx { class CSoftmaxLayoutValidator : public ITensorLayoutValidator { diff --git a/NeoOnnx/src/Operators/SplitOperator.cpp b/NeoOnnx/src/Operators/SplitOperator.cpp index dc4b5084e..dae72f436 100644 --- a/NeoOnnx/src/Operators/SplitOperator.cpp +++ b/NeoOnnx/src/Operators/SplitOperator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2022 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -24,6 +24,8 @@ limitations under the License. #include +using namespace NeoML; + namespace NeoOnnx { CSplitOperator::CSplitOperator( const onnx::NodeProto& split, int opsetVersion ) : diff --git a/NeoOnnx/src/Operators/SqueezeOperator.cpp b/NeoOnnx/src/Operators/SqueezeOperator.cpp index 705d394eb..72678400a 100644 --- a/NeoOnnx/src/Operators/SqueezeOperator.cpp +++ b/NeoOnnx/src/Operators/SqueezeOperator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2020 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,6 +21,8 @@ limitations under the License. #include "onnx.pb.h" +using namespace NeoML; + namespace NeoOnnx { CSqueezeOperator::CSqueezeOperator( const onnx::NodeProto& squeeze, int opsetVersion ) : diff --git a/NeoOnnx/src/Operators/TransposeOperator.cpp b/NeoOnnx/src/Operators/TransposeOperator.cpp index 63f12b897..ff2209957 100644 --- a/NeoOnnx/src/Operators/TransposeOperator.cpp +++ b/NeoOnnx/src/Operators/TransposeOperator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2020 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,6 +21,8 @@ limitations under the License. #include "onnx.pb.h" +using namespace NeoML; + namespace NeoOnnx { CTransposeOperator::CTransposeOperator( const onnx::NodeProto& transpose, int opsetVersion ) : diff --git a/NeoOnnx/src/Operators/UnsqueezeOperator.cpp b/NeoOnnx/src/Operators/UnsqueezeOperator.cpp index 028514b96..d0bf84070 100644 --- a/NeoOnnx/src/Operators/UnsqueezeOperator.cpp +++ b/NeoOnnx/src/Operators/UnsqueezeOperator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2020 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,6 +21,8 @@ limitations under the License. #include "onnx.pb.h" +using namespace NeoML; + namespace NeoOnnx { CUnsqueezeOperator::CUnsqueezeOperator( const onnx::NodeProto& unsqueeze, int opsetVersion ) : diff --git a/NeoOnnx/src/Operators/UpsampleOperator.cpp b/NeoOnnx/src/Operators/UpsampleOperator.cpp index e66bf5367..1ef90ff3e 100644 --- a/NeoOnnx/src/Operators/UpsampleOperator.cpp +++ b/NeoOnnx/src/Operators/UpsampleOperator.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2022 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -27,6 +27,8 @@ limitations under the License. #include +using namespace NeoML; + namespace NeoOnnx { CUpsampleOperator::CUpsampleOperator( const onnx::NodeProto& upsample, int opsetVersion ) : diff --git a/NeoOnnx/src/Optimization/Conv1x1Optimizer.cpp b/NeoOnnx/src/Optimization/Conv1x1Optimizer.cpp index 367b46ab6..7e9a966a5 100644 --- a/NeoOnnx/src/Optimization/Conv1x1Optimizer.cpp +++ b/NeoOnnx/src/Optimization/Conv1x1Optimizer.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2023 ABBYY +/* Copyright © 2023-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,6 +22,8 @@ limitations under the License. #include #include +using namespace NeoML; + namespace NeoOnnx { namespace optimization { diff --git a/NeoOnnx/src/Optimization/GRNOptimizer.cpp b/NeoOnnx/src/Optimization/GRNOptimizer.cpp index b82784902..7f9891d48 100644 --- a/NeoOnnx/src/Optimization/GRNOptimizer.cpp +++ b/NeoOnnx/src/Optimization/GRNOptimizer.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2023 ABBYY +/* Copyright © 2023-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -28,6 +28,8 @@ limitations under the License. #include #include +using namespace NeoML; + namespace NeoOnnx { class CGrnLayoutValidator : public ITensorLayoutValidator { diff --git a/NeoOnnx/src/Optimization/HSwishOptimizer.cpp b/NeoOnnx/src/Optimization/HSwishOptimizer.cpp index 4704ca834..fa79534fb 100644 --- a/NeoOnnx/src/Optimization/HSwishOptimizer.cpp +++ b/NeoOnnx/src/Optimization/HSwishOptimizer.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2023 ABBYY +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,6 +22,8 @@ limitations under the License. #include "HSwishOptimizer.h" #include +using namespace NeoML; + namespace NeoOnnx { namespace optimization { diff --git a/NeoOnnx/src/Optimization/HardSigmoidOptimizer.cpp b/NeoOnnx/src/Optimization/HardSigmoidOptimizer.cpp index bb765ac36..5b7248d3c 100644 --- a/NeoOnnx/src/Optimization/HardSigmoidOptimizer.cpp +++ b/NeoOnnx/src/Optimization/HardSigmoidOptimizer.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2023 ABBYY +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,6 +22,8 @@ limitations under the License. #include "HardSigmoidOptimizer.h" #include +using namespace NeoML; + namespace NeoOnnx { namespace optimization { diff --git a/NeoOnnx/src/Optimization/LayerNormFusionOptimizer.cpp b/NeoOnnx/src/Optimization/LayerNormFusionOptimizer.cpp index 5fd1f584e..343ac325f 100644 --- a/NeoOnnx/src/Optimization/LayerNormFusionOptimizer.cpp +++ b/NeoOnnx/src/Optimization/LayerNormFusionOptimizer.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2023 ABBYY +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -21,6 +21,8 @@ limitations under the License. #include #include "Optimization/LayerNormFusionOptimizer.h" +using namespace NeoML; + namespace NeoOnnx { class CObjectNormLayoutValidator : public ITensorLayoutValidator { diff --git a/NeoOnnx/src/Optimization/SqueezeAndExciteOptimizer.cpp b/NeoOnnx/src/Optimization/SqueezeAndExciteOptimizer.cpp index 68cca488c..400dd819a 100644 --- a/NeoOnnx/src/Optimization/SqueezeAndExciteOptimizer.cpp +++ b/NeoOnnx/src/Optimization/SqueezeAndExciteOptimizer.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2023 ABBYY +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -28,6 +28,8 @@ limitations under the License. #include #include +using namespace NeoML; + namespace NeoOnnx { namespace optimization { diff --git a/NeoOnnx/src/TensorUtils.cpp b/NeoOnnx/src/TensorUtils.cpp index c69d41afa..8d40ab1bd 100644 --- a/NeoOnnx/src/TensorUtils.cpp +++ b/NeoOnnx/src/TensorUtils.cpp @@ -1,4 +1,4 @@ -/* Copyright © 2017-2020 ABBYY Production LLC +/* Copyright © 2017-2024 ABBYY Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -26,6 +26,8 @@ limitations under the License. #include #include +using namespace NeoML; + namespace NeoOnnx { bool IsInteger( float x )