[Git][debian-gis-team/otb][upstream] New upstream version 6.6.0~rc3+dfsg

[Bas Couwenberg]

Bas Couwenberg pushed to branch upstream at Debian GIS Project / otb


Commits:
7c897dd2 by Bas Couwenberg at 2018-06-08T16:55:40+02:00
New upstream version 6.6.0~rc3+dfsg
- - - - -


3 changed files:

- Modules/Applications/AppDimensionalityReduction/app/otbVectorDimensionalityReduction.cxx
- Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h
- Modules/ThirdParty/Shark/otb-module-init.cmake


Changes:

=====================================
Modules/Applications/AppDimensionalityReduction/app/otbVectorDimensionalityReduction.cxx
=====================================
--- a/Modules/Applications/AppDimensionalityReduction/app/otbVectorDimensionalityReduction.cxx
+++ b/Modules/Applications/AppDimensionalityReduction/app/otbVectorDimensionalityReduction.cxx
@@ -143,7 +143,7 @@ private:
       "parameter can't be used for other models"); //
     MandatoryOff("pcadim");
     
-    AddParameter(ParameterType_Choice, "mode", "Writting mode"); //
+    AddParameter(ParameterType_Choice, "mode", "Writing mode"); //
     SetParameterDescription("mode", "This parameter determines if the output "
       "file is overwritten or updated [overwrite/update]. If an output file "
       "name is given, the original file is copied before creating the new features.");
@@ -325,7 +325,7 @@ private:
       else
         {
         otbAppLogFATAL(<< "Error when creating the output file" <<
-          GetParameterString("mode") << " : unsupported writting mode type");
+          GetParameterString("mode") << " : unsupported writing mode type");
         }
       }
 


=====================================
Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h
=====================================
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h
@@ -178,7 +178,7 @@ private:
   itk::Array<double> m_Beta; // Sparsity regularization parameter
   double m_InitFactor; // Weight initialization factor (the weights are intialized at m_initfactor/sqrt(inputDimension)  )
 
-  bool m_WriteLearningCurve; // Flag for writting the learning curve into a txt file
+  bool m_WriteLearningCurve; // Flag for writing the learning curve into a txt file
   std::string m_LearningCurveFileName; // Name of the output learning curve printed after training
   bool m_WriteWeights;
 };


=====================================
Modules/ThirdParty/Shark/otb-module-init.cmake
=====================================
--- a/Modules/ThirdParty/Shark/otb-module-init.cmake
+++ b/Modules/ThirdParty/Shark/otb-module-init.cmake
@@ -20,8 +20,10 @@
 
 find_package ( Shark REQUIRED )
 
-if(SHARK_USE_OPENMP AND NOT OTB_USE_OPENMP)
-  message(WARNING "Shark library is built with OpenMP and you have OTB_USE_OPENMP set to OFF.")
+if ( SHARK_USE_OPENMP AND NOT OTB_USE_OPENMP )
+  message(WARNING "Shark library is built with OpenMP and you have OTB_USE_OPENMP set to OFF.\
+   It will be turned to ON to allow compilation.")
+  set( OTB_USE_OPENMP "ON" CACHE BOOL "Add openmp compiler and linker flags" FORCE )
 endif()
 
 mark_as_advanced( Shark_DIR )



View it on GitLab: https://salsa.debian.org/debian-gis-team/otb/commit/7c897dd20774573232447732cffb0af734b8e2ea

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/otb/commit/7c897dd20774573232447732cffb0af734b8e2ea
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20180609/d4d62b9f/attachment-0001.html>