jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* ./crlcore: 

- Bug: In Histogram::addSample(), reject the sample if iset is superior
        OR EQUAL to the sets size...
    - Change: In etc/mauka.conf, sets "mauka.standardAnnealing" to True. Otherwise,
        when hMetis (4-part) is not used, this leads toward very poor placements.
    - New: In UsersGuide, add a third style variant for the soc-extras site.
This commit is contained in:
Jean-Paul Chaput 2012-12-09 11:18:07 +00:00
parent b2340a4fe8
commit 08b7e3971f
7 changed files with 78 additions and 1924 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crlcore/doc/UsersGuide/HTML_defs.rst
View File

@ -48,6 +48,9 @@
.. |ControllerInspector_3| replace:: :raw-html:`<center><img src="./images/Controller-Inspector-3.png" alt="Controller Basic Snapshot"></center>` .. |ControllerInspector_3| replace:: :raw-html:`<center><img src="./images/Controller-Inspector-3.png" alt="Controller Basic Snapshot"></center>`
.. |ControllerSettings_1| replace:: :raw-html:`<center><img src="./images/Controller-Settings-1.png" alt="Controller Basic Snapshot"></center>` .. |ControllerSettings_1| replace:: :raw-html:`<center><img src="./images/Controller-Settings-1.png" alt="Controller Basic Snapshot"></center>`
.. |BigMouse| image:: ./images/ComputerMouse.png
:scale: 25%
.. Direct LaTeX commands encapsulation. .. Direct LaTeX commands encapsulation.
.. |dotfill| replace:: :raw-html:`&nbsp;&nbsp;` .. |dotfill| replace:: :raw-html:`&nbsp;&nbsp;`
.. |noindent| replace:: :raw-html:`<p class="empty"></p>` .. |noindent| replace:: :raw-html:`<p class="empty"></p>`

4
crlcore/doc/UsersGuide/LaTeX_defs.rst
View File

@ -50,8 +50,12 @@
.. |ControllerInspector_3| replace:: :raw-latex:`\begin{center}\includegraphics[width=.7\textwidth]{./images/Controller-Inspector-3.eps}\end{center}` .. |ControllerInspector_3| replace:: :raw-latex:`\begin{center}\includegraphics[width=.7\textwidth]{./images/Controller-Inspector-3.eps}\end{center}`
.. |ControllerSettings_1| replace:: :raw-latex:`\begin{center}\includegraphics[width=.7\textwidth]{./images/Controller-Settings-1.eps}\end{center}` .. |ControllerSettings_1| replace:: :raw-latex:`\begin{center}\includegraphics[width=.7\textwidth]{./images/Controller-Settings-1.eps}\end{center}`
.. |BigMouse| image:: ./images/ComputerMouse.png
:scale: 25%
.. Direct LaTeX commands encapsulation. .. Direct LaTeX commands encapsulation.
.. |dotfill| replace:: :raw-latex:`\dotfill` .. |dotfill| replace:: :raw-latex:`\dotfill`
.. |noindent| replace:: :raw-latex:`\noindent` .. |noindent| replace:: :raw-latex:`\noindent`
.. |medskip| replace:: :raw-latex:`\medskip` .. |medskip| replace:: :raw-latex:`\medskip`
.. |newpage| replace:: :raw-latex:`\newpage` .. |newpage| replace:: :raw-latex:`\newpage`

5
crlcore/doc/UsersGuide/UsersGuide.rst
View File

@ -109,9 +109,6 @@
.. |kgr| replace:: :cb:`kgr` .. |kgr| replace:: :cb:`kgr`
.. |dot_conf| replace:: :cb:`.conf` .. |dot_conf| replace:: :cb:`.conf`
.. |BigMouse| image:: ./images/ComputerMouse.png
:scale: 25%
===================== =====================
Coriolis User's Guide Coriolis User's Guide
@ -1106,5 +1103,5 @@ in the ``bootstrap`` source directory: ::
Use it like this: :: Use it like this: ::
dummy@lepka:~> eval `~/coriolis-2.x/src/bootstrap/coriolisEnv.py --v2 --python` dummy@lepka:~> eval `~/coriolis-2.x/src/bootstrap/coriolisEnv.py`

1906
crlcore/doc/UsersGuide/UsersGuide.tex
View File

File diff suppressed because it is too large Load Diff

64
crlcore/doc/UsersGuide/WWW_defs.rst Normal file
View File

@ -0,0 +1,64 @@
.. -*- Mode: rst -*-
.. This header contains the definitions needed for the UsersGuide.rst
.. document to be displayed correctly on the soc-extras website.
.. The only difference with HTML_defs.rst is that the images are
.. stored at a different URL on the website. Namely:
.. https://soc-extras.lip6.fr/media/filer/2012/12/07/
.. role:: raw-html(raw)
:format: html
.. For HTML backend
.. |Key_ESC| image:: https://soc-extras.lip6.fr/media/filer/2012/12/07/key_esc.png
.. |Key_CTRL| image:: https://soc-extras.lip6.fr/media/filer/2012/12/07/key_ctrl.png
.. |Key_Up| image:: https://soc-extras.lip6.fr/media/filer/2012/12/07/key_up.png
.. |Key_Down| image:: https://soc-extras.lip6.fr/media/filer/2012/12/07/key_down.png
.. |Key_Left| image:: https://soc-extras.lip6.fr/media/filer/2012/12/07/key_left.png
.. |Key_Right| image:: https://soc-extras.lip6.fr/media/filer/2012/12/07/key_right.png
.. |Key_f| image:: https://soc-extras.lip6.fr/media/filer/2012/12/07/key_f.png
.. |Key_G| image:: https://soc-extras.lip6.fr/media/filer/2012/12/07/key_gcap.png
.. |Key_i| image:: https://soc-extras.lip6.fr/media/filer/2012/12/07/key_icap.png
.. |Key_l| image:: https://soc-extras.lip6.fr/media/filer/2012/12/07/key_lcap.png
.. |Key_m| image:: https://soc-extras.lip6.fr/media/filer/2012/12/07/key_m.png
.. |Key_k| image:: https://soc-extras.lip6.fr/media/filer/2012/12/07/key_k.png
.. |Key_K| image:: https://soc-extras.lip6.fr/media/filer/2012/12/07/key_kcap.png
.. |Key_o| image:: https://soc-extras.lip6.fr/media/filer/2012/12/07/key_ocap.png
.. |Key_p| image:: https://soc-extras.lip6.fr/media/filer/2012/12/07/key_pcap.png
.. |Key_q| image:: https://soc-extras.lip6.fr/media/filer/2012/12/07/key_qcap.png
.. |Key_w| image:: https://soc-extras.lip6.fr/media/filer/2012/12/07/key_wcap.png
.. |Key_S| image:: https://soc-extras.lip6.fr/media/filer/2012/12/07/key_scap.png
.. |Key_z| image:: https://soc-extras.lip6.fr/media/filer/2012/12/07/key_z.png
.. |Plus| replace:: :raw-html:`+`
.. |rightarrow| replace:: :raw-html:`<p class="empty"></p>`
.. |menu_P&R| replace:: :raw-html:`<p class="empty"></p>`
.. |menu_StepByStep| replace:: :raw-html:`<p class="empty"></p>`
.. |menu_KiteSaveGlobalRouting| image:: https://soc-extras.lip6.fr/media/filer/2012/12/07/pr-sbs-saveglobal.png
.. |menu_KiteLoadGlobalRouting| image:: https://soc-extras.lip6.fr/media/filer/2012/12/07/pr-sbs-loadglobal.png
.. |menu_KiteGlobalRoute| image:: https://soc-extras.lip6.fr/media/filer/2012/12/07/pr-globalroute.png
.. |menu_KiteDetailedRoute| image:: https://soc-extras.lip6.fr/media/filer/2012/12/07/pr-detailedroute.png
.. |menu_KiteFinalizeRoute| image:: https://soc-extras.lip6.fr/media/filer/2012/12/07/pr-finalizeroute.png
.. Stand-alone images.
.. |ViewerSnapshot_1| replace:: :raw-html:`<center><img class="addborder" src="https://soc-extras.lip6.fr/media/filer/2012/12/07/viewer-1.png" alt="Viewer Basic Snapshot"></center>`
.. |ControllerSnapshot_1| replace:: :raw-html:`<center><img src="https://soc-extras.lip6.fr/media/filer/2012/12/07/controller-1.png" alt="Controller Basic Snapshot"></center>`
.. |ControllerLook_1| replace:: :raw-html:`<center><img src="https://soc-extras.lip6.fr/media/filer/2012/12/07/controller-look-1.png" alt="Controller Basic Snapshot"></center>`
.. |ControllerFilter_1| replace:: :raw-html:`<center><img src="https://soc-extras.lip6.fr/media/filer/2012/12/07/controller-filter-1.png" alt="Controller Basic Snapshot"></center>`
.. |ControllerLayersGos_1| replace:: :raw-html:`<center><img src="https://soc-extras.lip6.fr/media/filer/2012/12/07/controller-layersgos-1.png" alt="Controller Basic Snapshot"></center>`
.. |ControllerNetlist_1| replace:: :raw-html:`<center><img src="https://soc-extras.lip6.fr/media/filer/2012/12/07/controller-netlist-1.png" alt="Controller Basic Snapshot"></center>`
.. |ViewerNetlist_1| replace:: :raw-html:`<center><img src="https://soc-extras.lip6.fr/media/filer/2012/12/07/viewer-netlist-1.png" alt="Controller Basic Snapshot"></center>`
.. |ControllerSelection_1| replace:: :raw-html:`<center><img src="https://soc-extras.lip6.fr/media/filer/2012/12/07/controller-selection-1.png" alt="Controller Basic Snapshot"></center>`
.. |ControllerInspector_1| replace:: :raw-html:`<center><img src="https://soc-extras.lip6.fr/media/filer/2012/12/07/controller-inspector-1.png" alt="Controller Basic Snapshot"></center>`
.. |ControllerInspector_2| replace:: :raw-html:`<center><img src="https://soc-extras.lip6.fr/media/filer/2012/12/07/controller-inspector-2.png" alt="Controller Basic Snapshot"></center>`
.. |ControllerInspector_3| replace:: :raw-html:`<center><img src="https://soc-extras.lip6.fr/media/filer/2012/12/07/controller-inspector-3.png" alt="Controller Basic Snapshot"></center>`
.. |ControllerSettings_1| replace:: :raw-html:`<center><img src="https://soc-extras.lip6.fr/media/filer/2012/12/07/controller-settings-1.png" alt="Controller Basic Snapshot"></center>`
.. |BigMouse| image:: https://soc-extras.lip6.fr/media/filer/2012/12/07/computermouse.png
:scale: 25%
.. Direct LaTeX commands encapsulation.
.. |dotfill| replace:: :raw-html:`&nbsp;&nbsp;`
.. |noindent| replace:: :raw-html:`<p class="empty"></p>`
.. |medskip| replace:: :raw-html:`<br>`
.. |newpage| replace:: :raw-html:`<hr>`

2
crlcore/etc/mauka.conf
View File

@ -10,7 +10,7 @@ parametersTable = \
, ('mauka.insertFeeds' , TypeBool , True ) , ('mauka.insertFeeds' , TypeBool , True )
, ('mauka.plotBins' , TypeBool , True ) , ('mauka.plotBins' , TypeBool , True )
, ('mauka.searchRatio' , TypePercentage, 50 ) , ('mauka.searchRatio' , TypePercentage, 50 )
, ('mauka.standardAnnealing', TypeBool , False ) , ('mauka.standardAnnealing', TypeBool , True )
) )

18
crlcore/src/ccore/Histogram.cpp
View File

@ -2,14 +2,9 @@
// -*- C++ -*- // -*- C++ -*-
// //
// This file is part of the Coriolis Software. // This file is part of the Coriolis Software.
// Copyright (c) UPMC/LIP6 2008-2010, All Rights Reserved // Copyright (c) UPMC/LIP6 2008-2012, All Rights Reserved
// //
// =================================================================== // +-----------------------------------------------------------------+
//
// $Id$
//
// x-----------------------------------------------------------------x
// | |
// | C O R I O L I S | // | C O R I O L I S |
// | Alliance / Hurricane Interface | // | Alliance / Hurricane Interface |
// | | // | |
@ -17,10 +12,7 @@
// | E-mail : Jean-Paul.Chaput@asim.lip6.fr | // | E-mail : Jean-Paul.Chaput@asim.lip6.fr |
// | =============================================================== | // | =============================================================== |
// | C++ Module : "./Histogram.cpp" | // | C++ Module : "./Histogram.cpp" |
// | *************************************************************** | // +-----------------------------------------------------------------+
// | U p d a t e s |
// | |
// x-----------------------------------------------------------------x
#include <cmath> #include <cmath>
@ -69,10 +61,10 @@ namespace CRL {
void Histogram::addSample ( double sample, size_t iset ) void Histogram::addSample ( double sample, size_t iset )
{ {
if ( iset > _sets.size() ) return; if ( iset >= _sets.size() ) return;
size_t binIndex = (size_t)rint ( sample / _step ); size_t binIndex = (size_t)rint ( sample / _step );
if ( binIndex > _sets.front().size() ) binIndex = _sets.front().size() - 1; if ( binIndex >= _sets.front().size() ) binIndex = _sets.front().size() - 1;
_sets [iset][binIndex] += 1.0; _sets [iset][binIndex] += 1.0;
_totalSamples[iset]++; _totalSamples[iset]++;