<div dir="ltr">Thanks, Iulian. Yes, we can use branches/cgm12.2 and branches/cgm13.1 for nightly build and get rid of others. Can you try them tonight? and hopefully they should run well, there's not essential code changes besides the name changes.<div>
<br></div><div>Jane</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, Feb 5, 2014 at 10:44 AM, Grindeanu, Iulian R. <span dir="ltr"><<a href="mailto:iulian@mcs.anl.gov" target="_blank">iulian@mcs.anl.gov</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div>
<div style="direction:ltr;font-size:10pt;font-family:Tahoma">Hi Jane,<br>
Buildbot was using <br>
cgmurl = '<a href="https://svn.mcs.anl.gov/repos/ITAPS/cgm/branches/merge-cubit12.2" target="_blank">https://svn.mcs.anl.gov/repos/ITAPS/cgm/branches/merge-cubit12.2</a>'<br>
for 12.2<br>
Notice an extra .2 :(<br>
<br>
Should it use now branches/cgm12.2 ?<br>
Also, instead of cgmurlt1311 = '<a href="https://svn.mcs.anl.gov/repos/ITAPS/cgm/tags/13.1.1" target="_blank">https://svn.mcs.anl.gov/repos/ITAPS/cgm/tags/13.1.1</a>'<br>
should it use <br>
branches/cgm13.1 ?<br>
<br>
There were 10 failures last night because of missing urls :(<br>
<br>
Iulian<br>
<div style="font-size:16px;font-family:Times New Roman">
<hr>
<div style="direction:ltr"><font color="#000000" face="Tahoma"><b>From:</b> Jane Hu [<a href="mailto:janejhu@gmail.com" target="_blank">janejhu@gmail.com</a>]<br>
<b>Sent:</b> Wednesday, February 05, 2014 10:18 AM<br>
<b>To:</b> Grindeanu, Iulian R.<br>
<b>Cc:</b> Paul Wilson; Tautges, Timothy J.; Andrew Davis; <a href="mailto:cgma-dev@mcs.anl.gov" target="_blank">cgma-dev@mcs.anl.gov</a><div><div class="h5"><br>
<b>Subject:</b> Re: [cgma-dev] Cubit 14<br>
</div></div></font><br>
</div><div><div class="h5">
<div></div>
<div>
<div dir="ltr">
<div>Hi, All</div>
<div><br>
</div>
<div>I just made some changes according to email exchanges, please comment on if it's made the svn version of cgm system clearer. Keep in mind that it will be moved to git soon...</div>
<div><br>
</div>
<div>Based on popular request, the branches are kept for continued development while the tags are snapshot of releases. I changed in following directories :</div>
<div><br>
</div>
<div>Previous branch merge-cubit12 to branch cgm12.2, for continued enhancement development for version 12.2 or backport from above versions, if needed.</div>
<div><br>
</div>
<div>Previous tags/13.1.1 to branches/cgm13.1, overwriting previous branch cgm13.1, and removed previous branch merge-cubit13.1(not developping any more on this branch), for continued enhancement development of version 13.1 or backport from above versions,
if needed.</div>
<div><br>
</div>
<div>Tagged previous merge-cubit12 as tags/12.2.1, changed the version, minor and patch numbers accordingly in
<a href="http://configure.ac" target="_blank">configure.ac</a> and cgm_version.h.</div>
<div><br>
</div>
<div>Trunk as development branch for cgm14.0 remains unchanged.</div>
<div><br>
</div>
<div>For cgm repo. users, please download codes from following locations:</div>
<div>tags/12.2.1 for cgm12.2 stable releases;</div>
<div>tags/13.1.1 for cgm13.1 stable releases;</div>
<div>trunk for cgm14.0 development code;</div>
<div><br>
</div>
<div>Please do not use other repo locations to download cgm code since they may be outdated or unstable.</div>
<div><br>
</div>
<div>cgm_version.h was added in trunk development and backported to cgm12.2 and cgm13.1 to support MOAB version query needs, current MOAB is in stable state using version numbers defined in each location.</div>
<div><br>
</div>
<div>Hope it clarify the confusions, and go ahead, happy coding!</div>
<div><br>
</div>
<div>Jane </div>
<div><br>
</div>
<div><br>
</div>
<br>
</div>
<div class="gmail_extra"><br>
<br>
<div class="gmail_quote">On Tue, Feb 4, 2014 at 5:12 PM, Grindeanu, Iulian R. <span dir="ltr">
<<a href="mailto:iulian@mcs.anl.gov" target="_blank">iulian@mcs.anl.gov</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
OK, another source of confusion is in <a href="http://configure.ac" target="_blank">
configure.ac</a>;<br>
does the <a href="http://configure.ac" target="_blank">configure.ac</a> need to contain the version, minor, and patch numbers?<br>
If those would be correct (updated), then<br>
make dist<br>
would create a tarball with the right name (cgma-13.1.tar.gz, or 13.1.1, etc)<br>
<br>
should we remove the branches that are not active anymore?<br>
<div><br>
Iulian<br>
<br>
________________________________________<br>
From: Paul Wilson [<a href="mailto:wilsonp@engr.wisc.edu" target="_blank">wilsonp@engr.wisc.edu</a>]<br>
</div>
Sent: Tuesday, February 04, 2014 3:23 PM<br>
To: Tautges, Timothy J.; Grindeanu, Iulian R.; Andrew Davis; <a href="mailto:cgma-dev@mcs.anl.gov" target="_blank">
cgma-dev@mcs.anl.gov</a><br>
<div>
<div>Subject: Re: [cgma-dev] Cubit 14<br>
<br>
Hi all,<br>
<br>
Perhaps this sheds some light on the situation:<br>
<br>
wilsonp@TodlawXPS ~/UW/research/software/cgm > find branches tags -depth<br>
-maxdepth 1<br>
branches/cubit<br>
branches/cubit14.0<br>
branches/merge-cubit12.2<br>
branches/cgm13.1<br>
branches/Version12.2<br>
branches/merge-cubit13.1<br>
branches/dispatch<br>
branches/cubit13.1<br>
branches/merge-cubit12<br>
branches<br>
tags/12.2.0b1<br>
tags/13.1.0<br>
tags/cubit10.2<br>
tags/12.2.0<br>
tags/13.1.1<br>
tags<br>
wilsonp@TodlawXPS ~/UW/research/software/cgm > find . -name "cgm_version.h"<br>
./trunk/cgm_version.h<br>
./tags/13.1.0/cgm_version.h<br>
./tags/13.1.1/cgm_version.h<br>
./branches/merge-cubit12.2/cgm_version.h<br>
<br>
As you can see, there are many branches and tags, but only three of them<br>
plus the trunk have the cgm_version.h file.<br>
<br>
If I then search all the code for the use of CGM_MAJOR_VERSION, I get<br>
the following:<br>
<br>
trunk/cgm_version.h:1:#define CGM_MAJOR_VERSION 14<br>
tags/12.2.0b1/geom/GeometryQueryTool.hpp:1059: static const int<br>
CGM_MAJOR_VERSION;<br>
tags/12.2.0b1/geom/GeometryQueryTool.cpp:91:const int<br>
GeometryQueryTool::CGM_MAJOR_VERSION = 10;<br>
tags/13.1.0/cgm_version.h:1:#define CGM_MAJOR_VERSION 13<br>
tags/cubit10.2/geom/GeometryQueryTool.hpp:826: static const int<br>
CGM_MAJOR_VERSION;<br>
tags/cubit10.2/geom/GeometryQueryTool.cpp:81:const int<br>
GeometryQueryTool::CGM_MAJOR_VERSION = 10;<br>
tags/12.2.0/geom/GeometryQueryTool.hpp:1059: static const int<br>
CGM_MAJOR_VERSION;<br>
tags/12.2.0/geom/GeometryQueryTool.cpp:91:const int<br>
GeometryQueryTool::CGM_MAJOR_VERSION = 10;<br>
tags/13.1.1/cgm_version.h:1:#define CGM_MAJOR_VERSION 13<br>
branches/cubit/geom/GeometryQueryTool.hpp:1037: static const int<br>
CGM_MAJOR_VERSION;<br>
branches/cubit/geom/GeometryQueryTool.cpp:91:const int<br>
GeometryQueryTool::CGM_MAJOR_VERSION = 10;<br>
branches/cubit14.0/geom/GeometryQueryTool.hpp:1075: static const int<br>
CGM_MAJOR_VERSION;<br>
branches/cubit14.0/geom/GeometryQueryTool.cpp:96:const int<br>
GeometryQueryTool::CGM_MAJOR_VERSION = 13;<br>
branches/merge-cubit12.2/cgm_version.h:1:#define CGM_MAJOR_VERSION 12<br>
branches/cgm13.1/geom/GeometryQueryTool.hpp:1117: static const int<br>
CGM_MAJOR_VERSION;<br>
branches/cgm13.1/geom/GeometryQueryTool.cpp:95:const int<br>
GeometryQueryTool::CGM_MAJOR_VERSION = 13;<br>
branches/Version12.2/geom/GeometryQueryTool.hpp:1059: static const int<br>
CGM_MAJOR_VERSION;<br>
branches/Version12.2/geom/GeometryQueryTool.cpp:91:const int<br>
GeometryQueryTool::CGM_MAJOR_VERSION = 10;<br>
branches/merge-cubit13.1/geom/GeometryQueryTool.hpp:1077: static const<br>
int CGM_MAJOR_VERSION;<br>
branches/merge-cubit13.1/geom/GeometryQueryTool.cpp:95:const int<br>
GeometryQueryTool::CGM_MAJOR_VERSION = 13;<br>
branches/dispatch/geom/GeometryQueryTool.hpp:1059: static const int<br>
CGM_MAJOR_VERSION;<br>
branches/dispatch/geom/GeometryQueryTool.cpp:91:const int<br>
GeometryQueryTool::CGM_MAJOR_VERSION = 10;<br>
branches/cubit13.1/geom/GeometryQueryTool.hpp:1077: static const int<br>
CGM_MAJOR_VERSION;<br>
branches/cubit13.1/geom/GeometryQueryTool.cpp:95:const int<br>
GeometryQueryTool::CGM_MAJOR_VERSION = 10;<br>
branches/merge-cubit12/geom/GeometryQueryTool.hpp:1059: static const<br>
int CGM_MAJOR_VERSION;<br>
branches/merge-cubit12/geom/GeometryQueryTool.cpp:91:const int<br>
GeometryQueryTool::CGM_MAJOR_VERSION = 10;<br>
<br>
Note: this variable does not appear to be used within CGM, although<br>
there is probably some value in updating some of these locations that<br>
currently carry the wrong value.<br>
<br>
If I then search for CGM_MAJOR_VERSION in MOAB, I get:<br>
<br>
wilsonp@TodlawXPS ~/UW/research/software/moab (master) > ack-grep<br>
CGM_MAJOR_VERSION<br>
src/io/ReadCGM.cpp<br>
318:#if CGM_MAJOR_VERSION>13<br>
329:#if CGM_MAJOR_VERSION>13<br>
340:#if CGM_MAJOR_VERSION>13<br>
380:#if CGM_MAJOR_VERSION>13<br>
484:#if CGM_MAJOR_VERSION>12<br>
<br>
<br>
So... it appears we may be the primary (only?) users of this variable as<br>
the primary (only?) users of ReadCGM.<br>
<br>
It seems that this could be resolved by a combination of removing some<br>
outdated branches and backporting cgm_version.h into those branches that<br>
remain.<br>
<br>
Let us know how we can help?<br>
<br>
Paul<br>
<br>
<br>
On 01/29/2014 02:42 PM, Tim Tautges (ANL) wrote:<br>
> Jane's off this week on personal leave, so we probably won't hear from<br>
> her until next week.<br>
><br>
> But, keep in mind that a) ReadCGM is part of MOAB, so that's in the<br>
> mix too, and b) we can check for that file in the configure process<br>
> and set a cpp variable accordingly.<br>
><br>
> - tim<br>
><br>
> On 01/29/2014 09:49 AM, Grindeanu, Iulian R. wrote:<br>
>> Jane ? maybe there should be a better way of managing<br>
>> versions/branches/releases/tags?<br>
>> I can't answer any of those questions Andy and David have. I know<br>
>> that there is a plan to move cgm on bitbucket, but the<br>
>> releases/branches/tags will all be ported as they are now.<br>
>> Iulian<br>
>> _<br>
>> ______________________________________<br>
>> From: Andrew Davis [<a href="mailto:davisa@engr.wisc.edu" target="_blank">davisa@engr.wisc.edu</a>]<br>
>> Sent: Wednesday, January 29, 2014 9:27 AM<br>
>> To: Grindeanu, Iulian R.; Paul Wilson; <a href="mailto:cgma-dev@mcs.anl.gov" target="_blank">
cgma-dev@mcs.anl.gov</a><br>
>> Subject: Re: [cgma-dev] Cubit 14<br>
>><br>
>> Hi Iulian<br>
>><br>
>> cgmurl I can see, I doubt I have ever used it, why is there more than<br>
>> one for cubit12.2?<br>
>><br>
>> Also I was using 13.1 from branches (no cgm_version.h) , not 13.1.1<br>
>> from tags (which has cgm_version.h)<br>
>><br>
>> Out of curiosity, should there not be a 13.1.1 on branches? Perhaps now<br>
>> that 13.1 is out of date you could replace it with<br>
>> 13.1.1? Same for 12.2-merge?<br>
>><br>
>> Andy<br>
>><br>
>><br>
>> On 01/29/2014 09:19 AM, Grindeanu, Iulian R. wrote:<br>
>>> buildbot uses these:<br>
>>> cgmurl =<br>
>>> '<a href="https://svn.mcs.anl.gov/repos/ITAPS/cgm/branches/merge-cubit12.2" target="_blank">https://svn.mcs.anl.gov/repos/ITAPS/cgm/branches/merge-cubit12.2</a>'<br>
>>> for cubit 12.2<br>
>>><br>
>>> cgmurlt1311 = '<a href="https://svn.mcs.anl.gov/repos/ITAPS/cgm/tags/13.1.1" target="_blank">https://svn.mcs.anl.gov/repos/ITAPS/cgm/tags/13.1.1</a>'<br>
>>> for cubit 13.1<br>
>>><br>
>>> cgmurltrunk = '<a href="https://svn.mcs.anl.gov/repos/ITAPS/cgm/trunk" target="_blank">https://svn.mcs.anl.gov/repos/ITAPS/cgm/trunk</a>'<br>
>>> for Cubit14.0<br>
>>><br>
>>> What versions are you using?<br>
>>> What is not compiling for you?<br>
>>><br>
>>> Iulian<br>
>>> ________________________________________<br>
>>> From: Paul Wilson [<a href="mailto:wilsonp@engr.wisc.edu" target="_blank">wilsonp@engr.wisc.edu</a>]<br>
>>> Sent: Wednesday, January 29, 2014 9:15 AM<br>
>>> To: Andrew Davis; Grindeanu, Iulian R.; <a href="mailto:cgma-dev@mcs.anl.gov" target="_blank">
cgma-dev@mcs.anl.gov</a><br>
>>> Subject: Re: [cgma-dev] Cubit 14<br>
>>><br>
>>> Hi Andy,<br>
>>><br>
>>> Can you remind me of the specific symptom? Is it the existence of the<br>
>>> version file that needs to be backported (perhaps not), or is it the<br>
>>> use<br>
>>> of the version info to change the behavior that needs to be backported<br>
>>> (perhaps)?<br>
>>><br>
>>> Paul<br>
>>><br>
>>> On 01/29/2014 09:10 AM, Andrew Davis wrote:<br>
>>>> Hi Julian<br>
>>>><br>
>>>> The SVN<br>
>>>><br>
>>>> Andy<br>
>>>><br>
>>>><br>
>>>> On 01/29/2014 09:07 AM, Grindeanu, Iulian R. wrote:<br>
>>>>> I think that current branches (mergecubit12.2, trunk, ) all have that<br>
>>>>> file; at least buildbot is not complaining.<br>
>>>>> Are you using a release tar file or svn repo?<br>
>>>>> ________________________________________<br>
>>>>> From: <a href="mailto:cgma-dev-bounces@mcs.anl.gov" target="_blank">cgma-dev-bounces@mcs.anl.gov</a> [<a href="mailto:cgma-dev-bounces@mcs.anl.gov" target="_blank">cgma-dev-bounces@mcs.anl.gov</a>] on<br>
>>>>> behalf of Andrew Davis [<a href="mailto:davisa@engr.wisc.edu" target="_blank">davisa@engr.wisc.edu</a>]<br>
>>>>> Sent: Wednesday, January 29, 2014 9:05 AM<br>
>>>>> To: <a href="mailto:cgma-dev@mcs.anl.gov" target="_blank">cgma-dev@mcs.anl.gov</a><br>
>>>>> Subject: [cgma-dev] Cubit 14<br>
>>>>><br>
>>>>> This is question kind of linked to both CGM and MOAB<br>
>>>>><br>
>>>>> Jane fixed readCGM.cpp in MOAB, however this fix only works for CGM,<br>
>>>>> since it relies on cgm_version.h, which was included in CGM14.0,<br>
>>>>> however, when we compile with any version previous we do not have<br>
>>>>> this<br>
>>>>> header file availble to us. Would it be possible to back port the<br>
>>>>> cgm_version.h file back into previous CGM releases?<br>
>>>>><br>
>>>>> Thanks<br>
>>>>><br>
>>>>> Andy<br>
>>> --<br>
>>> -- ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ --<br>
>>> Paul Wilson ~ UW-Madison ~ <a href="tel:608-263-0807" value="+16082630807" target="_blank">
608-263-0807</a> ~ cal: <a href="http://bit.ly/pphw-cal" target="_blank">http://bit.ly/pphw-cal</a><br>
>>> Professor, Engineering Physics. ~ <a href="http://cnerg.engr.wisc.edu" target="_blank">
http://cnerg.engr.wisc.edu</a><br>
>>> Faculty Director, Advanced Computing Infrastructure<br>
>>><br>
>>><br>
>><br>
><br>
<br>
--<br>
-- ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ --<br>
Paul Wilson ~ UW-Madison ~ <a href="tel:608-263-0807" value="+16082630807" target="_blank">
608-263-0807</a> ~ cal: <a href="http://bit.ly/pphw-cal" target="_blank">http://bit.ly/pphw-cal</a><br>
Professor, Engineering Physics. ~ <a href="http://cnerg.engr.wisc.edu" target="_blank">
http://cnerg.engr.wisc.edu</a><br>
Faculty Director, Advanced Computing Infrastructure<br>
<br>
<br>
</div>
</div>
</blockquote>
</div>
<br>
<br clear="all">
<div><br>
</div>
-- <br>
Jane Hu<br>
<br>
Asst. Researcher<br>
Dept. of Engineering Physics<br>
UW @ Madison<br>
<br>
"And we know that for those who love God, that is, for those who are called according to his purpose, all things are working together for good." (Romans 8:28)
</div>
</div>
</div></div></div>
</div>
</div>
</blockquote></div><br><br clear="all"><div><br></div>-- <br>Jane Hu<br>
<br>
Asst. Researcher<br>
Dept. of Engineering Physics<br>
UW @ Madison<br>
<br>
"And we know that for those who love God, that is, for those who are
called according to his purpose, all things are working together for
good." (Romans 8:28)
</div>