Force clang-format to version 9

[Issue type] lint

Output from clang-format varies by clang-format version, for the best
result we force it to version 9.
Could run with ./script/excute_format.sh for all formatting. Also
jenkins bot will test it.

Change-Id: Id9e2ef4e9d74cf0e518f0a04efd1c49e4502b97c
Signed-off-by: Kwanghoon Son <k.son@samsung.com>

diff --git a/mv_machine_learning/face_recognition/include/nntrainer_fvm.h b/mv_machine_learning/face_recognition/include/nntrainer_fvm.h
index 2be41ed..8782c01 100644 (file)
--- a/mv_machine_learning/face_recognition/include/nntrainer_fvm.h
+++ b/mv_machine_learning/face_recognition/include/nntrainer_fvm.h
@@ -31,8 +31,7 @@ public:
 
        void WriteHeader(size_t feature_size, size_t label_cnt, unsigned int data_set_cnt) override;
        void ReadHeader(FeaVecHeader &header) override;
-       void StoreData(std::vector<std::vector<float> > &features_vec,
-                                  std::vector<unsigned int> &label_index) override;
+       void StoreData(std::vector<std::vector<float> > &features_vec, std::vector<unsigned int> &label_index) override;
        void Remove() override;
 };
 

diff --git a/mv_machine_learning/face_recognition/src/face_recognition.cpp b/mv_machine_learning/face_recognition/src/face_recognition.cpp
index 8447a09..212a5e0 100644 (file)
--- a/mv_machine_learning/face_recognition/src/face_recognition.cpp
+++ b/mv_machine_learning/face_recognition/src/face_recognition.cpp
@@ -145,7 +145,6 @@ void FaceRecognition::StoreDataSet(unique_ptr<DataSetManager> &data_set, unsigne
        }
 }
 
-
 void FaceRecognition::SetConfig(FaceRecognitionConfig &config)
 {
        _config = config;

diff --git a/mv_machine_learning/face_recognition/src/nntrainer_dsm.cpp b/mv_machine_learning/face_recognition/src/nntrainer_dsm.cpp
index 3a47314..4c7d484 100644 (file)
--- a/mv_machine_learning/face_recognition/src/nntrainer_dsm.cpp
+++ b/mv_machine_learning/face_recognition/src/nntrainer_dsm.cpp
@@ -99,8 +99,7 @@ void NNTrainerDSM::LoadDataSet(const string file_name, unsigned int new_label_cn
 
                unsigned int label_idx;
 
-               memcpy(&label_idx, reinterpret_cast<void *>(line_data.data() + _feature_vector_size),
-                          sizeof(unsigned int));
+               memcpy(&label_idx, reinterpret_cast<void *>(line_data.data() + _feature_vector_size), sizeof(unsigned int));
 
                vector<float> label;
 

diff --git a/mv_machine_learning/face_recognition/src/nntrainer_fvm.cpp b/mv_machine_learning/face_recognition/src/nntrainer_fvm.cpp
index 8eb7b7b..bc872be 100644 (file)
--- a/mv_machine_learning/face_recognition/src/nntrainer_fvm.cpp
+++ b/mv_machine_learning/face_recognition/src/nntrainer_fvm.cpp
@@ -32,8 +32,7 @@ void NNTrainerFVM::WriteHeader(size_t feature_size, size_t label_cnt, unsigned i
        if (!outFile.is_open())
                throw InvalidOperation("fail to open a file");
 
-       FeaVecHeader fvHeader { FeatureVectorManager::feature_vector_signature, feature_size, label_cnt,
-                                                       data_set_cnt };
+       FeaVecHeader fvHeader { FeatureVectorManager::feature_vector_signature, feature_size, label_cnt, data_set_cnt };
 
        outFile.write((char *) &fvHeader, sizeof(FeaVecHeader));
 }
@@ -55,8 +54,7 @@ void NNTrainerFVM::ReadHeader(FeaVecHeader &header)
                throw InvalidParameter("wrong feature vector file header.");
 }
 
-void NNTrainerFVM::StoreData(vector<vector<float> > &features_vec,
-                                                        vector<unsigned int> &label_index)
+void NNTrainerFVM::StoreData(vector<vector<float> > &features_vec, vector<unsigned int> &label_index)
 {
        ofstream outFile { _feature_vector_file, ios::out | ios::binary | ios::app };
 

diff --git a/mv_machine_learning/training/include/feature_vector_manager.h b/mv_machine_learning/training/include/feature_vector_manager.h
index 19d25a0..4593806 100644 (file)
--- a/mv_machine_learning/training/include/feature_vector_manager.h
+++ b/mv_machine_learning/training/include/feature_vector_manager.h
@@ -52,8 +52,7 @@ public:
 
        virtual void WriteHeader(size_t feature_size, size_t label_cnt, unsigned int data_set_cnt) = 0;
        virtual void ReadHeader(FeaVecHeader &header) = 0;
-       virtual void StoreData(std::vector<std::vector<float> > &features_vec,
-                                                  std::vector<unsigned int> &label_index) = 0;
+       virtual void StoreData(std::vector<std::vector<float> > &features_vec, std::vector<unsigned int> &label_index) = 0;
        virtual void Remove() = 0;
 
        static constexpr unsigned int feature_vector_signature = 0xFEA09841;

diff --git a/mv_machine_learning/training/src/data_set_manager.cpp b/mv_machine_learning/training/src/data_set_manager.cpp
index fd2cb5b..6756ddf 100644 (file)
--- a/mv_machine_learning/training/src/data_set_manager.cpp
+++ b/mv_machine_learning/training/src/data_set_manager.cpp
@@ -18,8 +18,7 @@
 
 using namespace std;
 
-DataSetManager::DataSetManager()
-               : _data(), _labels(), _label_index(), _feature_vector_size(), _label_count()
+DataSetManager::DataSetManager() : _data(), _labels(), _label_index(), _feature_vector_size(), _label_count()
 {}
 
 DataSetManager::~DataSetManager()

diff --git a/script/execute_format.sh b/script/execute_format.sh
new file mode 100755 (executable)
index 0000000..4d0c189
--- /dev/null
+++ b/script/execute_format.sh
@@ -0,0 +1 @@
+find . -iname *.h -o -iname *.cpp -o -iname *.c | xargs clang-format-9 -i
\ No newline at end of file