deploy: 6262e24

mgonzs13 · Jan 7, 2025 · 2b3497b · 2b3497b
1 parent 145663c
commit 2b3497b
Show file tree

Hide file tree

Showing 21 changed files with 357 additions and 247 deletions.
diff --git a/classllama__ros_1_1Llama-members.html b/classllama__ros_1_1Llama-members.html
@@ -99,7 +99,7 @@
   <tr class="even"><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html#a89a870f8fa1c2eb0195f088371b2b6b0">canceled</a></td><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html">llama_ros::Llama</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr class="odd"><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html#addde254ae34b06491d56737b5dab5386">ctx</a></td><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html">llama_ros::Llama</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html#a15eca739cca843954ec299326a462305">detokenize</a>(const std::vector&lt; llama_token &gt; &amp;tokens)</td><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html">llama_ros::Llama</a></td><td class="entry"></td></tr>
-  <tr class="odd"><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html#ab41df18b60dc8bac07cc1ae306082f10">eval</a>(std::vector&lt; llama_token &gt; tokens)</td><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html">llama_ros::Llama</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+  <tr class="odd"><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html#ab41df18b60dc8bac07cc1ae306082f10">eval</a>(std::vector&lt; llama_token &gt; tokens)</td><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html">llama_ros::Llama</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html#a8a16e099f81537e166018abd08df63e3">eval</a>(struct llama_batch batch)</td><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html">llama_ros::Llama</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr class="odd"><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html#a9de8440b62c2e93c03a0453e6c8c2f3d">eval_prompt</a>()</td><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html">llama_ros::Llama</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html#a04b5be2cefb14b0e824d47ae432ea720">eval_prompt</a>(std::vector&lt; llama_token &gt; prompt_tokens)</td><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html">llama_ros::Llama</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
@@ -131,7 +131,7 @@
   <tr class="even"><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html#a69dd03523245603e633394d0cf06b98f">is_embedding</a>()</td><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html">llama_ros::Llama</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr class="odd"><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html#a9905e319a2c0311b5d700763de7d8d8c">is_reranking</a>()</td><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html">llama_ros::Llama</a></td><td class="entry"><span class="mlabel">inline</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html#aa17aaf9615a03f65ead934cd8a3c33e0">list_loras</a>()</td><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html">llama_ros::Llama</a></td><td class="entry"></td></tr>
-  <tr class="odd"><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html#a67b1d1838dc98f67c03051cc2067b290">Llama</a>(const struct common_params &amp;params, std::string system_prompt=&quot;&quot;)</td><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html">llama_ros::Llama</a></td><td class="entry"></td></tr>
+  <tr class="odd"><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html#a36707047a228c3a9278337b1426938c3">Llama</a>(const struct common_params &amp;params, std::string system_prompt=&quot;&quot;, bool initial_reset=true)</td><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html">llama_ros::Llama</a></td><td class="entry"></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html#a95ef3b0767bd529bc2471d0eb324354f">llama_init</a></td><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html">llama_ros::Llama</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr class="odd"><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html#a8ffa3d65b3a1ddea7e1708a25c8e4351">load_prompt</a>(const std::string &amp;input_prompt, bool add_pfx, bool add_sfx)</td><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html">llama_ros::Llama</a></td><td class="entry"><span class="mlabel">protected</span><span class="mlabel">virtual</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html#aeca933d968802d5ed9ae72a2add7b451">lora_adapters</a></td><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html">llama_ros::Llama</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
@@ -143,7 +143,7 @@
   <tr class="even"><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html#a92008039dc5f28e20f0b61c28227f760">prompt_tokens</a></td><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html">llama_ros::Llama</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr class="odd"><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html#af6b70809743fbde172c49c9e010e6b7d">rank_document</a>(const std::string &amp;query, const std::string &amp;document)</td><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html">llama_ros::Llama</a></td><td class="entry"></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html#a717d60308100ea029939f547c5093a18">rank_documents</a>(const std::string &amp;query, const std::vector&lt; std::string &gt; &amp;documents)</td><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html">llama_ros::Llama</a></td><td class="entry"></td></tr>
-  <tr class="odd"><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html#a7c2cd8a9a1361837e6f7661a4f63910c">reset</a>()</td><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html">llama_ros::Llama</a></td><td class="entry"></td></tr>
+  <tr class="odd"><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html#a7c2cd8a9a1361837e6f7661a4f63910c">reset</a>()</td><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html">llama_ros::Llama</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html#ae040dc64b2d2ebc48dd171e98a886ea3">sample</a>()</td><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html">llama_ros::Llama</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr class="odd"><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html#a59b039ec75e9acf845470d439d74b746">sampler</a></td><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html">llama_ros::Llama</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html#ac5758af17e629830eb7dad343115f93b">spinner</a></td><td class="entry"><a class="el" href="classllama__ros_1_1Llama.html">llama_ros::Llama</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>

diff --git a/classllama__ros_1_1Llama.html b/classllama__ros_1_1Llama.html
@@ -132,15 +132,15 @@
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a id="pub-methods" name="pub-methods"></a>
 Public Member Functions</h2></td></tr>
-<tr class="memitem:a67b1d1838dc98f67c03051cc2067b290" id="r_a67b1d1838dc98f67c03051cc2067b290"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#a67b1d1838dc98f67c03051cc2067b290">Llama</a> (const struct common_params &amp;<a class="el" href="#a9a44a3d01a7b27d7ec9bcdf7914a274a">params</a>, std::string <a class="el" href="#a2159f2355b8f059933f59d1138e1d3c2">system_prompt</a>=&quot;&quot;)</td></tr>
-<tr class="separator:a67b1d1838dc98f67c03051cc2067b290"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a36707047a228c3a9278337b1426938c3" id="r_a36707047a228c3a9278337b1426938c3"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#a36707047a228c3a9278337b1426938c3">Llama</a> (const struct common_params &amp;<a class="el" href="#a9a44a3d01a7b27d7ec9bcdf7914a274a">params</a>, std::string <a class="el" href="#a2159f2355b8f059933f59d1138e1d3c2">system_prompt</a>=&quot;&quot;, bool initial_reset=true)</td></tr>
+<tr class="separator:a36707047a228c3a9278337b1426938c3"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ac234b99451a4ab4ad2e0055b3d1d351b" id="r_ac234b99451a4ab4ad2e0055b3d1d351b"><td class="memItemLeft" align="right" valign="top">virtual&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ac234b99451a4ab4ad2e0055b3d1d351b">~Llama</a> ()</td></tr>
 <tr class="separator:ac234b99451a4ab4ad2e0055b3d1d351b"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a5a2ed6b1b03a1137f5f964336515f714" id="r_a5a2ed6b1b03a1137f5f964336515f714"><td class="memItemLeft" align="right" valign="top">std::vector&lt; llama_token &gt;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#a5a2ed6b1b03a1137f5f964336515f714">tokenize</a> (const std::string &amp;text, bool add_bos, bool special=false)</td></tr>
 <tr class="separator:a5a2ed6b1b03a1137f5f964336515f714"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a15eca739cca843954ec299326a462305" id="r_a15eca739cca843954ec299326a462305"><td class="memItemLeft" align="right" valign="top">std::string&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#a15eca739cca843954ec299326a462305">detokenize</a> (const std::vector&lt; llama_token &gt; &amp;tokens)</td></tr>
 <tr class="separator:a15eca739cca843954ec299326a462305"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a7c2cd8a9a1361837e6f7661a4f63910c" id="r_a7c2cd8a9a1361837e6f7661a4f63910c"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#a7c2cd8a9a1361837e6f7661a4f63910c">reset</a> ()</td></tr>
+<tr class="memitem:a7c2cd8a9a1361837e6f7661a4f63910c" id="r_a7c2cd8a9a1361837e6f7661a4f63910c"><td class="memItemLeft" align="right" valign="top">virtual void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#a7c2cd8a9a1361837e6f7661a4f63910c">reset</a> ()</td></tr>
 <tr class="separator:a7c2cd8a9a1361837e6f7661a4f63910c"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a666346d652a0d1de544bb7635eec6e8f" id="r_a666346d652a0d1de544bb7635eec6e8f"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#a666346d652a0d1de544bb7635eec6e8f">cancel</a> ()</td></tr>
 <tr class="separator:a666346d652a0d1de544bb7635eec6e8f"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -215,7 +215,7 @@
 <tr class="separator:a04b5be2cefb14b0e824d47ae432ea720"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ab7906765d40d424934998ea0b1245606" id="r_ab7906765d40d424934998ea0b1245606"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ab7906765d40d424934998ea0b1245606">eval_token</a> (llama_token token)</td></tr>
 <tr class="separator:ab7906765d40d424934998ea0b1245606"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ab41df18b60dc8bac07cc1ae306082f10" id="r_ab41df18b60dc8bac07cc1ae306082f10"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ab41df18b60dc8bac07cc1ae306082f10">eval</a> (std::vector&lt; llama_token &gt; tokens)</td></tr>
+<tr class="memitem:ab41df18b60dc8bac07cc1ae306082f10" id="r_ab41df18b60dc8bac07cc1ae306082f10"><td class="memItemLeft" align="right" valign="top">virtual bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ab41df18b60dc8bac07cc1ae306082f10">eval</a> (std::vector&lt; llama_token &gt; tokens)</td></tr>
 <tr class="separator:ab41df18b60dc8bac07cc1ae306082f10"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a8a16e099f81537e166018abd08df63e3" id="r_a8a16e099f81537e166018abd08df63e3"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#a8a16e099f81537e166018abd08df63e3">eval</a> (struct llama_batch batch)</td></tr>
 <tr class="separator:a8a16e099f81537e166018abd08df63e3"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -263,8 +263,8 @@
 <tr class="separator:a5f83cfac90c5e50b74f11f6dddb62f9f"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <h2 class="groupheader">Constructor &amp; Destructor Documentation</h2>
-<a id="a67b1d1838dc98f67c03051cc2067b290" name="a67b1d1838dc98f67c03051cc2067b290"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a67b1d1838dc98f67c03051cc2067b290">&#9670;&#160;</a></span>Llama()</h2>
+<a id="a36707047a228c3a9278337b1426938c3" name="a36707047a228c3a9278337b1426938c3"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#a36707047a228c3a9278337b1426938c3">&#9670;&#160;</a></span>Llama()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -277,7 +277,12 @@ <h2 class="memtitle"><span class="permalink"><a href="#a67b1d1838dc98f67c03051cc
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">std::string</td>          <td class="paramname"><span class="paramname"><em>system_prompt</em></span><span class="paramdefsep"> = </span><span class="paramdefval">&quot;&quot;</span>&#160;)</td>
+          <td class="paramtype">std::string</td>          <td class="paramname"><span class="paramname"><em>system_prompt</em></span><span class="paramdefsep"> = </span><span class="paramdefval">&quot;&quot;</span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">bool</td>          <td class="paramname"><span class="paramname"><em>initial_reset</em></span><span class="paramdefsep"> = </span><span class="paramdefval">true</span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
@@ -387,11 +392,13 @@ <h2 class="memtitle"><span class="permalink"><a href="#ab41df18b60dc8bac07cc1ae3
       </table>
   </td>
   <td class="mlabels-right">
-<span class="mlabels"><span class="mlabel protected">protected</span></span>  </td>
+<span class="mlabels"><span class="mlabel protected">protected</span><span class="mlabel virtual">virtual</span></span>  </td>
   </tr>
 </table>
 </div><div class="memdoc">
 
+<p>Reimplemented in <a class="el" href="classllava__ros_1_1Llava.html#a1629b8fcd0726b58467d7aee7687b849">llava_ros::Llava</a>.</p>
+
 </div>
 </div>
 <a id="a8a16e099f81537e166018abd08df63e3" name="a8a16e099f81537e166018abd08df63e3"></a>
@@ -1207,6 +1214,9 @@ <h2 class="memtitle"><span class="permalink"><a href="#a7c2cd8a9a1361837e6f7661a
 
 <div class="memitem">
 <div class="memproto">
+<table class="mlabels">
+  <tr>
+  <td class="mlabels-left">
       <table class="memname">
         <tr>
           <td class="memname">void Llama::reset </td>
@@ -1215,8 +1225,15 @@ <h2 class="memtitle"><span class="permalink"><a href="#a7c2cd8a9a1361837e6f7661a
           <td></td>
         </tr>
       </table>
+  </td>
+  <td class="mlabels-right">
+<span class="mlabels"><span class="mlabel virtual">virtual</span></span>  </td>
+  </tr>
+</table>
 </div><div class="memdoc">
 
+<p>Reimplemented in <a class="el" href="classllava__ros_1_1Llava.html#a5708e11372b049375bd981443d2d8ac9">llava_ros::Llava</a>.</p>
+
 </div>
 </div>
 <a id="ae040dc64b2d2ebc48dd171e98a886ea3" name="ae040dc64b2d2ebc48dd171e98a886ea3"></a>