update output_featuremaps_only to return_featuremaps

This commit is contained in:
KaiyangZhou 2019-08-05 14:04:14 +01:00
parent c8aae983c8
commit 5951726fb0
4 changed files with 8 additions and 8 deletions

View File

@ -491,11 +491,11 @@
<span class="c1"># forward to get convolutional feature maps</span>
<span class="k">try</span><span class="p">:</span>
<span class="n">outputs</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">model</span><span class="p">(</span><span class="n">imgs</span><span class="p">,</span> <span class="n">output_featuremaps_only</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span>
<span class="n">outputs</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">model</span><span class="p">(</span><span class="n">imgs</span><span class="p">,</span> <span class="n">return_featuremaps</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span>
<span class="k">except</span> <span class="ne">TypeError</span><span class="p">:</span>
<span class="k">raise</span> <span class="ne">TypeError</span><span class="p">(</span><span class="s1">&#39;forward() got unexpected keyword argument &quot;output_featuremaps_only&quot;. &#39;</span> \
<span class="s1">&#39;Please add output_featuremaps_only as an input argument to forward(). When &#39;</span> \
<span class="s1">&#39;output_featuremaps_only=True, return feature maps only.&#39;</span><span class="p">)</span>
<span class="k">raise</span> <span class="ne">TypeError</span><span class="p">(</span><span class="s1">&#39;forward() got unexpected keyword argument &quot;return_featuremaps&quot;. &#39;</span> \
<span class="s1">&#39;Please add return_featuremaps as an input argument to forward(). When &#39;</span> \
<span class="s1">&#39;return_featuremaps=True, return feature maps only.&#39;</span><span class="p">)</span>
<span class="k">if</span> <span class="n">outputs</span><span class="o">.</span><span class="n">dim</span><span class="p">()</span> <span class="o">!=</span> <span class="mi">4</span><span class="p">:</span>
<span class="k">raise</span> <span class="ne">ValueError</span><span class="p">(</span><span class="s1">&#39;The model output is supposed to have &#39;</span> \

View File

@ -459,9 +459,9 @@
<span class="n">x</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">conv5</span><span class="p">(</span><span class="n">x</span><span class="p">)</span>
<span class="k">return</span> <span class="n">x</span>
<span class="k">def</span> <span class="nf">forward</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">x</span><span class="p">,</span> <span class="n">output_featuremaps_only</span><span class="o">=</span><span class="kc">False</span><span class="p">):</span>
<span class="k">def</span> <span class="nf">forward</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">x</span><span class="p">,</span> <span class="n">return_featuremaps</span><span class="o">=</span><span class="kc">False</span><span class="p">):</span>
<span class="n">x</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">featuremaps</span><span class="p">(</span><span class="n">x</span><span class="p">)</span>
<span class="k">if</span> <span class="n">output_featuremaps_only</span><span class="p">:</span>
<span class="k">if</span> <span class="n">return_featuremaps</span><span class="p">:</span>
<span class="k">return</span> <span class="n">x</span>
<span class="n">v</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">global_avgpool</span><span class="p">(</span><span class="n">x</span><span class="p">)</span>
<span class="n">v</span> <span class="o">=</span> <span class="n">v</span><span class="o">.</span><span class="n">view</span><span class="p">(</span><span class="n">v</span><span class="o">.</span><span class="n">size</span><span class="p">(</span><span class="mi">0</span><span class="p">),</span> <span class="o">-</span><span class="mi">1</span><span class="p">)</span>

View File

@ -274,7 +274,7 @@ but not a must. Please refer to the source code for more details.</p>
<dl class="method">
<dt id="torchreid.engine.engine.Engine.visactmap">
<code class="descname">visactmap</code><span class="sig-paren">(</span><em>testloader</em>, <em>save_dir</em>, <em>width</em>, <em>height</em>, <em>print_freq</em><span class="sig-paren">)</span><a class="reference internal" href="../_modules/torchreid/engine/engine.html#Engine.visactmap"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#torchreid.engine.engine.Engine.visactmap" title="Permalink to this definition"></a></dt>
<code class="descname">visactmap</code><span class="sig-paren">(</span><em>**kwargs</em><span class="sig-paren">)</span><a class="reference internal" href="../_modules/torchreid/engine/engine.html#Engine.visactmap"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#torchreid.engine.engine.Engine.visactmap" title="Permalink to this definition"></a></dt>
<dd><p>Visualizes CNN activation maps to see where the CNN focuses on to extract features.</p>
<p>This function takes as input the query images of target datasets</p>
<dl class="docutils">

File diff suppressed because one or more lines are too long