diff --git a/cube/CMakeLists.txt b/cube/CMakeLists.txt index 6520c7fe3766e6e1f49c7d4f89b9476a75a40d3d..55fd966cf553e013ecbdf50eddc9766471a33075 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 6c6dbe3f9a5da1457513ff08f64494617b4140bb..55c6df42ca16499b180ddb0eed7267592acbb1b8 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 fa416bc4819e3fb6ac67e4676b8b1f56420f277f..ac0c0418c459632e0451abcee07f5281272a44e8 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 bc41880c1431308583e4c07fd752b1dce7917423..7b60470449655dde72ccdebf6692df8fea58fb69 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 444108f9658fc826e6623f4904aa65a9a3a6b876..00142142652d56e5aa2895b5b1aec516938ee7d7 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 2aec4aa54942e49fa319137e1169562265635d8a..acd4340d2c2df8ca529bfaff90ddf73bb966d163 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 c4e2b4a0a6013e5978b57b066b0d86a141ca1ba3..abe36a66f9288496a11d587b1e56578b7681f157 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 4f5141c577d31c5eb15448931a14d8d317c6927a..2b743e5d508c235c87dd04bef1bad8deb24f5573 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 f7e31ac4a85bed271e9630f153b404db27f3e9e7..51c3fa3ce2479e15b55afd3b5195dec58ff876d7 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 dfae8737c89e864c5a821dcb915ce61fb9768f98..97edaf4f9c8f5417888f72bccab462bfed2588c9 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 9c90404ac8cda805bd4a83959d10e87328188641..69732071ceee8d717682880229f56fa033d4165d 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 37d99116e34018d290b186279b4d47c2ce38c7d2..f95902f180bbd35cda5cf6e3b9ed5a352136185b 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 b9ba453b6ee39ad43958bbdfe68913b4516eac0b..7ea428919ad063ffc63e908d203bb9c302e53021 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 e7afc8464a7f1125762e6be6688eb7109924d052..378ce5e006a8d40ab94dac9c625cb7b6cc636858 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 bdf5dab411c865cb3805f2342439dfa8d60c31d9..8524a4c7527e68b3e67141535bffcf4dae330c9e 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