update fineobj to 15 47 (neoml-lib#1013)

* update fineobj to 15 47 Signed-off-by: Valery Fedyunin <valery.fedyunin@abbyy.com> * Upgrade NeoMLTest Signed-off-by: Valery Fedyunin <valery.fedyunin@abbyy.com> * Call set_global_variables before include(FineInstall) Signed-off-by: Valery Fedyunin <valery.fedyunin@abbyy.com> * Remove unused variable Signed-off-by: Valery Fedyunin <valery.fedyunin@abbyy.com> * Fix protobuf compilation errors on Darwin Signed-off-by: Valery Fedyunin <valery.fedyunin@abbyy.com> * Remove invalid unicode symbols from copyright (+update) Signed-off-by: Valery Fedyunin <valery.fedyunin@abbyy.com> * Remove unused variable Signed-off-by: Valery Fedyunin <valery.fedyunin@abbyy.com> * Update NeoMLTest version Signed-off-by: Valery Fedyunin <valery.fedyunin@abbyy.com> * Switch to next NeoMLTest Signed-off-by: Valery Fedyunin <valery.fedyunin@abbyy.com> * Update NeoMLTest Signed-off-by: Valery Fedyunin <valery.fedyunin@abbyy.com> --------- Signed-off-by: Valery Fedyunin <valery.fedyunin@abbyy.com>
daniyalaliev · Jan 4, 2024 · e344b23 · e344b23
1 parent ef07245
commit e344b23
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/NeoML/CMakeLists.txt b/NeoML/CMakeLists.txt
@@ -20,6 +20,9 @@ endif()
 
 include(Settings)
 include(Version)
+# Set cmake default variables and some usefull variables
+set_global_variables()
+
 if(USE_FINE_OBJECTS)
     include(FineInstall)
 else()
@@ -57,9 +60,6 @@ if(NOT (WIN32 OR CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES
     set(NeoOnnx_BUILD OFF CACHE BOOL "" FORCE)
 endif()
 
-# Set cmake default variables and some usefull variables
-set_global_variables()
-
 if(USE_FINE_OBJECTS)
     find_package(FineObjects)
     if(NOT FineObj_FOUND)

diff --git a/NeoML/include/NeoML/Dnn/Layers/TransformerSourceMaskLayer.h b/NeoML/include/NeoML/Dnn/Layers/TransformerSourceMaskLayer.h
@@ -1,4 +1,4 @@
-/* Copyright © 2017-2022 ABBYY Production LLC
+/* Copyright © 2017-2023 ABBYY
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/NeoML/src/Dnn/Layers/TransformerSourceMaskLayer.cpp b/NeoML/src/Dnn/Layers/TransformerSourceMaskLayer.cpp
@@ -1,4 +1,4 @@
-/* Copyright © 2017-2022 ABBYY Production LLC
+/* Copyright © 2017-2023 ABBYY
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/NeoML/src/TraditionalML/Score.cpp b/NeoML/src/TraditionalML/Score.cpp
@@ -59,7 +59,6 @@ double F1Score( const CArray<CClassificationResult>& classificationResult, const
 	// *Positive means the objects that got the +1 label, *Negative the -1 label
 	double truePositive = 0;
 	double falsePositive = 0;
-	double trueNegative = 0;
 	double falseNegative = 0;
 
 	for( int i = 0; i < classificationResult.Size(); ++i ) {
@@ -72,9 +71,7 @@ double F1Score( const CArray<CClassificationResult>& classificationResult, const
 				}
 				break;
 			case -1:
-				if( GetBinaryClass( problem->GetClass( i ) ) == -1 ) {
-					trueNegative++;
-				} else {
+				if( GetBinaryClass( problem->GetClass( i ) ) != -1 ) {
 					falseNegative++;
 				}
 				break;

diff --git a/NeoML/src/TraditionalML/UnigramTrainer.cpp b/NeoML/src/TraditionalML/UnigramTrainer.cpp
@@ -199,7 +199,6 @@ void CUnigramTrainer::fillTrainDict( const CWordDictionary& frequencyDict )
 void CUnigramTrainer::createInitialVocab()
 {
 	CTrieNode<CTrieCounterData> substringTrie;
-	int64_t totalCount = 0;
 
 	for( int i = 0; i < trainDict.Size(); ++i ) {
 		const CString& word = trainDict.GetWord( i );
@@ -225,7 +224,6 @@ void CUnigramTrainer::createInitialVocab()
 					data.End = end;
 				}
 				data.Count += count;
-				totalCount += count;
 
 				if( tokenLength++ == maxSubwordLength ) {
 					break;

diff --git a/NeoOnnx/src/CMakeLists.txt b/NeoOnnx/src/CMakeLists.txt
@@ -178,6 +178,11 @@ if(LINUX)
     target_compile_options(libprotobuf-lite PRIVATE -Wno-stringop-overflow)
 endif()
 
+if(DARWIN)
+    target_compile_options(libprotobuf PRIVATE -Wno-deprecated-declarations)
+    target_compile_options(libprotobuf-lite PRIVATE -Wno-deprecated-declarations)
+endif()
+
 if(${CMAKE_VERSION} VERSION_GREATER "3.16.0")
     set(CMAKE_UNITY_BUILD ${NeoML_UNITY_BUILD})
 endif()

diff --git a/Sources.txt b/Sources.txt
@@ -1,6 +1,6 @@
 
 git;https://tfs/HQ/Tools_Libs/_git/FineObjects15
-get;FineObjects;/;FineObjects15-master 15.0.27.0
+get;FineObjects;/;FineObjects15-master 15.0.47.0
 
 git;https://tfs/HQ/ThirdParty/_git/CUDA
 get;ThirdParty/CUDA;/;CUDA v11.8 1.0.1.0
@@ -15,7 +15,7 @@ git;https://tfs/HQ/ThirdParty/_git/protobuf
 get;ThirdParty/protobuf;/;v3.11.4
 
 git;https://tfs/HQ/Tools_Libs/_git/NeoMLTest
-get;NeoMLTest;/;NeoMLTest-master 1.0.60.0
+get;NeoMLTest;/;NeoMLTest-master 1.0.64.0
 
 copy;%ROOT%/../NeoML;%ROOT%/NeoML/NeoML
 copy;%ROOT%/../NeoMathEngine;%ROOT%/NeoML/NeoMathEngine