From d2291a463b65cba4c2ec0a2c644e27a583dc006b Mon Sep 17 00:00:00 2001 From: dangyifei Date: Fri, 2 Aug 2019 14:56:54 +0800 Subject: [PATCH] modify header and ifdefind --- cube/CMakeLists.txt | 14 ++++++++++++++ .../include/cube-builder/builder_job.h | 5 +---- .../include/cube-builder/crovl_builder_increment.h | 6 ++---- .../include/cube-builder/curl_simple.h | 6 ++---- cube/cube-builder/include/cube-builder/define.h | 7 +++---- .../cube-builder/include/cube-builder/raw_reader.h | 5 ++--- .../include/cube-builder/seqfile_reader.h | 4 +--- cube/cube-builder/include/cube-builder/util.h | 5 +---- cube/cube-builder/include/cube-builder/vtext.h | 5 +---- cube/cube-builder/src/builder_job.cpp | 6 +++--- cube/cube-builder/src/crovl_builder_increment.cpp | 8 ++++---- cube/cube-builder/src/curl_simple.cpp | 2 +- cube/cube-builder/src/main.cpp | 6 +++--- cube/cube-builder/src/seqfile_reader.cpp | 4 ++-- cube/cube-builder/src/util.cpp | 2 +- 15 files changed, 41 insertions(+), 44 deletions(-) diff --git a/cube/CMakeLists.txt b/cube/CMakeLists.txt index 6520c7fe..55fd966c 100644 --- a/cube/CMakeLists.txt +++ b/cube/CMakeLists.txt @@ -1,3 +1,17 @@ +# Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License + add_subdirectory(cube-server) add_subdirectory(cube-api) add_subdirectory(cube-builder) diff --git a/cube/cube-builder/include/cube-builder/builder_job.h b/cube/cube-builder/include/cube-builder/builder_job.h index 6c6dbe3f..55c6df42 100644 --- a/cube/cube-builder/include/cube-builder/builder_job.h +++ b/cube/cube-builder/include/cube-builder/builder_job.h @@ -12,8 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef CUBE_CUBE_BUILDER_INCLUDE_CUBE_BUILDER_BUILDER_JOB_H_ -#define CUBE_CUBE_BUILDER_INCLUDE_CUBE_BUILDER_BUILDER_JOB_H_ +#pragma once #include #include @@ -56,5 +55,3 @@ class Job { void mapFileLocal(Job job, string file, vector reduces); - -#endif // CUBE_CUBE_BUILDER_INCLUDE_CUBE_BUILDER_BUILDER_JOB_H_ diff --git a/cube/cube-builder/include/cube-builder/crovl_builder_increment.h b/cube/cube-builder/include/cube-builder/crovl_builder_increment.h index fa416bc4..ac0c0418 100644 --- a/cube/cube-builder/include/cube-builder/crovl_builder_increment.h +++ b/cube/cube-builder/include/cube-builder/crovl_builder_increment.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef CUBE_CUBE_BUILDER_INCLUDE_CUBE_BUILDER_CROVL_BUILDER_INCREMENT_H_ -#define CUBE_CUBE_BUILDER_INCLUDE_CUBE_BUILDER_CROVL_BUILDER_INCREMENT_H_ +#pragma once + #include #include @@ -111,5 +111,3 @@ class CROVLBuilderIncremental { bool write_cur_meta_to_local(); }; - -#endif // CUBE_CUBE_BUILDER_INCLUDE_CUBE_BUILDER_CROVL_BUILDER_INCREMENT_H_ diff --git a/cube/cube-builder/include/cube-builder/curl_simple.h b/cube/cube-builder/include/cube-builder/curl_simple.h index bc41880c..7b604704 100644 --- a/cube/cube-builder/include/cube-builder/curl_simple.h +++ b/cube/cube-builder/include/cube-builder/curl_simple.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef CUBE_CUBE_BUILDER_INCLUDE_CUBE_BUILDER_CURL_SIMPLE_H_ -#define CUBE_CUBE_BUILDER_INCLUDE_CUBE_BUILDER_CURL_SIMPLE_H_ +#pragma once + #include #include #include @@ -67,5 +67,3 @@ class CurlSimple { private: CURL *_p_curl; }; - -#endif // CUBE_CUBE_BUILDER_INCLUDE_CUBE_BUILDER_CURL_SIMPLE_H_ diff --git a/cube/cube-builder/include/cube-builder/define.h b/cube/cube-builder/include/cube-builder/define.h index 444108f9..00142142 100644 --- a/cube/cube-builder/include/cube-builder/define.h +++ b/cube/cube-builder/include/cube-builder/define.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef CUBE_CUBE_BUILDER_INCLUDE_CUBE_BUILDER_DEFINE_H_ -#define CUBE_CUBE_BUILDER_INCLUDE_CUBE_BUILDER_DEFINE_H_ +#pragma once + #include #include #include @@ -60,5 +60,4 @@ class RecordReader { virtual int next(Record* record) = 0; virtual int close() = 0; -}; // class RecordReader -#endif // CUBE_CUBE_BUILDER_INCLUDE_CUBE_BUILDER_DEFINE_H_ +}; // class RecordReader diff --git a/cube/cube-builder/include/cube-builder/raw_reader.h b/cube/cube-builder/include/cube-builder/raw_reader.h index 2aec4aa5..acd4340d 100644 --- a/cube/cube-builder/include/cube-builder/raw_reader.h +++ b/cube/cube-builder/include/cube-builder/raw_reader.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef CUBE_CUBE_BUILDER_INCLUDE_CUBE_BUILDER_RAW_READER_H_ -#define CUBE_CUBE_BUILDER_INCLUDE_CUBE_BUILDER_RAW_READER_H_ +#pragma once + #include #include #include "butil/logging.h" @@ -122,4 +122,3 @@ class FileRawReader : public RawReader { std::string _path{""}; std::ifstream _reader; }; -#endif // CUBE_CUBE_BUILDER_INCLUDE_CUBE_BUILDER_RAW_READER_H_ diff --git a/cube/cube-builder/include/cube-builder/seqfile_reader.h b/cube/cube-builder/include/cube-builder/seqfile_reader.h index c4e2b4a0..abe36a66 100644 --- a/cube/cube-builder/include/cube-builder/seqfile_reader.h +++ b/cube/cube-builder/include/cube-builder/seqfile_reader.h @@ -12,8 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef CUBE_CUBE_BUILDER_INCLUDE_CUBE_BUILDER_SEQFILE_READER_H_ -#define CUBE_CUBE_BUILDER_INCLUDE_CUBE_BUILDER_SEQFILE_READER_H_ +#pragma once #include #include @@ -44,4 +43,3 @@ class SequenceFileRecordReader : public RecordReader { }; typedef std::shared_ptr SequenceFileRecordReaderPtr; -#endif // CUBE_CUBE_BUILDER_INCLUDE_CUBE_BUILDER_SEQFILE_READER_H_ diff --git a/cube/cube-builder/include/cube-builder/util.h b/cube/cube-builder/include/cube-builder/util.h index 4f5141c5..2b743e5d 100644 --- a/cube/cube-builder/include/cube-builder/util.h +++ b/cube/cube-builder/include/cube-builder/util.h @@ -12,8 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef CUBE_CUBE_BUILDER_INCLUDE_CUBE_BUILDER_UTIL_H_ -#define CUBE_CUBE_BUILDER_INCLUDE_CUBE_BUILDER_UTIL_H_ +#pragma once #include #include @@ -30,5 +29,3 @@ bool checkDirectory(const std::string folder); void CmdTarfiles(const std::string folder); void CmdMd5sum(const std::string folder); - -#endif // CUBE_CUBE_BUILDER_INCLUDE_CUBE_BUILDER_UTIL_H_ diff --git a/cube/cube-builder/include/cube-builder/vtext.h b/cube/cube-builder/include/cube-builder/vtext.h index f7e31ac4..51c3fa3c 100644 --- a/cube/cube-builder/include/cube-builder/vtext.h +++ b/cube/cube-builder/include/cube-builder/vtext.h @@ -12,8 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef CUBE_CUBE_BUILDER_INCLUDE_CUBE_BUILDER_VTEXT_H_ -#define CUBE_CUBE_BUILDER_INCLUDE_CUBE_BUILDER_VTEXT_H_ +#pragma once #include #include "cube-builder/define.h" @@ -86,5 +85,3 @@ class VString { return true; } }; - -#endif // CUBE_CUBE_BUILDER_INCLUDE_CUBE_BUILDER_VTEXT_H_ diff --git a/cube/cube-builder/src/builder_job.cpp b/cube/cube-builder/src/builder_job.cpp index dfae8737..97edaf4f 100644 --- a/cube/cube-builder/src/builder_job.cpp +++ b/cube/cube-builder/src/builder_job.cpp @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "../include/cube-builder/builder_job.h" +#include "cube-builder/builder_job.h" #include #include -#include "../include/cube-builder/seqfile_reader.h" -#include "../include/cube-builder/util.h" #include "butil/logging.h" +#include "cube-builder/seqfile_reader.h" +#include "cube-builder/util.h" using std::string; void Job::set_shard_num(int num) { shard_num = num; } diff --git a/cube/cube-builder/src/crovl_builder_increment.cpp b/cube/cube-builder/src/crovl_builder_increment.cpp index 9c90404a..69732071 100644 --- a/cube/cube-builder/src/crovl_builder_increment.cpp +++ b/cube/cube-builder/src/crovl_builder_increment.cpp @@ -12,17 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "../include/cube-builder/crovl_builder_increment.h" +#include "cube-builder/crovl_builder_increment.h" #include #include #include #include #include #include -#include "../include/cube-builder/curl_simple.h" -#include "../include/cube-builder/define.h" -#include "../include/cube-builder/util.h" #include "boost/lexical_cast.hpp" +#include "cube-builder/curl_simple.h" +#include "cube-builder/define.h" +#include "cube-builder/util.h" #include "json/json.h" static const uint64_t MB = 1048576; diff --git a/cube/cube-builder/src/curl_simple.cpp b/cube/cube-builder/src/curl_simple.cpp index 37d99116..f95902f1 100644 --- a/cube/cube-builder/src/curl_simple.cpp +++ b/cube/cube-builder/src/curl_simple.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "../include/cube-builder/curl_simple.h" +#include "cube-builder/curl_simple.h" #include #include #include diff --git a/cube/cube-builder/src/main.cpp b/cube/cube-builder/src/main.cpp index b9ba453b..7ea42891 100644 --- a/cube/cube-builder/src/main.cpp +++ b/cube/cube-builder/src/main.cpp @@ -16,10 +16,10 @@ #include #include #include -#include "../include/cube-builder/builder_job.h" -#include "../include/cube-builder/crovl_builder_increment.h" -#include "../include/cube-builder/util.h" #include "butil/logging.h" +#include "cube-builder/builder_job.h" +#include "cube-builder/crovl_builder_increment.h" +#include "cube-builder/util.h" DEFINE_string(dict_name, "", "dict name, no need"); DEFINE_string(input_path, "", "source data input path"); diff --git a/cube/cube-builder/src/seqfile_reader.cpp b/cube/cube-builder/src/seqfile_reader.cpp index e7afc846..378ce5e0 100644 --- a/cube/cube-builder/src/seqfile_reader.cpp +++ b/cube/cube-builder/src/seqfile_reader.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "../include/cube-builder/seqfile_reader.h" +#include "cube-builder/seqfile_reader.h" #include -#include "../include/cube-builder/vtext.h" #include "butil/logging.h" +#include "cube-builder/vtext.h" int SequenceFileRecordReader::open() { if (_raw_reader->open() != 0) { diff --git a/cube/cube-builder/src/util.cpp b/cube/cube-builder/src/util.cpp index bdf5dab4..8524a4c7 100644 --- a/cube/cube-builder/src/util.cpp +++ b/cube/cube-builder/src/util.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "../include/cube-builder/util.h" +#include "cube-builder/util.h" #include #include #include -- GitLab