Merge pull request #83 from scsven/dev

Move easyloggingpp into external directory

Former-commit-id: 2b9396704f9d3e3881f481ae53e087513ea591a4

CHANGELOG.md

@@ -7,6 +7,7 @@ Please mark all change in change log and use the ticket from JIRA.
 ## Bug
 ## Improvement
 - \#64 - Improvement dump function in scheduler
+- \#82 - Move easyloggingpp into "external" directory
 
 ## Feature
 ## Task

ci/jenkins/scripts/coverage.sh

@@ -131,8 +131,8 @@ ${LCOV_CMD} -r "${FILE_INFO_OUTPUT}" -o "${FILE_INFO_OUTPUT_NEW}" \
     "*/src/server/Server.cpp" \
     "*/src/server/DBWrapper.cpp" \
     "*/src/server/grpc_impl/GrpcServer.cpp" \
-    "*/src/utils/easylogging++.h" \
-    "*/src/utils/easylogging++.cc"
+    "*/src/external/easyloggingpp/easylogging++.h" \
+    "*/src/external/easyloggingpp/easylogging++.cc"
 
 # gen html report
 # ${LCOV_GEN_CMD} "${FILE_INFO_OUTPUT_NEW}" --output-directory ${DIR_LCOV_OUTPUT}/

core/build-support/lint_exclusions.txt

@@ -6,4 +6,5 @@
 *easylogging++*
 *SqliteMetaImpl.cpp
 *src/grpc*
+*src/external*
 *milvus/include*
\ No newline at end of file

core/coverage.sh

@@ -121,8 +121,9 @@ ${LCOV_CMD} -r "${FILE_INFO_OUTPUT}" -o "${FILE_INFO_OUTPUT_NEW}" \
     "*/src/server/Server.cpp" \
     "*/src/server/DBWrapper.cpp" \
     "*/src/server/grpc_impl/GrpcServer.cpp" \
-    "*/src/utils/easylogging++.h" \
-    "*/src/utils/easylogging++.cc"
+    "*/src/external/easyloggingpp/easylogging++.h" \
+    "*/src/external/easyloggingpp/easylogging++.cc" \
+    "*/src/external/*"
 
 # gen html report
 ${LCOV_GEN_CMD} "${FILE_INFO_OUTPUT_NEW}" --output-directory ${DIR_LCOV_OUTPUT}/

core/src/CMakeLists.txt

@@ -64,6 +64,13 @@ set(scheduler_files
         ${scheduler_task_files}
         )
 
+aux_source_directory(${MILVUS_ENGINE_SRC}/external/easyloggingpp external_easyloggingpp_files)
+aux_source_directory(${MILVUS_ENGINE_SRC}/external/nlohmann external_nlohmann_files)
+set(external_files
+        ${external_easyloggingpp_files}
+        ${external_nlohmann_files}
+        )
+
 aux_source_directory(${MILVUS_ENGINE_SRC}/server server_files)
 aux_source_directory(${MILVUS_ENGINE_SRC}/server/grpc_impl grpc_server_files)
 aux_source_directory(${MILVUS_ENGINE_SRC}/utils utils_files)
@@ -77,6 +84,7 @@ set(engine_files
         ${db_insert_files}
         ${db_meta_files}
         ${metrics_files}
+        ${external_files}
         ${utils_files}
         ${wrapper_files}
         )

core/src/index/knowhere/knowhere/common/Log.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "utils/easylogging++.h"
+#include "external/easyloggingpp/easylogging++.h"
 
 namespace knowhere {
 

core/src/index/unittest/CMakeLists.txt

@@ -20,7 +20,7 @@ set(basic_libs
         )
 
 set(util_srcs
-        ${MILVUS_ENGINE_SRC}/utils/easylogging++.cc
+        ${MILVUS_ENGINE_SRC}/external/easyloggingpp/easylogging++.cc
         ${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/helpers/FaissGpuResourceMgr.cpp
         ${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/helpers/FaissIO.cpp
         ${INDEX_SOURCE_DIR}/knowhere/knowhere/index/vector_index/helpers/IndexParameter.cpp

core/src/main.cpp

@@ -23,11 +23,11 @@
 #include <string>
 
 #include "../version.h"
+#include "external/easyloggingpp/easylogging++.h"
 #include "metrics/Metrics.h"
 #include "server/Server.h"
 #include "utils/CommonUtil.h"
 #include "utils/SignalUtil.h"
-#include "utils/easylogging++.h"
 
 INITIALIZE_EASYLOGGINGPP
 

core/src/utils/Log.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "utils/easylogging++.h"
+#include "external/easyloggingpp/easylogging++.h"
 
 namespace milvus {
 

core/src/utils/LogUtil.h

@@ -17,8 +17,8 @@
 
 #pragma once
 
+#include "external/easyloggingpp/easylogging++.h"
 #include "utils/Status.h"
-#include "utils/easylogging++.h"
 
 #include <sstream>
 #include <string>

core/unittest/CMakeLists.txt

@@ -60,6 +60,13 @@ set(scheduler_files
         ${scheduler_optimizer_files}
         )
 
+aux_source_directory(${MILVUS_ENGINE_SRC}/external/easyloggingpp external_easyloggingpp_files)
+aux_source_directory(${MILVUS_ENGINE_SRC}/external/nlohmann external_nlohmann_files)
+set(external_files
+        ${external_easyloggingpp_files}
+        ${external_nlohmann_files}
+        )
+
 aux_source_directory(${MILVUS_ENGINE_SRC}/server server_files)
 aux_source_directory(${MILVUS_ENGINE_SRC}/server/grpc_impl grpc_server_files)
 aux_source_directory(${MILVUS_ENGINE_SRC}/utils utils_files)
@@ -74,7 +81,7 @@ set(helper_files
         ${MILVUS_ENGINE_SRC}/utils/TimeRecorder.cpp
         ${MILVUS_ENGINE_SRC}/utils/Status.cpp
         ${MILVUS_ENGINE_SRC}/utils/ValidationUtil.cpp
-        ${MILVUS_ENGINE_SRC}/utils/easylogging++.cc
+        ${MILVUS_ENGINE_SRC}/external/easyloggingpp/easylogging++.cc
         )
 
 set(common_files
@@ -85,6 +92,7 @@ set(common_files
         ${db_insert_files}
         ${db_meta_files}
         ${metrics_files}
+        ${external_files}
         ${scheduler_files}
         ${wrapper_files}
         ${helper_files}

core/unittest/main.cpp

@@ -18,7 +18,7 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#include "utils/easylogging++.h"
+#include "external/easyloggingpp/easylogging++.h"
 
 INITIALIZE_EASYLOGGINGPP
 

core/unittest/wrapper/CMakeLists.txt

@@ -26,7 +26,7 @@ set(wrapper_files
 
 set(util_files
         utils.cpp
-        ${MILVUS_ENGINE_SRC}/utils/easylogging++.cc
+        ${MILVUS_ENGINE_SRC}/external/easyloggingpp/easylogging++.cc
         ${MILVUS_ENGINE_SRC}/utils/Status.cpp
         )
 

core/unittest/wrapper/test_wrapper.cpp

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "utils/easylogging++.h"
+#include "external/easyloggingpp/easylogging++.h"
 #include "wrapper/VecIndex.h"
 #include "knowhere/index/vector_index/helpers/FaissGpuResourceMgr.h"
 #include "knowhere/index/vector_index/helpers/IndexParameter.h"