Permalink
Browse files

Merge branch 'release/0.2.3'

  • Loading branch information...
2 parents 4ec82cf + e42119b commit 780f016ec8ba0bcd02afb23fdfeb098de469ba78 @suma suma committed Jun 8, 2012
Showing with 1,294 additions and 1,015 deletions.
  1. +47 −36 README.rst
  2. +1 −1 src/classifier/arow.cpp
  3. +1 −1 src/classifier/arow.hpp
  4. +1 −1 src/classifier/classifier.hpp
  5. +1 −1 src/classifier/classifier_base.cpp
  6. +1 −1 src/classifier/classifier_base.hpp
  7. +1 −1 src/classifier/classifier_factory.cpp
  8. +1 −1 src/classifier/classifier_factory.hpp
  9. +1 −1 src/classifier/classifier_performance_test.cpp
  10. +1 −1 src/classifier/classifier_test.cpp
  11. +1 −1 src/classifier/classifier_test_util.hpp
  12. +1 −1 src/classifier/classifier_type.hpp
  13. +1 −1 src/classifier/classifier_util.hpp
  14. +1 −1 src/classifier/cw.cpp
  15. +1 −1 src/classifier/cw.hpp
  16. +1 −1 src/classifier/nherd.cpp
  17. +1 −1 src/classifier/nherd.hpp
  18. +1 −1 src/classifier/pa.cpp
  19. +1 −1 src/classifier/pa.hpp
  20. +1 −1 src/classifier/pa1.cpp
  21. +1 −1 src/classifier/pa1.hpp
  22. +1 −1 src/classifier/pa2.cpp
  23. +1 −1 src/classifier/pa2.hpp
  24. +1 −1 src/classifier/perceptron.cpp
  25. +1 −1 src/classifier/perceptron.hpp
  26. +1 −1 src/cmd/jubaconv.cpp
  27. +3 −18 src/cmd/jubactl.cpp
  28. +1 −1 src/cmd/wscript
  29. +1 −1 src/common/cached_zk.cpp
  30. +1 −1 src/common/cached_zk.hpp
  31. +1 −1 src/common/cached_zk_test.cpp
  32. +1 −1 src/common/cht.cpp
  33. +1 −1 src/common/cht.hpp
  34. +1 −1 src/common/cht_test.cpp
  35. +4 −2 src/common/exception.hpp
  36. +1 −1 src/common/hash.hpp
  37. +1 −1 src/common/key_manager.cpp
  38. +1 −1 src/common/key_manager.hpp
  39. +1 −1 src/common/key_manager_test.cpp
  40. +1 −1 src/common/lock_service.cpp
  41. +1 −1 src/common/lock_service.hpp
  42. +1 −1 src/common/membership.cpp
  43. +1 −1 src/common/membership.hpp
  44. +1 −1 src/common/membership_test.cpp
  45. +16 −25 src/common/mprpc/async_client.cpp
  46. +17 −12 src/common/mprpc/async_client.hpp
  47. +131 −80 src/common/mprpc/rpc_client.cpp
  48. +58 −31 src/common/mprpc/rpc_client.hpp
  49. +82 −15 src/common/mprpc/rpc_client_test.cpp
  50. +1 −1 src/common/mprpc/wscript
  51. +1 −1 src/common/rpc_util.hpp
  52. +1 −1 src/common/shared_ptr.hpp
  53. +1 −1 src/common/type.hpp
  54. +1 −1 src/common/unordered_map.hpp
  55. +35 −1 src/common/util.cpp
  56. +2 −1 src/common/util.hpp
  57. +9 −1 src/common/util_test.cpp
  58. +1 −1 src/common/vector_util.cpp
  59. +1 −1 src/common/vector_util.hpp
  60. +1 −1 src/common/wscript
  61. +1 −1 src/common/zk.cpp
  62. +1 −1 src/common/zk.hpp
  63. +1 −1 src/common/zk_test.cpp
  64. +1 −1 src/framework.hpp
  65. +1 −1 src/framework/aggregators.hpp
  66. +235 −213 src/framework/jubatus_serv.cpp
  67. +4 −1 src/framework/jubatus_serv.hpp
  68. +1 −1 src/framework/keeper.cpp
  69. +2 −2 src/framework/keeper.hpp
  70. +1 −1 src/framework/mixable.hpp
  71. +1 −1 src/framework/mixer.cpp
  72. +1 −1 src/framework/mixer.hpp
  73. +11 −4 src/framework/server_util.cpp
  74. +5 −1 src/framework/server_util.hpp
  75. +1 −1 src/framework/wscript
  76. +1 −1 src/fv_converter/character_ngram.cpp
  77. +1 −1 src/fv_converter/character_ngram.hpp
  78. +1 −1 src/fv_converter/character_ngram_test.cpp
  79. +2 −1 src/fv_converter/converter_config.cpp
  80. +1 −1 src/fv_converter/converter_config.hpp
  81. +1 −1 src/fv_converter/converter_config_test.cpp
  82. +1 −1 src/fv_converter/counter.hpp
  83. +1 −1 src/fv_converter/counter_test.cpp
  84. +1 −1 src/fv_converter/datum.hpp
  85. +1 −1 src/fv_converter/datum_to_fv_converter.cpp
  86. +1 −1 src/fv_converter/datum_to_fv_converter.hpp
  87. +1 −1 src/fv_converter/datum_to_fv_converter_test.cpp
  88. +1 −1 src/fv_converter/dynamic_load.cpp
  89. +1 −1 src/fv_converter/dynamic_loader.cpp
  90. +1 −1 src/fv_converter/dynamic_loader.hpp
  91. +1 −1 src/fv_converter/dynamic_loader_test.cpp
  92. +1 −1 src/fv_converter/dynamic_num_feature.cpp
  93. +1 −1 src/fv_converter/dynamic_num_feature.hpp
  94. +1 −1 src/fv_converter/dynamic_num_feature_test.cpp
  95. +1 −1 src/fv_converter/dynamic_num_filter.cpp
  96. +1 −1 src/fv_converter/dynamic_num_filter.hpp
  97. +1 −1 src/fv_converter/dynamic_num_filter_test.cpp
  98. +1 −1 src/fv_converter/dynamic_splitter.cpp
  99. +1 −1 src/fv_converter/dynamic_splitter.hpp
  100. +1 −1 src/fv_converter/dynamic_splitter_test.cpp
  101. +1 −1 src/fv_converter/dynamic_string_filter.cpp
  102. +1 −1 src/fv_converter/dynamic_string_filter.hpp
  103. +1 −1 src/fv_converter/dynamic_string_filter_test.cpp
  104. +1 −1 src/fv_converter/exact_match.hpp
  105. +1 −1 src/fv_converter/exception.hpp
  106. +1 −1 src/fv_converter/json_converter.cpp
  107. +1 −1 src/fv_converter/json_converter.hpp
  108. +1 −1 src/fv_converter/json_converter_test.cpp
  109. +1 −1 src/fv_converter/key_matcher.hpp
  110. +1 −1 src/fv_converter/key_matcher_factory.cpp
  111. +1 −1 src/fv_converter/key_matcher_factory.hpp
  112. +1 −1 src/fv_converter/key_matcher_factory_test.cpp
  113. +1 −1 src/fv_converter/key_matcher_test.cpp
  114. +1 −1 src/fv_converter/keyword_weights.cpp
  115. +1 −1 src/fv_converter/keyword_weights.hpp
  116. +1 −1 src/fv_converter/libsvm_converter.cpp
  117. +1 −1 src/fv_converter/libsvm_converter.hpp
  118. +1 −1 src/fv_converter/libsvm_converter_test.cpp
  119. +1 −1 src/fv_converter/match_all.hpp
  120. +1 −1 src/fv_converter/msgpack_converter.cpp
  121. +1 −1 src/fv_converter/msgpack_converter.hpp
  122. +1 −1 src/fv_converter/msgpack_converter_test.cpp
  123. +1 −1 src/fv_converter/num_feature.hpp
  124. +1 −1 src/fv_converter/num_feature_factory.cpp
  125. +1 −1 src/fv_converter/num_feature_factory.hpp
  126. +1 −1 src/fv_converter/num_feature_factory_test.cpp
  127. +1 −1 src/fv_converter/num_feature_impl.hpp
  128. +1 −1 src/fv_converter/num_filter.hpp
  129. +1 −1 src/fv_converter/num_filter_factory.cpp
  130. +1 −1 src/fv_converter/num_filter_factory.hpp
  131. +1 −1 src/fv_converter/num_filter_factory_test.cpp
  132. +1 −1 src/fv_converter/num_filter_impl.hpp
  133. +1 −1 src/fv_converter/num_filter_impl_test.cpp
  134. +1 −1 src/fv_converter/prefix_match.hpp
  135. +1 −1 src/fv_converter/re2_filter.cpp
  136. +1 −1 src/fv_converter/re2_filter.hpp
  137. +1 −1 src/fv_converter/re2_filter_test.cpp
  138. +1 −1 src/fv_converter/re2_match.cpp
  139. +1 −1 src/fv_converter/re2_match.hpp
  140. +1 −1 src/fv_converter/re2_match_test.cpp
  141. +1 −1 src/fv_converter/revert.cpp
  142. +1 −1 src/fv_converter/revert.hpp
  143. +1 −1 src/fv_converter/space_splitter.cpp
  144. +1 −1 src/fv_converter/space_splitter.hpp
  145. +1 −1 src/fv_converter/space_splitter_test.cpp
  146. +1 −1 src/fv_converter/splitter_factory.cpp
  147. +1 −1 src/fv_converter/splitter_factory.hpp
  148. +1 −1 src/fv_converter/splitter_factory_test.cpp
  149. +1 −1 src/fv_converter/string_filter.hpp
  150. +1 −1 src/fv_converter/string_filter_factory.cpp
  151. +1 −1 src/fv_converter/string_filter_factory.hpp
  152. +1 −1 src/fv_converter/string_filter_factory_test.cpp
  153. +1 −1 src/fv_converter/string_splitter.hpp
  154. +1 −1 src/fv_converter/suffix_match.hpp
  155. +1 −1 src/fv_converter/test_num_feature.cpp
  156. +1 −1 src/fv_converter/test_num_filter.cpp
  157. +1 −1 src/fv_converter/test_splitter.cpp
  158. +1 −1 src/fv_converter/test_string_filter.cpp
  159. +1 −1 src/fv_converter/test_util.hpp
  160. +1 −1 src/fv_converter/util.cpp
  161. +1 −1 src/fv_converter/util.hpp
  162. +1 −1 src/fv_converter/weight_manager.cpp
  163. +1 −1 src/fv_converter/weight_manager.hpp
  164. +1 −1 src/fv_converter/without_split.cpp
  165. +1 −1 src/fv_converter/without_split.hpp
  166. +1 −1 src/fv_converter/word_splitter.hpp
  167. +1 −1 src/jubatus.hpp
  168. +10 −39 src/jubavisor/jubavisor.cpp
  169. +1 −1 src/jubavisor/jubavisor.hpp
  170. +1 −1 src/jubavisor/jubavisor_test.cpp
  171. +1 −1 src/jubavisor/main.cpp
  172. +16 −34 src/jubavisor/process.cpp
  173. +3 −5 src/jubavisor/process.hpp
  174. +2 −2 src/jubavisor/wscript
  175. +1 −1 src/plugin.hpp
  176. +1 −1 src/plugin/fv_converter/mecab_splitter.cpp
  177. +1 −1 src/plugin/fv_converter/mecab_splitter.hpp
  178. +1 −1 src/plugin/fv_converter/mecab_splitter_test.cpp
  179. +5 −16 src/plugin/fv_converter/re2_splitter.cpp
  180. +2 −3 src/plugin/fv_converter/re2_splitter.hpp
  181. +5 −10 src/plugin/fv_converter/re2_splitter_test.cpp
  182. +1 −1 src/plugin/fv_converter/ux_splitter.cpp
  183. +1 −1 src/plugin/fv_converter/ux_splitter.hpp
  184. +1 −1 src/plugin/fv_converter/ux_splitter_test.cpp
  185. +1 −1 src/recommender/inverted_index.cpp
  186. +1 −1 src/recommender/inverted_index.hpp
  187. +3 −3 src/recommender/lsh.cpp
  188. +1 −1 src/recommender/lsh.hpp
  189. +5 −7 src/recommender/lsh_util.cpp
  190. +2 −2 src/recommender/lsh_util.hpp
  191. +3 −3 src/recommender/lsh_util_test.cpp
  192. +1 −1 src/recommender/recommender.hpp
  193. +1 −1 src/recommender/recommender_base.cpp
  194. +1 −1 src/recommender/recommender_base.hpp
  195. +1 −1 src/recommender/recommender_factory.cpp
  196. +1 −1 src/recommender/recommender_factory.hpp
  197. +1 −1 src/recommender/recommender_test.cpp
  198. +1 −1 src/recommender/recommender_type.hpp
  199. +1 −1 src/regression/pa.cpp
  200. +1 −1 src/regression/pa.hpp
  201. +1 −1 src/regression/regression.hpp
  202. +1 −1 src/regression/regression_base.cpp
  203. +1 −1 src/regression/regression_base.hpp
  204. +1 −1 src/regression/regression_factory.cpp
  205. +1 −1 src/regression/regression_factory.hpp
  206. +1 −1 src/regression/regression_test_util.hpp
  207. +1 −1 src/server/classifier.idl
  208. +6 −7 src/server/classifier_serv.cpp
  209. +1 −1 src/server/classifier_serv.hpp
  210. +101 −4 src/server/classifier_test.cpp
  211. +1 −1 src/server/diffv.hpp
  212. +1 −1 src/server/mixable_weight_manager.hpp
  213. +1 −1 src/server/recommender.idl
  214. +1 −1 src/server/recommender_serv.cpp
  215. +1 −1 src/server/recommender_serv.hpp
  216. +1 −1 src/server/regression.idl
  217. +1 −1 src/server/regression_serv.cpp
  218. +1 −1 src/server/regression_serv.hpp
  219. +1 −1 src/server/regression_test.cpp
  220. +1 −1 src/server/stat.idl
  221. +1 −1 src/server/stat_serv.cpp
  222. +1 −1 src/server/stat_serv.hpp
  223. +1 −1 src/server/stat_test.cpp
  224. +4 −6 src/server/test_util.hpp
  225. +1 −1 src/stat/stat.cpp
  226. +1 −1 src/stat/stat.hpp
  227. +3 −1 src/storage/bit_index_storage.cpp
  228. +1 −1 src/storage/bit_index_storage.hpp
  229. +4 −1 src/storage/bit_index_storage_test.cpp
  230. +3 −2 src/storage/bit_vector.cpp
  231. +1 −1 src/storage/bit_vector.hpp
  232. +13 −0 src/storage/bit_vector_test.cpp
  233. +1 −1 src/storage/fixed_size_heap.hpp
  234. +1 −1 src/storage/index_storage.hpp
  235. +1 −1 src/storage/inverted_index_storage.cpp
  236. +1 −1 src/storage/inverted_index_storage.hpp
  237. +1 −1 src/storage/local_storage.cpp
  238. +1 −1 src/storage/local_storage.hpp
  239. +1 −1 src/storage/local_storage_mixture.cpp
  240. +1 −1 src/storage/local_storage_mixture.hpp
  241. +1 −1 src/storage/local_storage_mixture_test.cpp
  242. +1 −1 src/storage/norm.hpp
  243. +1 −1 src/storage/norm_base.hpp
  244. +1 −1 src/storage/norm_factory.cpp
  245. +1 −1 src/storage/norm_factory.hpp
  246. +1 −1 src/storage/norm_l1.cpp
  247. +1 −1 src/storage/norm_l1.hpp
  248. +1 −1 src/storage/norm_l2.cpp
  249. +1 −1 src/storage/norm_l2.hpp
  250. +1 −1 src/storage/norm_none.cpp
  251. +1 −1 src/storage/norm_none.hpp
  252. +1 −1 src/storage/recommender_storage.hpp
  253. +1 −1 src/storage/recommender_storage_base.hpp
  254. +1 −1 src/storage/sparse_matrix_storage.cpp
  255. +1 −1 src/storage/sparse_matrix_storage.hpp
  256. +1 −1 src/storage/storage_base.cpp
  257. +1 −1 src/storage/storage_base.hpp
  258. +1 −1 src/storage/storage_factory.cpp
  259. +1 −1 src/storage/storage_factory.hpp
  260. +1 −1 src/storage/storage_factory_test.cpp
  261. +1 −1 src/storage/storage_test.cpp
  262. +1 −1 src/storage/storage_type.hpp
  263. +4 −4 tools/generator/OMakefile
  264. +31 −30 tools/generator/generator.ml
  265. +1 −1 tools/generator/jdl_lexer.mll
  266. +35 −34 tools/generator/jdl_parser.mly
  267. +23 −15 tools/generator/jubatus_idl.ml
  268. +22 −21 tools/generator/stree.ml
  269. +70 −68 tools/generator/util.ml
  270. +22 −19 tools/generator/validator.ml
  271. +6 −7 wscript
View
@@ -6,77 +6,88 @@ The Jubatus library is a online machine learning framework which runs in distrib
See http://jubat.us for details.
LICENSE
-=======
+-------
LGPL 2.1
Update history
-==============
+--------------
-Release 0.2.2 2012/4/6
-======================
+Release 0.2.3 2012/6/8
+~~~~~~~~~~~~~~~~~~~~~~~
Improvements
+ - Asynchronous call to multiple servers at once, both keeper and mix - common/mprpc
+ - Refactor generator
+ - Error message improve
+ - Timeout in unittest expanded
+
+Bugfix
+ - jubactl doesn't work ver 0.2 and later #13
+ - jubavisor doesn't work on daemon mode #5
+ - Asynchronous mprpc client critical bug
+ - #47, #50, #34, #36, #37, #31, #19, and other small bugfix
+
+Release 0.2.2 2012/4/6
+~~~~~~~~~~~~~~~~~~~~~~
-- Simpler interfaces at classifier, regression and recommender
+Improvements
+ - Simpler interfaces at classifier, regression and recommender
- - Clients are *NOT COMPATIBLE* with previous releases
+ - Clients are *NOT COMPATIBLE* with previous releases
-- Now mix works concurrently in multiple threads (except tf-idf counting)
-- Asynchronous RPC to multiple servers at once
-- Add --version option
-- Interface description language changed from C++-like to Annotated MessagePack-IDL
-- Minor error handling
-- A bit more tested than previous releases
+ - Now mix works concurrently in multiple threads (except tf-idf counting)
+ - Asynchronous RPC to multiple servers at once
+ - Add --version option
+ - Interface description language changed from C++-like to Annotated MessagePack-IDL
+ - Minor error handling
+ - A bit more tested than previous releases
Bugfix
-
- - #30, #29, #22
+ - #30, #29, #22
Release 0.2.1 2012/3/13
------------------------
+~~~~~~~~~~~~~~~~~~~~~~~
Bugfix release: #28
Release 0.2.0 2012/2/16
------------------------
+~~~~~~~~~~~~~~~~~~~~~~~
New Features
+ - recommender
-- recommender
+ - support fast similar item search, real-time update, distributed data management
+ - inverted index : exact result, fast search
+ - locality sensitive hash : approximate result, fast search, small working space
- - support fast similar item search, real-time update, distributed data management
- - inverted index : exact result, fast search
- - locality sensitive hash : approximate result, fast search, small working space
+ - regression
-- regression
+ - online SVR using passive agressive algorithm
+ - as fast as current classifier
- - online SVR using passive agressive algorithm
- - as fast as current classifier
+ - stat
-- stat
+ - a Key(string)-Value(queue<double>)
+ - O(1) cost of getting sum, standard deviation, max, min, statistic moments for each queue
- - a Key(string)-Value(queue<double>)
- - O(1) cost of getting sum, standard deviation, max, min, statistic moments for each queue
+ - server framework
-- server framework
-
- - less-tightly coupled distributed processing framework with each ML implementation
- - idl & code generator - make it easy to write own jubatus system
- - removed public release of client libraries (so easy to generate!)
- - multiple mix - mutiple data objects can be mixed in one jubatus system
+ - less-tightly coupled distributed processing framework with each ML implementation
+ - idl & code generator - make it easy to write own jubatus system
+ - removed public release of client libraries (so easy to generate!)
+ - multiple mix - mutiple data objects can be mixed in one jubatus system
Bugfix
-
- - duplicate key entry in fv_converter breaks the parameter
+ - duplicate key entry in fv_converter breaks the parameter
Release 0.1.1 2011/11/15
-------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~
Bugfix release
Release 0.1.0 2011/10/26
-------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~
Hello Jubatus!
View
@@ -1,5 +1,5 @@
// Jubatus: Online machine learning framework for distributed environment
-// Copyright (C) 2011 Preferred Infrastracture and Nippon Telegraph and Telephone Corporation.
+// Copyright (C) 2011 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
View
@@ -1,5 +1,5 @@
// Jubatus: Online machine learning framework for distributed environment
-// Copyright (C) 2011 Preferred Infrastracture and Nippon Telegraph and Telephone Corporation.
+// Copyright (C) 2011 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@ -1,5 +1,5 @@
// Jubatus: Online machine learning framework for distributed environment
-// Copyright (C) 2011 Preferred Infrastracture and Nippon Telegraph and Telephone Corporation.
+// Copyright (C) 2011 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@ -1,5 +1,5 @@
// Jubatus: Online machine learning framework for distributed environment
-// Copyright (C) 2011 Preferred Infrastracture and Nippon Telegraph and Telephone Corporation.
+// Copyright (C) 2011 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@ -1,5 +1,5 @@
// Jubatus: Online machine learning framework for distributed environment
-// Copyright (C) 2011 Preferred Infrastracture and Nippon Telegraph and Telephone Corporation.
+// Copyright (C) 2011 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@ -1,5 +1,5 @@
// Jubatus: Online machine learning framework for distributed environment
-// Copyright (C) 2011 Preferred Infrastracture and Nippon Telegraph and Telephone Corporation.
+// Copyright (C) 2011 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@ -1,5 +1,5 @@
// Jubatus: Online machine learning framework for distributed environment
-// Copyright (C) 2011 Preferred Infrastracture and Nippon Telegraph and Telephone Corporation.
+// Copyright (C) 2011 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@ -1,5 +1,5 @@
// Jubatus: Online machine learning framework for distributed environment
-// Copyright (C) 2011 Preferred Infrastracture and Nippon Telegraph and Telephone Corporation.
+// Copyright (C) 2011 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@ -1,5 +1,5 @@
// Jubatus: Online machine learning framework for distributed environment
-// Copyright (C) 2011 Preferred Infrastracture and Nippon Telegraph and Telephone Corporation.
+// Copyright (C) 2011 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@ -1,5 +1,5 @@
// Jubatus: Online machine learning framework for distributed environment
-// Copyright (C) 2011 Preferred Infrastracture and Nippon Telegraph and Telephone Corporation.
+// Copyright (C) 2011 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@ -1,5 +1,5 @@
// Jubatus: Online machine learning framework for distributed environment
-// Copyright (C) 2011 Preferred Infrastracture and Nippon Telegraph and Telephone Corporation.
+// Copyright (C) 2011 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@ -1,5 +1,5 @@
// Jubatus: Online machine learning framework for distributed environment
-// Copyright (C) 2011 Preferred Infrastracture and Nippon Telegraph and Telephone Corporation.
+// Copyright (C) 2011 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
View
@@ -1,5 +1,5 @@
// Jubatus: Online machine learning framework for distributed environment
-// Copyright (C) 2011 Preferred Infrastracture and Nippon Telegraph and Telephone Corporation.
+// Copyright (C) 2011 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
View
@@ -1,5 +1,5 @@
// Jubatus: Online machine learning framework for distributed environment
-// Copyright (C) 2011 Preferred Infrastracture and Nippon Telegraph and Telephone Corporation.
+// Copyright (C) 2011 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
View
@@ -1,5 +1,5 @@
// Jubatus: Online machine learning framework for distributed environment
-// Copyright (C) 2011 Preferred Infrastracture and Nippon Telegraph and Telephone Corporation.
+// Copyright (C) 2011 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
View
@@ -1,5 +1,5 @@
// Jubatus: Online machine learning framework for distributed environment
-// Copyright (C) 2011 Preferred Infrastracture and Nippon Telegraph and Telephone Corporation.
+// Copyright (C) 2011 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
View
@@ -1,5 +1,5 @@
// Jubatus: Online machine learning framework for distributed environment
-// Copyright (C) 2011 Preferred Infrastracture and Nippon Telegraph and Telephone Corporation.
+// Copyright (C) 2011 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
View
@@ -1,5 +1,5 @@
// Jubatus: Online machine learning framework for distributed environment
-// Copyright (C) 2011 Preferred Infrastracture and Nippon Telegraph and Telephone Corporation.
+// Copyright (C) 2011 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
View
@@ -1,5 +1,5 @@
// Jubatus: Online machine learning framework for distributed environment
-// Copyright (C) 2011 Preferred Infrastracture and Nippon Telegraph and Telephone Corporation.
+// Copyright (C) 2011 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
View
@@ -1,5 +1,5 @@
// Jubatus: Online machine learning framework for distributed environment
-// Copyright (C) 2011 Preferred Infrastracture and Nippon Telegraph and Telephone Corporation.
+// Copyright (C) 2011 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
View
@@ -1,5 +1,5 @@
// Jubatus: Online machine learning framework for distributed environment
-// Copyright (C) 2011 Preferred Infrastracture and Nippon Telegraph and Telephone Corporation.
+// Copyright (C) 2011 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
View
@@ -1,5 +1,5 @@
// Jubatus: Online machine learning framework for distributed environment
-// Copyright (C) 2011 Preferred Infrastracture and Nippon Telegraph and Telephone Corporation.
+// Copyright (C) 2011 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@ -1,5 +1,5 @@
// Jubatus: Online machine learning framework for distributed environment
-// Copyright (C) 2011 Preferred Infrastracture and Nippon Telegraph and Telephone Corporation.
+// Copyright (C) 2011 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@ -1,5 +1,5 @@
// Jubatus: Online machine learning framework for distributed environment
-// Copyright (C) 2011 Preferred Infrastracture and Nippon Telegraph and Telephone Corporation.
+// Copyright (C) 2011 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
View
@@ -1,5 +1,5 @@
// Jubatus: Online machine learning framework for distributed environment
-// Copyright (C) 2011 Preferred Infrastracture and Nippon Telegraph and Telephone Corporation.
+// Copyright (C) 2011 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
View
@@ -1,5 +1,5 @@
// Jubatus: Online machine learning framework for distributed environment
-// Copyright (C) 2011 Preferred Infrastracture and Nippon Telegraph and Telephone Corporation.
+// Copyright (C) 2011 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@ -43,9 +43,8 @@ void status(const string&, const string&);
int main(int args, char** argv){
cmdline::parser p;
p.add<std::string>("cmd", 'c', "command to send servers(start|stop|save|load)", true);
- p.add<std::string>("type", 't', "learning machine type", true);
+ p.add<std::string>("server", 's', "server exec file of learning machine (jubaclassifier, ...)", true);
p.add<std::string>("name", 'n', "learning machine name", true);
- p.add<std::string>("storage", 's', "storage type (available in classifier)", false);
p.add<unsigned int>("num", 'N', "num of process in the whole cluster (one on each server when 0)", false);
p.add<std::string>("zookeeper", 'z', "ZooKeeper location environment: 'ZK' is available instead", false);
p.add("debug", 'd', "debug mode");
@@ -56,12 +55,7 @@ int main(int args, char** argv){
}
string cmd = p.get<std::string>("cmd");
- string name = p.get<std::string>("type") + "/" + p.get<std::string>("name");
-
- if(p.get<std::string>("storage").size() > 0){
- name += "/";
- name += p.get<std::string>("storage");
- }
+ string name = p.get<std::string>("server") + "/" + p.get<std::string>("name");
unsigned int N = p.get<unsigned int>("num");
@@ -85,15 +79,6 @@ int main(int args, char** argv){
return 0;
}
- // a bit mess
- if(p.get<std::string>("type") == "classifier" &&
- (p.get<std::string>("storage") == "local" || p.get<std::string>("storage") == "") &&
- cmd == "start" &&
- N != 1 ){
- cout << "standalone mode with multiple instances(N=" << N << ") is not available from " << PROGNAME << endl;
- exit(1);
- }
-
if(cmd == "start" or cmd == "stop"){
send2supervisor(cmd, name, zk, N);
}else if(cmd == "save" or cmd == "load"){ //or set_config?
View
@@ -9,7 +9,7 @@ def build(bld):
source = 'jubactl.cpp',
target = 'jubactl',
includes = '.',
- use = 'MSGPACK PFICOMMON GLOG ZOOKEEPER_MT jubacommon'
+ use = 'MSGPACK PFICOMMON LIBGLOG ZOOKEEPER_MT jubacommon'
)
bld.program(
View
@@ -1,5 +1,5 @@
// Jubatus: Online machine learning framework for distributed environment
-// Copyright (C) 2011 Preferred Infrastracture and Nippon Telegraph and Telephone Corporation.
+// Copyright (C) 2011 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
View
@@ -1,5 +1,5 @@
// Jubatus: Online machine learning framework for distributed environment
-// Copyright (C) 2011 Preferred Infrastracture and Nippon Telegraph and Telephone Corporation.
+// Copyright (C) 2011 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@ -1,5 +1,5 @@
// Jubatus: Online machine learning framework for distributed environment
-// Copyright (C) 2011 Preferred Infrastracture and Nippon Telegraph and Telephone Corporation.
+// Copyright (C) 2011 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
View
@@ -1,5 +1,5 @@
// Jubatus: Online machine learning framework for distributed environment
-// Copyright (C) 2011 Preferred Infrastracture and Nippon Telegraph and Telephone Corporation.
+// Copyright (C) 2011 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
View
@@ -1,5 +1,5 @@
// Jubatus: Online machine learning framework for distributed environment
-// Copyright (C) 2011 Preferred Infrastracture and Nippon Telegraph and Telephone Corporation.
+// Copyright (C) 2011 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
View
@@ -1,5 +1,5 @@
// Jubatus: Online machine learning framework for distributed environment
-// Copyright (C) 2011 Preferred Infrastracture and Nippon Telegraph and Telephone Corporation.
+// Copyright (C) 2011 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Oops, something went wrong.

0 comments on commit 780f016

Please sign in to comment.