Fix g++ compilation warnings

sprintf_s is snprintf, not sprintf Need to use more symbols from SGD Add externs for missing file name generators that seem to be not reachable and not defined.
thanaphatp · Aug 3, 2015 · ad5b8a2 · ad5b8a2
1 parent e633191
commit ad5b8a2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/Common/Include/Platform.h b/Common/Include/Platform.h
@@ -54,7 +54,7 @@ typedef void* HANDLE;
 #define __forceinline inline
 //string and io conversion
 #define strtok_s strtok_r
-#define sprintf_s sprintf
+#define sprintf_s snprintf
 #define sscanf_s sscanf
 #define _strdup strdup
 

diff --git a/DataReader/UCIFastReader/UCIParser.cpp b/DataReader/UCIFastReader/UCIParser.cpp
@@ -653,7 +653,7 @@ long UCIParser<NumType, LabelType>::Parse(size_t recordsRequested, std::vector<N
     long TickDelta = TickStop - TickStart;
 
     if (m_traceLevel > 2)
-        fprintf(stderr, "\n%ld ms, %d numbers parsed\n\n", TickDelta, m_totalNumbersConverted );
+        fprintf(stderr, "\n%ld ms, %ld numbers parsed\n\n", TickDelta, m_totalNumbersConverted );
     return recordCount;
 }
 

diff --git a/MachineLearning/CNTK/MultiNetworksSGD.h b/MachineLearning/CNTK/MultiNetworksSGD.h
@@ -33,6 +33,9 @@ namespace Microsoft {
     namespace MSR {
         namespace CNTK {
 
+            extern std::wstring GetEncoderModelNameForEpoch(int epoch, bool b = false);
+            extern std::wstring GetDecoderModelNameForEpoch(int epoch, bool b = false);
+
             template<class ElemType>
             class MultiNetworksSGD : SGD<ElemType>
             {
@@ -68,6 +71,12 @@ namespace Microsoft {
                 using SGDBase::m_numMBsToShowResult;
                 using SGDBase::m_gradientCheckSigDigit;
                 using SGDBase::m_prevChosenMinibatchSize;
+                using SGDBase::GetTrainCriterionNodes;
+                using SGDBase::GetEvalCriterionNodes;
+                using SGDBase::SetDropoutRate;
+                using SGDBase::UpdateEvalTimeStamps;
+                using SGDBase::UpdateWeights;
+                using SGDBase::GetCheckPointFileNameForEpoch;
 
                 typedef ComputationNode<ElemType>* ComputationNodePtr;
 
@@ -1124,7 +1133,7 @@ namespace Microsoft {
                                 if (wrong)
                                 {
                                     char serr[2048];
-                                    sprintf_s((char*)serr, 2048, "Decoder %ls Numeric gradient = %e, Error BP gradient = %e", node->NodeName().c_str(), grdNum, grdErr);
+                                    sprintf_s((char*)serr, 2048, "Decoder %ls Numeric gradient = %e, Error BP gradient = %e", node->NodeName().c_str(), static_cast<double>(grdNum), static_cast<double>(grdErr));
                                     fprintf(stdout, "%s\n", serr);
                                     verror_msgs.push_back(serr);
                                 }