Merge branch 'gpu_index' into 'release-v1.1'

Gpu index

See merge request megasearch/vecwise_engine!30

Former-commit-id: 0c6ac3654b7db91870414870afcd63d54762992f

.gitignore

@@ -11,7 +11,3 @@ cmake_build
 *.lo
 *.tar.gz
 *.log
-
-cpp/third_party/thrift-0.12.0/
-cpp/third_party/faiss-1.5.1
-cpp/megasearch/

cpp/.gitignore

+third_party/thrift-0.12.0/
+third_party/faiss-1.5.1/
+third_party/bzip2-1.0.6/
+third_party/sqlite3/
+megasearch/
+conf/server_config.yaml

cpp/conf/server_config.yaml

 server_config:
   address: 0.0.0.0
   port: 33001
-  transfer_protocol: json   #optional: binary, compact, json, debug
+  transfer_protocol: json     #optional: binary, compact, json, debug
   server_mode: thread_pool    #optional: simple, thread_pool
+  gpu_index: 0                #which gpu to be used
 
 db_config:
   db_path: /tmp/vecwise
   db_backend_url: http://127.0.0.1
-  db_flush_interval: 5   #unit: second
+  db_flush_interval: 5              #unit: second
   idmapper_max_open_file: 128
 
 license_config:
-  license_path: "/home/jinhai/Documents/development/vecwise_engine/license/system.license"
-
-log_config:
-  global:
-    format: "%datetime | %level | %logger | %msg"
-    filename: "/tmp/vecwise/logs/vecwise_engine-%datetime{%h:%m}-global.log"
-    enabled: true
-    to_file: true
-    to_standard_output: true
-    subsecond_precision: 3
-    performance_tracking: false
-    max_log_file_size: 2097152  # throw log files away after 2mb
-  debug:
-    filename: "/tmp/vecwise/logs/vecwise_engine-%datetime{%h:%m}-debug.log"
-    enabled: true
-  warning:
-    filename: "/tmp/vecwise/logs/vecwise_engine-%datetime{%h:%m}-warning.log"
-  trace:
-    filename: "/tmp/vecwise/logs/vecwise_engine-%datetime{%h:%m}-trace.log"
-  verbose:
-    format: "%datetime{%d/%m/%y} | %level-%vlevel | %msg"
-    to_file: false
-    to_standard_output: true
-  error:
-    enabled: false
-    filename: "/tmp/vecwise/logs/vecwise_engine-%datetime{%h:%m}-error.log"
-  fatal:
-    enabled: false
-    filename: "/tmp/vecwise/logs/vecwise_engine-%datetime{%h:%m}-fatal.log"
+  license_path: "/tmp/system.license"
 
 cache_config:
     cpu_cache_capacity: 16   # unit: GB

cpp/conf/server_config_template.yaml

+server_config:
+  address: 0.0.0.0
+  port: 33001
+  transfer_protocol: json     #optional: binary, compact, json, debug
+  server_mode: thread_pool    #optional: simple, thread_pool
+  gpu_index: 0                #which gpu to be used
+
+db_config:
+  db_path: /tmp/vecwise
+  db_backend_url: http://127.0.0.1
+  db_flush_interval: 5              #unit: second
+  idmapper_max_open_file: 128
+
+license_config:
+  license_path: "/tmp/system.license"
+
+cache_config:
+    cpu_cache_capacity: 16   # unit: GB
+    gpu_cache_capacity:  2   # unit: GB
\ No newline at end of file

cpp/src/CMakeLists.txt

@@ -123,6 +123,7 @@ if (ENABLE_LICENSE STREQUAL "ON")
         add_executable(get_sys_info ${get_sys_info_src})
         target_link_libraries(get_sys_info ${license_libs} vecwise_license)
         target_link_libraries(license_generator ${license_libs})
+        install(TARGETS get_sys_info DESTINATION bin)
 endif ()
 
 install(TARGETS vecwise_server DESTINATION bin)
\ No newline at end of file