Menu
▾
▴
ggnfs-commits — CVS commits announces
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(11) |
Jul
(43) |
Aug
(688) |
Sep
(96) |
Oct
(18) |
Nov
(17) |
Dec
(16) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
|
Feb
(18) |
Mar
(29) |
Apr
|
May
(23) |
Jun
(11) |
Jul
(46) |
Aug
(9) |
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2007 |
Jan
(2) |
Feb
|
Mar
(3) |
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(19) |
| 2008 |
Jan
(2) |
Feb
|
Mar
(1) |
Apr
(1) |
May
(1) |
Jun
(3) |
Jul
|
Aug
(1) |
Sep
(3) |
Oct
(2) |
Nov
(2) |
Dec
(5) |
| 2009 |
Jan
(8) |
Feb
(3) |
Mar
(4) |
Apr
(17) |
May
|
Jun
(1) |
Jul
(1) |
Aug
(3) |
Sep
(2) |
Oct
(2) |
Nov
(12) |
Dec
(1) |
| 2010 |
Jan
(1) |
Feb
|
Mar
(1) |
Apr
(1) |
May
(6) |
Jun
(3) |
Jul
(2) |
Aug
|
Sep
(1) |
Oct
(2) |
Nov
|
Dec
|
| 2011 |
Jan
(6) |
Feb
(6) |
Mar
(1) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(8) |
Nov
(1) |
Dec
(1) |
| 2012 |
Jan
|
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
(9) |
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <Ba...@us...> - 2011-10-12 02:21:07
|
Revision: 416
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=416&view=rev
Author: Batalov
Date: 2011-10-12 02:21:00 +0000 (Wed, 12 Oct 2011)
Log Message:
-----------
better estimates for min. number of relations
Modified Paths:
--------------
trunk/tests/factMsieve.pl
Modified: trunk/tests/factMsieve.pl
===================================================================
--- trunk/tests/factMsieve.pl 2011-10-11 15:04:42 UTC (rev 415)
+++ trunk/tests/factMsieve.pl 2011-10-12 02:21:00 UTC (rev 416)
@@ -1349,8 +1349,14 @@
# The below is approx. 0.2*(pi(LPBA) + pi(LPBR)).
# It's so small because, for small LPBA, it really overestimates.
- $MINRELS=int(0.2*1.442695*( (2**$LPBA)/$LPBA + (2**$LPBR)/$LPBR));
-
+ $MINRELS=int(0.35*1.442695*( (2**$LPBA)/$LPBA + (2**$LPBR)/$LPBR));
+ if($LPBA==$LPBR) { # some simple heuristics, fudge=0.35 above
+ $MINRELS= 4000000 if($LPBA==26); # fudge = 0.54
+ $MINRELS= 9000000 if($LPBA==27); # fudge = 0.63
+ $MINRELS=19000000 if($LPBA==28); # fudge = 0.69
+ $MINRELS=46000000 if($LPBA==29); # fudge = 0.84
+ $MINRELS=92000000 if($LPBA==30); # fudge = 0.89
+ }
############################################
# Setup the parameters for sieving ranges. #
############################################
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <brg...@us...> - 2011-10-11 15:04:53
|
Revision: 415
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=415&view=rev
Author: brgladman
Date: 2011-10-11 15:04:42 +0000 (Tue, 11 Oct 2011)
Log Message:
-----------
Improve Visual Studio 2010 build
Modified Paths:
--------------
trunk/build.vc10/ggnfslib/ggnfslib.vcxproj
trunk/build.vc10/ggnfslib/ggnfslib.vcxproj.filters
trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj
trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj.filters
trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj
trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj.filters
trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj
trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj.filters
trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj
trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj.filters
trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj
trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj.filters
trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj
trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj.filters
trunk/build.vc10/makefb/makefb.vcxproj
trunk/build.vc10/makefb/makefb.vcxproj.filters
trunk/build.vc10/matbuild/matbuild.vcxproj
trunk/build.vc10/matbuild/matbuild.vcxproj.filters
trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj
trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj.filters
trunk/build.vc10/matprune/matprune.vcxproj
trunk/build.vc10/matprune/matprune.vcxproj.filters
trunk/build.vc10/matsolve/matsolve.vcxproj
trunk/build.vc10/matsolve/matsolve.vcxproj.filters
trunk/build.vc10/pol51m0b/pol51m0b.vcxproj
trunk/build.vc10/pol51m0b/pol51m0b.vcxproj.filters
trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj
trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj.filters
trunk/build.vc10/pol51m0n/pol51m0n.vcxproj
trunk/build.vc10/pol51m0n/pol51m0n.vcxproj.filters
trunk/build.vc10/pol51opt/pol51opt.vcxproj
trunk/build.vc10/pol51opt/pol51opt.vcxproj.filters
trunk/build.vc10/pol51optx/pol51optx.vcxproj
trunk/build.vc10/pol51optx/pol51optx.vcxproj.filters
trunk/build.vc10/polyselect/polyselect.vcxproj
trunk/build.vc10/polyselect/polyselect.vcxproj.filters
trunk/build.vc10/procrels/procrels.vcxproj
trunk/build.vc10/procrels/procrels.vcxproj.filters
trunk/build.vc10/sieve/sieve.vcxproj
trunk/build.vc10/sieve/sieve.vcxproj.filters
trunk/build.vc10/sqrt/sqrt.vcxproj
trunk/build.vc10/sqrt/sqrt.vcxproj.filters
Modified: trunk/build.vc10/ggnfslib/ggnfslib.vcxproj
===================================================================
--- trunk/build.vc10/ggnfslib/ggnfslib.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/ggnfslib/ggnfslib.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -253,16 +253,25 @@
<ClCompile Include="..\..\src\squfof.c" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\..\..\include\ggnfs.h" />
- <ClInclude Include="..\..\..\include\prand.h" />
- <ClInclude Include="..\..\..\include\version.h" />
- </ItemGroup>
- <ItemGroup>
<YASM Include="..\mulmod32.asm">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</YASM>
</ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\config.h" />
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\prand.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ <ClInclude Include="..\..\src\if.h" />
+ <ClInclude Include="..\..\src\lasieve4\asm\32bit.h" />
+ <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h" />
+ <ClInclude Include="..\..\src\lasieve4\lasieve.h" />
+ <ClInclude Include="..\fnmatch.h" />
+ <ClInclude Include="..\getopt.h" />
+ <ClInclude Include="..\unistd.h" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\vsyasm.targets" />
Modified: trunk/build.vc10/ggnfslib/ggnfslib.vcxproj.filters
===================================================================
--- trunk/build.vc10/ggnfslib/ggnfslib.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/ggnfslib/ggnfslib.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -79,19 +79,46 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\..\..\include\ggnfs.h">
+ <YASM Include="..\mulmod32.asm">
+ <Filter>Assembler Files</Filter>
+ </YASM>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\include\ggnfs.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\include\prand.h">
+ <ClInclude Include="..\..\include\prand.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\include\version.h">
+ <ClInclude Include="..\..\include\version.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\asm\32bit.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\fnmatch.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\if.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\unistd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\lasieve.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
- <ItemGroup>
- <YASM Include="..\mulmod32.asm">
- <Filter>Assembler Files</Filter>
- </YASM>
- </ItemGroup>
</Project>
\ No newline at end of file
Modified: trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -334,9 +334,19 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\version.h" />
<ClInclude Include="..\..\src\if.h" />
+ <ClInclude Include="..\..\src\lasieve4\asm\32bit.h" />
+ <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h" />
<ClInclude Include="..\..\src\lasieve4\lasieve.h" />
<ClInclude Include="..\..\src\lasieve4\piii\siever-config.h" />
+ <ClInclude Include="..\..\src\lasieve4\ppc32\32bit.h" />
+ <ClInclude Include="..\..\src\lasieve4\ppc32\siever-config.h" />
+ <ClInclude Include="..\fnmatch.h" />
+ <ClInclude Include="..\getopt.h" />
+ <ClInclude Include="..\unistd.h" />
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm">
Modified: trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj.filters
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -89,6 +89,36 @@
<ClInclude Include="..\..\src\lasieve4\piii\siever-config.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\ppc32\32bit.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\unistd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\asm\32bit.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\fnmatch.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\ppc32\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm">
Modified: trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -334,9 +334,19 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\version.h" />
<ClInclude Include="..\..\src\if.h" />
+ <ClInclude Include="..\..\src\lasieve4\asm\32bit.h" />
+ <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h" />
<ClInclude Include="..\..\src\lasieve4\lasieve.h" />
<ClInclude Include="..\..\src\lasieve4\piii\siever-config.h" />
+ <ClInclude Include="..\..\src\lasieve4\ppc32\32bit.h" />
+ <ClInclude Include="..\..\src\lasieve4\ppc32\siever-config.h" />
+ <ClInclude Include="..\fnmatch.h" />
+ <ClInclude Include="..\getopt.h" />
+ <ClInclude Include="..\unistd.h" />
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm">
Modified: trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj.filters
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -89,6 +89,36 @@
<ClInclude Include="..\..\src\lasieve4\lasieve.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\asm\32bit.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\unistd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\ppc32\32bit.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\fnmatch.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\ppc32\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm">
Modified: trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -298,10 +298,21 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ <ClInclude Include="..\..\src\if.h" />
+ <ClInclude Include="..\..\src\lasieve4\asm\32bit.h" />
+ <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h" />
<ClInclude Include="..\..\src\lasieve4\generic\32bit.h" />
<ClInclude Include="..\..\if.h" />
<ClInclude Include="..\..\src\lasieve4\lasieve.h" />
<ClInclude Include="..\..\src\lasieve4\piii\siever-config.h" />
+ <ClInclude Include="..\..\src\lasieve4\ppc32\32bit.h" />
+ <ClInclude Include="..\..\src\lasieve4\ppc32\siever-config.h" />
+ <ClInclude Include="..\fnmatch.h" />
+ <ClInclude Include="..\getopt.h" />
+ <ClInclude Include="..\unistd.h" />
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm">
Modified: trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj.filters
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -92,6 +92,39 @@
<ClInclude Include="..\..\src\lasieve4\generic\32bit.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\ppc32\32bit.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\unistd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\asm\32bit.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\fnmatch.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\if.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\ppc32\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm">
Modified: trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -298,10 +298,21 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ <ClInclude Include="..\..\src\if.h" />
+ <ClInclude Include="..\..\src\lasieve4\asm\32bit.h" />
+ <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h" />
<ClInclude Include="..\..\src\lasieve4\generic\32bit.h" />
<ClInclude Include="..\..\if.h" />
<ClInclude Include="..\..\src\lasieve4\lasieve.h" />
<ClInclude Include="..\..\src\lasieve4\piii\siever-config.h" />
+ <ClInclude Include="..\..\src\lasieve4\ppc32\32bit.h" />
+ <ClInclude Include="..\..\src\lasieve4\ppc32\siever-config.h" />
+ <ClInclude Include="..\fnmatch.h" />
+ <ClInclude Include="..\getopt.h" />
+ <ClInclude Include="..\unistd.h" />
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm">
Modified: trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj.filters
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -92,6 +92,39 @@
<ClInclude Include="..\..\src\lasieve4\piii\siever-config.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\ppc32\32bit.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\unistd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\asm\32bit.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\fnmatch.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\if.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\ppc32\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm">
Modified: trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -298,10 +298,21 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ <ClInclude Include="..\..\src\if.h" />
+ <ClInclude Include="..\..\src\lasieve4\asm\32bit.h" />
+ <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h" />
<ClInclude Include="..\..\src\lasieve4\generic\32bit.h" />
<ClInclude Include="..\..\if.h" />
<ClInclude Include="..\..\src\lasieve4\lasieve.h" />
<ClInclude Include="..\..\src\lasieve4\piii\siever-config.h" />
+ <ClInclude Include="..\..\src\lasieve4\ppc32\32bit.h" />
+ <ClInclude Include="..\..\src\lasieve4\ppc32\siever-config.h" />
+ <ClInclude Include="..\fnmatch.h" />
+ <ClInclude Include="..\getopt.h" />
+ <ClInclude Include="..\unistd.h" />
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm">
Modified: trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj.filters
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -92,6 +92,39 @@
<ClInclude Include="..\..\src\lasieve4\piii\siever-config.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\ppc32\32bit.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\unistd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\asm\32bit.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\fnmatch.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\if.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\ppc32\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm">
Modified: trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -303,10 +303,21 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ <ClInclude Include="..\..\src\if.h" />
+ <ClInclude Include="..\..\src\lasieve4\asm\32bit.h" />
+ <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h" />
<ClInclude Include="..\..\src\lasieve4\generic\32bit.h" />
<ClInclude Include="..\..\if.h" />
<ClInclude Include="..\..\src\lasieve4\lasieve.h" />
<ClInclude Include="..\..\src\lasieve4\piii\siever-config.h" />
+ <ClInclude Include="..\..\src\lasieve4\ppc32\32bit.h" />
+ <ClInclude Include="..\..\src\lasieve4\ppc32\siever-config.h" />
+ <ClInclude Include="..\fnmatch.h" />
+ <ClInclude Include="..\getopt.h" />
+ <ClInclude Include="..\unistd.h" />
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm">
Modified: trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj.filters
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -92,6 +92,39 @@
<ClInclude Include="..\..\src\lasieve4\piii\siever-config.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\ppc32\32bit.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\unistd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\asm\32bit.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\fnmatch.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\if.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\ppc32\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm">
Modified: trunk/build.vc10/makefb/makefb.vcxproj
===================================================================
--- trunk/build.vc10/makefb/makefb.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/makefb/makefb.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -212,6 +212,11 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\vsyasm.targets" />
Modified: trunk/build.vc10/makefb/makefb.vcxproj.filters
===================================================================
--- trunk/build.vc10/makefb/makefb.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/makefb/makefb.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -18,4 +18,15 @@
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project>
\ No newline at end of file
Modified: trunk/build.vc10/matbuild/matbuild.vcxproj
===================================================================
--- trunk/build.vc10/matbuild/matbuild.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/matbuild/matbuild.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -218,8 +218,16 @@
<ClCompile Include="..\..\src\rellist.c" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\limits.h" />
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\prand.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ <ClInclude Include="..\..\src\if.h" />
<ClInclude Include="..\..\src\intutils.h" />
<ClInclude Include="..\..\src\rellist.h" />
+ <ClInclude Include="..\getopt.h" />
+ <ClInclude Include="..\unistd.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ggnfslib\ggnfslib.vcxproj">
Modified: trunk/build.vc10/matbuild/matbuild.vcxproj.filters
===================================================================
--- trunk/build.vc10/matbuild/matbuild.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/matbuild/matbuild.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -46,5 +46,29 @@
<ClInclude Include="..\..\src\rellist.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\if.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\limits.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\prand.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\unistd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
Modified: trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj
===================================================================
--- trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -221,8 +221,26 @@
<ClCompile Include="..\..\src\rellist.c" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\ammintrin.h" />
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\emmintrin.h" />
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\immintrin.h" />
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\mm3dnow.h" />
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\mmintrin.h" />
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\nmmintrin.h" />
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\pmmintrin.h" />
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\smmintrin.h" />
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\tmmintrin.h" />
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\prand.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ <ClInclude Include="..\..\src\experimental\app_config.h" />
+ <ClInclude Include="..\..\src\experimental\llist_tpie.h" />
+ <ClInclude Include="..\..\src\if.h" />
<ClInclude Include="..\..\src\intutils.h" />
<ClInclude Include="..\..\src\rellist.h" />
+ <ClInclude Include="..\getopt.h" />
+ <ClInclude Include="..\unistd.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ggnfslib\ggnfslib.vcxproj">
Modified: trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj.filters
===================================================================
--- trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -49,5 +49,59 @@
<ClInclude Include="..\..\src\rellist.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\experimental\app_config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\if.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\ammintrin.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\emmintrin.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\immintrin.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\experimental\llist_tpie.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\nmmintrin.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\pmmintrin.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\prand.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\unistd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\mm3dnow.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\mmintrin.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\smmintrin.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\tmmintrin.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
Modified: trunk/build.vc10/matprune/matprune.vcxproj
===================================================================
--- trunk/build.vc10/matprune/matprune.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/matprune/matprune.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -213,6 +213,8 @@
<ClCompile Include="..\..\src\misc.c" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
<ClInclude Include="..\..\src\intutils.h" />
<ClInclude Include="..\..\src\rellist.h" />
</ItemGroup>
Modified: trunk/build.vc10/matprune/matprune.vcxproj.filters
===================================================================
--- trunk/build.vc10/matprune/matprune.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/matprune/matprune.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -31,5 +31,11 @@
<ClInclude Include="..\..\src\rellist.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
Modified: trunk/build.vc10/matsolve/matsolve.vcxproj
===================================================================
--- trunk/build.vc10/matsolve/matsolve.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/matsolve/matsolve.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -221,6 +221,15 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\prand.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ <ClInclude Include="..\..\src\if.h" />
+ <ClInclude Include="..\getopt.h" />
+ <ClInclude Include="..\unistd.h" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\vsyasm.targets" />
Modified: trunk/build.vc10/matsolve/matsolve.vcxproj.filters
===================================================================
--- trunk/build.vc10/matsolve/matsolve.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/matsolve/matsolve.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -27,4 +27,27 @@
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\if.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\prand.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\unistd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project>
\ No newline at end of file
Modified: trunk/build.vc10/pol51m0b/pol51m0b.vcxproj
===================================================================
--- trunk/build.vc10/pol51m0b/pol51m0b.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/pol51m0b/pol51m0b.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -208,7 +208,14 @@
<ClCompile Include="..\..\src\pol5\zeit.c" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ <ClInclude Include="..\..\src\if.h" />
+ <ClInclude Include="..\..\src\pol5\fnmatch.h" />
<ClInclude Include="..\..\src\pol5\if.h" />
+ <ClInclude Include="..\getopt.h" />
+ <ClInclude Include="..\unistd.h" />
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\pol5\asm_hash5.asm">
Modified: trunk/build.vc10/pol51m0b/pol51m0b.vcxproj.filters
===================================================================
--- trunk/build.vc10/pol51m0b/pol51m0b.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/pol51m0b/pol51m0b.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -34,6 +34,27 @@
<ClInclude Include="..\..\src\pol5\if.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\pol5\fnmatch.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\if.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\unistd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\pol5\asm_hash5.asm">
Modified: trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj
===================================================================
--- trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -211,12 +211,17 @@
<ClCompile Include="..\..\src\experimental\pol5\stage1\struct.c" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ <ClInclude Include="..\..\src\if.h" />
<ClInclude Include="..\getopt.h" />
<ClInclude Include="..\..\src\pol5\if.h" />
<ClInclude Include="..\..\src\experimental\pol5\include\poly_stage1.h" />
<ClInclude Include="..\..\src\experimental\pol5\include\profile.h" />
<ClInclude Include="..\..\src\experimental\pol5\stage1\stage1_impl.h" />
<ClInclude Include="..\..\src\experimental\pol5\stage1\stage1_inline.h" />
+ <ClInclude Include="..\unistd.h" />
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\experimental\pol5\stage1\asm_hash5.asm">
Modified: trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj.filters
===================================================================
--- trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -58,6 +58,21 @@
<ClInclude Include="..\..\src\experimental\pol5\stage1\stage1_inline.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\if.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\unistd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\experimental\pol5\stage1\asm_hash5.asm">
Modified: trunk/build.vc10/pol51m0n/pol51m0n.vcxproj
===================================================================
--- trunk/build.vc10/pol51m0n/pol51m0n.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/pol51m0n/pol51m0n.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -208,7 +208,14 @@
<ClCompile Include="..\..\src\pol5\zeit.c" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ <ClInclude Include="..\..\src\if.h" />
+ <ClInclude Include="..\..\src\pol5\fnmatch.h" />
<ClInclude Include="..\..\src\pol5\if.h" />
+ <ClInclude Include="..\getopt.h" />
+ <ClInclude Include="..\unistd.h" />
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\pol5\asm_hash5n.asm">
Modified: trunk/build.vc10/pol51m0n/pol51m0n.vcxproj.filters
===================================================================
--- trunk/build.vc10/pol51m0n/pol51m0n.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/pol51m0n/pol51m0n.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -34,6 +34,27 @@
<ClInclude Include="..\..\src\pol5\if.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\pol5\fnmatch.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\if.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\unistd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\pol5\asm_hash5n.asm">
Modified: trunk/build.vc10/pol51opt/pol51opt.vcxproj
===================================================================
--- trunk/build.vc10/pol51opt/pol51opt.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/pol51opt/pol51opt.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -209,7 +209,16 @@
<ClCompile Include="..\..\src\pol5\zeit.c" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ <ClInclude Include="..\..\src\if.h" />
+ <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h" />
+ <ClInclude Include="..\..\src\lasieve4\lasieve.h" />
+ <ClInclude Include="..\..\src\pol5\fnmatch.h" />
<ClInclude Include="..\..\src\pol5\if.h" />
+ <ClInclude Include="..\getopt.h" />
+ <ClInclude Include="..\unistd.h" />
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\pol5\asm_rs.asm">
Modified: trunk/build.vc10/pol51opt/pol51opt.vcxproj.filters
===================================================================
--- trunk/build.vc10/pol51opt/pol51opt.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/pol51opt/pol51opt.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -37,6 +37,33 @@
<ClInclude Include="..\..\src\pol5\if.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\pol5\fnmatch.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\if.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\lasieve.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\unistd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\pol5\asm_rs.asm">
Modified: trunk/build.vc10/pol51optx/pol51optx.vcxproj
===================================================================
--- trunk/build.vc10/pol51optx/pol51optx.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/pol51optx/pol51optx.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -213,11 +213,17 @@
<ClCompile Include="..\..\src\experimental\pol5\stage2\translate.c" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ <ClInclude Include="..\..\src\if.h" />
<ClInclude Include="..\..\src\pol5\if.h" />
<ClInclude Include="..\..\src\experimental\pol5\include\poly_stage2.h" />
<ClInclude Include="..\..\src\experimental\pol5\include\profile.h" />
<ClInclude Include="..\..\src\experimental\pol5\stage2\stage2_impl.h" />
<ClInclude Include="..\..\src\experimental\pol5\stage2\stage2_inline.h" />
+ <ClInclude Include="..\getopt.h" />
+ <ClInclude Include="..\unistd.h" />
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\experimental\pol5\stage2\asm_rs.asm">
Modified: trunk/build.vc10/pol51optx/pol51optx.vcxproj.filters
===================================================================
--- trunk/build.vc10/pol51optx/pol51optx.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/pol51optx/pol51optx.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -61,6 +61,24 @@
<ClInclude Include="..\..\src\experimental\pol5\stage2\stage2_inline.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\if.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\unistd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\experimental\pol5\stage2\asm_rs.asm">
Modified: trunk/build.vc10/polyselect/polyselect.vcxproj
===================================================================
--- trunk/build.vc10/polyselect/polyselect.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/polyselect/polyselect.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -211,6 +211,12 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\prand.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\vsyasm.targets" />
Modified: trunk/build.vc10/polyselect/polyselect.vcxproj.filters
===================================================================
--- trunk/build.vc10/polyselect/polyselect.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/polyselect/polyselect.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -15,4 +15,18 @@
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\prand.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project>
\ No newline at end of file
Modified: trunk/build.vc10/procrels/procrels.vcxproj
===================================================================
--- trunk/build.vc10/procrels/procrels.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/procrels/procrels.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -209,6 +209,11 @@
<ClCompile Include="..\..\src\rellist.c" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\prand.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ <ClInclude Include="..\..\src\if.h" />
<ClInclude Include="..\..\src\intutils.h" />
<ClInclude Include="..\..\src\rellist.h" />
</ItemGroup>
Modified: trunk/build.vc10/procrels/procrels.vcxproj.filters
===================================================================
--- trunk/build.vc10/procrels/procrels.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/procrels/procrels.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -31,5 +31,20 @@
<ClInclude Include="..\..\src\rellist.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\if.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\prand.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
Modified: trunk/build.vc10/sieve/sieve.vcxproj
===================================================================
--- trunk/build.vc10/sieve/sieve.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/sieve/sieve.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -214,6 +214,11 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\vsyasm.targets" />
Modified: trunk/build.vc10/sieve/sieve.vcxproj.filters
===================================================================
--- trunk/build.vc10/sieve/sieve.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/sieve/sieve.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -24,4 +24,15 @@
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project>
\ No newline at end of file
Modified: trunk/build.vc10/sqrt/sqrt.vcxproj
===================================================================
--- trunk/build.vc10/sqrt/sqrt.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/sqrt/sqrt.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -212,6 +212,11 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\vsyasm.targets" />
Modified: trunk/build.vc10/sqrt/sqrt.vcxproj.filters
===================================================================
--- trunk/build.vc10/sqrt/sqrt.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/sqrt/sqrt.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -18,4 +18,15 @@
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jay...@us...> - 2011-04-16 07:13:57
|
Revision: 414
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=414&view=rev
Author: jaysonking
Date: 2011-04-16 07:13:51 +0000 (Sat, 16 Apr 2011)
Log Message:
-----------
Low-impact fixlet: The a[4] polynomial coefficient may (rarely) be zero, which caused the initial optimization to choose an infinite skew, leading to unexpected program behavior or crash. Found by biwema.
Modified Paths:
--------------
trunk/src/experimental/pol5/stage2/translate.c
trunk/src/pol5/pol51opt.c
Modified: trunk/src/experimental/pol5/stage2/translate.c
===================================================================
--- trunk/src/experimental/pol5/stage2/translate.c 2011-03-20 11:34:07 UTC (rev 413)
+++ trunk/src/experimental/pol5/stage2/translate.c 2011-04-16 07:13:51 UTC (rev 414)
@@ -152,8 +152,12 @@
for (i = 0; i < 6; i++)
dbl_a[i] = mpz_get_d(c->gmp_a[i]);
dbl_d = mpz_get_d(c->gmp_d);
- s = sqrt(fabs(dbl_a[2] / dbl_a[4]));
- s0 = fabs(dbl_a[2] / dbl_a[3]);
+ s = 1.;
+ if (dbl_a[4] != 0)
+ s = sqrt(fabs(dbl_a[2] / dbl_a[4]));
+ s0 = 1.;
+ if (dbl_a[3] != 0)
+ s0 = fabs(dbl_a[2] / dbl_a[3]);
if (s0 > s)
s = s0;
ds = 2.;
Modified: trunk/src/pol5/pol51opt.c
===================================================================
--- trunk/src/pol5/pol51opt.c 2011-03-20 11:34:07 UTC (rev 413)
+++ trunk/src/pol5/pol51opt.c 2011-04-16 07:13:51 UTC (rev 414)
@@ -574,8 +574,14 @@
niter=0;
for (i=0; i<6; i++) dbl_a[i]=mpz_get_d(gmp_a[i]);
dbl_d=mpz_get_d(gmp_d);
- s=sqrt(fabs(dbl_a[2]/dbl_a[4]));
- s0=fabs(dbl_a[2]/dbl_a[3]); if (s0>s) s=s0;
+ s=1.;
+ if (dbl_a[4]!=0)
+ s=sqrt(fabs(dbl_a[2]/dbl_a[4]));
+ s0=1.;
+ if (dbl_a[3]!=0)
+ s0=fabs(dbl_a[2]/dbl_a[3]);
+ if (s0>s)
+ s=s0;
ds=2.;
di1=(int64_t)(dbl_a[1]/dbl_d);
di0=(int64_t)(dbl_a[0]/dbl_d);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <brg...@us...> - 2011-03-20 11:34:14
|
Revision: 413
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=413&view=rev
Author: brgladman
Date: 2011-03-20 11:34:07 +0000 (Sun, 20 Mar 2011)
Log Message:
-----------
update include file locations in some VC++ builds
Modified Paths:
--------------
trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj
trunk/build.vc10/pol51optx/pol51optx.vcxproj
Modified: trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj
===================================================================
--- trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj 2011-02-08 08:18:14 UTC (rev 412)
+++ trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj 2011-03-20 11:34:07 UTC (rev 413)
@@ -76,7 +76,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\src\experimental\pol5\include;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_ASM_INTEL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -110,7 +110,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\src\experimental\pol5\include;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -141,7 +141,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\src\experimental\pol5\include;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HAVE_ASM_INTEL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>
@@ -174,7 +174,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\src\experimental\pol5\include;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>
Modified: trunk/build.vc10/pol51optx/pol51optx.vcxproj
===================================================================
--- trunk/build.vc10/pol51optx/pol51optx.vcxproj 2011-02-08 08:18:14 UTC (rev 412)
+++ trunk/build.vc10/pol51optx/pol51optx.vcxproj 2011-03-20 11:34:07 UTC (rev 413)
@@ -76,7 +76,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\src\experimental\pol5\include;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_ASM_INTEL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -110,7 +110,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\src\experimental\pol5\include;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -141,7 +141,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\src\experimental\pol5\include;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HAVE_ASM_INTEL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>
@@ -174,7 +174,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\src\experimental\pol5\include;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jay...@us...> - 2011-02-08 08:18:20
|
Revision: 412
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=412&view=rev
Author: jaysonking
Date: 2011-02-08 08:18:14 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
Here we have a slight cosmetic issue:
For some purposes, it would be useful to ensure that the special_q factor is easily distinguishable in the output file. In earlier versions of the siever, the special_q factor would always come last in the array of found factors. In this version, the optimized TD routines may alter the array by placing repeated small factors at the end. This code is old enough that I don't want to remove the repeated factors, in case someone uses them (msieve does not). So instead, put the special_q factor first and then print the array backward.
Modified Paths:
--------------
trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c
Modified: trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c
===================================================================
--- trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c 2011-02-05 09:26:30 UTC (rev 411)
+++ trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c 2011-02-08 08:18:14 UTC (rev 412)
@@ -3625,6 +3625,11 @@
if(side == first_td_side)fbp_buf= td_buf1[nc1];
else fbp_buf= td_buf[side];
fbp_ptr= fbp_buf;
+
+ if(side == special_q_side) {
+ *(fbp_ptr++)= special_q;
+ }
+
{
int np,x;
@@ -3673,10 +3678,6 @@
}
}
- if(side == special_q_side) {
- *(fbp_ptr++)= special_q;
- }
-
fbp_ptr= mpz_trialdiv(aux1,fbp_buf,fbp_ptr-fbp_buf,
tds_coll[fss_sv[ci]] == 0?"td error":NULL);
@@ -4021,46 +4022,31 @@
}
mpqs_clock+= clock()-cl;
if(s!=2)return;
+ yield++;
+ mpz_out_str(g_ofile, 10, sr_a);
+ fprintf(g_ofile, ",");
+ mpz_out_str(g_ofile, 10, sr_b);
+
#define OBASE 16
- yield++;
- mpz_out_str(g_ofile, 10, sr_a);
- fprintf(g_ofile, ",");
- mpz_out_str(g_ofile, 10, sr_b);
- { int numR=0;
- { u32_t *x; int i;
-
- fprintf(g_ofile, ":");
- for (i = 0; i < nlp[1]; i++) { /* rational first. */
- if (i>0) fprintf(g_ofile, ",");
- mpz_out_str(g_ofile, OBASE, large_primes[1][i]);
- numR++;
- }
- for (x = fbp_buffers[1]; x < fbp_buffers_ub[1];x++) {
- if ((unsigned int)*x >1000) {
- if (numR>0) fprintf(g_ofile, ",%x", (unsigned int)*x);
- else { fprintf(g_ofile, "%x", (unsigned int)*x); numR++;}
- }
- }
- }
- { int numA=0;
- u32_t *x; int i;
-
- fprintf(g_ofile, ":");
- for (i = 0; i < nlp[0]; i++) { /* algebraic next. */
- if (i>0) fprintf(g_ofile, ",");
- mpz_out_str(g_ofile, OBASE, large_primes[0][i]);
- numA++;
- }
- for (x = fbp_buffers[0]; x < fbp_buffers_ub[0];x++) {
- if ((unsigned int)*x > 1000) {
- if (numA>0) fprintf(g_ofile, ",%x", (unsigned int)*x);
- else { fprintf(g_ofile, "%x", (unsigned int)*x); numA++;}
- }
- }
- }
- fprintf(g_ofile, "\n");
- }
+ for(s= 0;s<2;s++) {
+ int num = 0;
+ u32_t *x = fbp_buffers_ub[1-s];
+
+ fprintf(g_ofile, ":");
+ while (num < nlp[1-s]) {
+ if (num>0) fprintf(g_ofile, ",");
+ mpz_out_str(g_ofile, OBASE, large_primes[1-s][num]);
+ num++;
+ }
+ while (x-- != fbp_buffers[1-s]) {
+ if ((unsigned int)*x <1000) continue;
+ if (num>0) fprintf(g_ofile, ",");
+ fprintf(g_ofile, "%x", (unsigned int)*x);
+ num++;
+ }
+ }
+ fprintf(g_ofile, "\n");
}
/*
#ifdef OFMT_CWI
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <brg...@us...> - 2011-02-05 09:26:36
|
Revision: 411
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=411&view=rev
Author: brgladman
Date: 2011-02-05 09:26:30 +0000 (Sat, 05 Feb 2011)
Log Message:
-----------
remove a Visual Studio build directory that was wrongly added
Removed Paths:
-------------
trunk/build.vc10/lasieve.exp/ipch/
Property Changed:
----------------
trunk/build.vc10/lasieve.exp/
Property changes on: trunk/build.vc10/lasieve.exp
___________________________________________________________________
Added: svn:ignore
+ ipch
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <brg...@us...> - 2011-02-05 09:23:17
|
Revision: 410
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=410&view=rev
Author: brgladman
Date: 2011-02-05 09:23:11 +0000 (Sat, 05 Feb 2011)
Log Message:
-----------
correct error introduced into gnfs-lasieve4e.c
Modified Paths:
--------------
trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c
Modified: trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c
===================================================================
--- trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c 2011-02-03 19:14:54 UTC (rev 409)
+++ trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c 2011-02-05 09:23:11 UTC (rev 410)
@@ -30,7 +30,7 @@
#include <gmp.h>
#include <signal.h>
#include <setjmp.h>
-#if defined( _MSC_VER ) and defined( _WIN64 )
+#if defined( _MSC_VER ) && defined( _WIN64 )
#include <crtdbg.h>
#endif
#include "asm/siever-config.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jay...@us...> - 2011-02-03 19:15:04
|
Revision: 409
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=409&view=rev
Author: jaysonking
Date: 2011-02-03 19:14:54 +0000 (Thu, 03 Feb 2011)
Log Message:
-----------
remove executable bit from non-executable files.
Property Changed:
----------------
trunk/build.vc/vc9/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcproj
trunk/build.vc/vc9/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcproj
trunk/src/experimental/lasieve4_64/COPYING
trunk/src/experimental/lasieve4_64/INSTALL
trunk/src/experimental/lasieve4_64/Makefile
trunk/src/experimental/lasieve4_64/athlon/32bit.h
trunk/src/experimental/lasieve4_64/athlon/MMX-TD.c
trunk/src/experimental/lasieve4_64/athlon/MMX-TD1.asm
trunk/src/experimental/lasieve4_64/athlon/asm_mul128.asm
trunk/src/experimental/lasieve4_64/athlon/asm_mul64.asm
trunk/src/experimental/lasieve4_64/athlon/asm_mul96.asm
trunk/src/experimental/lasieve4_64/athlon/basemath.c
trunk/src/experimental/lasieve4_64/athlon/gcd32.c
trunk/src/experimental/lasieve4_64/athlon/lasched.w
trunk/src/experimental/lasieve4_64/athlon/lasched0.asm
trunk/src/experimental/lasieve4_64/athlon/lasched1.asm
trunk/src/experimental/lasieve4_64/athlon/lasched2.asm
trunk/src/experimental/lasieve4_64/athlon/lasched3.asm
trunk/src/experimental/lasieve4_64/athlon/ls-defs.asm
trunk/src/experimental/lasieve4_64/athlon/medsched.w
trunk/src/experimental/lasieve4_64/athlon/medsched0.asm
trunk/src/experimental/lasieve4_64/athlon/modinv1002.asm
trunk/src/experimental/lasieve4_64/athlon/montgomery_mul.c
trunk/src/experimental/lasieve4_64/athlon/montgomery_mul.h
trunk/src/experimental/lasieve4_64/athlon/mpqs.c
trunk/src/experimental/lasieve4_64/athlon/mpqs_eval.asm
trunk/src/experimental/lasieve4_64/athlon/mpqs_sieve.asm
trunk/src/experimental/lasieve4_64/athlon/mpqs_td.asm
trunk/src/experimental/lasieve4_64/athlon/mpz-td.asm
trunk/src/experimental/lasieve4_64/athlon/mpz-trialdiv.w
trunk/src/experimental/lasieve4_64/athlon/psp.c
trunk/src/experimental/lasieve4_64/athlon/ri-aux.asm
trunk/src/experimental/lasieve4_64/athlon/search0.asm
trunk/src/experimental/lasieve4_64/athlon/sieve-from-sched.S
trunk/src/experimental/lasieve4_64/athlon/siever-config.w
trunk/src/experimental/lasieve4_64/athlon/slinie1.asm
trunk/src/experimental/lasieve4_64/athlon/slinie1A.asm
trunk/src/experimental/lasieve4_64/athlon/slinie2.asm
trunk/src/experimental/lasieve4_64/athlon/slinie2A.asm
trunk/src/experimental/lasieve4_64/athlon/slinie3.asm
trunk/src/experimental/lasieve4_64/athlon/slinie3A.asm
trunk/src/experimental/lasieve4_64/athlon/slinieG.asm
trunk/src/experimental/lasieve4_64/athlon/tdsieve-from-sched.asm
trunk/src/experimental/lasieve4_64/athlon/tdslinie.asm
trunk/src/experimental/lasieve4_64/athlon/tdslinie1.asm
trunk/src/experimental/lasieve4_64/athlon/tdslinie2.asm
trunk/src/experimental/lasieve4_64/athlon/tdslinie3.asm
trunk/src/experimental/lasieve4_64/athlon64/32bit.h
trunk/src/experimental/lasieve4_64/athlon64/MMX-TD.c
trunk/src/experimental/lasieve4_64/athlon64/MMX-TD1.asm
trunk/src/experimental/lasieve4_64/athlon64/MMX-TD2.asm
trunk/src/experimental/lasieve4_64/athlon64/Makefile
trunk/src/experimental/lasieve4_64/athlon64/asm-zeit.asm
trunk/src/experimental/lasieve4_64/athlon64/gcd32.c
trunk/src/experimental/lasieve4_64/athlon64/gmp-aux.c
trunk/src/experimental/lasieve4_64/athlon64/gmp-aux.h
trunk/src/experimental/lasieve4_64/athlon64/if.c
trunk/src/experimental/lasieve4_64/athlon64/if.h
trunk/src/experimental/lasieve4_64/athlon64/invtab.c
trunk/src/experimental/lasieve4_64/athlon64/lasched.c
trunk/src/experimental/lasieve4_64/athlon64/lasched.h
trunk/src/experimental/lasieve4_64/athlon64/lasched0.asm
trunk/src/experimental/lasieve4_64/athlon64/lasched1.asm
trunk/src/experimental/lasieve4_64/athlon64/lasched3.asm
trunk/src/experimental/lasieve4_64/athlon64/lasieve-asmprepn.asm
trunk/src/experimental/lasieve4_64/athlon64/lasieve-asmprepn2.asm
trunk/src/experimental/lasieve4_64/athlon64/ls-defs.asm
trunk/src/experimental/lasieve4_64/athlon64/medsched.c
trunk/src/experimental/lasieve4_64/athlon64/medsched.h
trunk/src/experimental/lasieve4_64/athlon64/medsched0.asm
trunk/src/experimental/lasieve4_64/athlon64/modinv1000.asm
trunk/src/experimental/lasieve4_64/athlon64/modinv1000b.asm
trunk/src/experimental/lasieve4_64/athlon64/modinv32.c
trunk/src/experimental/lasieve4_64/athlon64/mpqs-config.h
trunk/src/experimental/lasieve4_64/athlon64/mpqs_eval.asm
trunk/src/experimental/lasieve4_64/athlon64/mpqs_gauss.asm
trunk/src/experimental/lasieve4_64/athlon64/mpqs_nextpol.asm
trunk/src/experimental/lasieve4_64/athlon64/mpqs_sieve.asm
trunk/src/experimental/lasieve4_64/athlon64/mpqs_sieveinit.asm
trunk/src/experimental/lasieve4_64/athlon64/mpqs_td.asm
trunk/src/experimental/lasieve4_64/athlon64/mpz-td.asm
trunk/src/experimental/lasieve4_64/athlon64/mpz-trialdiv.c
trunk/src/experimental/lasieve4_64/athlon64/psp.c
trunk/src/experimental/lasieve4_64/athlon64/pt64.asm
trunk/src/experimental/lasieve4_64/athlon64/ri-aux.asm
trunk/src/experimental/lasieve4_64/athlon64/schedsieve.asm
trunk/src/experimental/lasieve4_64/athlon64/search0.asm
trunk/src/experimental/lasieve4_64/athlon64/siever-config.c
trunk/src/experimental/lasieve4_64/athlon64/siever-config.h
trunk/src/experimental/lasieve4_64/athlon64/slinie1A.asm
trunk/src/experimental/lasieve4_64/athlon64/slinie2A.asm
trunk/src/experimental/lasieve4_64/athlon64/slinie3A.asm
trunk/src/experimental/lasieve4_64/athlon64/slinieG.asm
trunk/src/experimental/lasieve4_64/athlon64/tdsieve-from-sched.asm
trunk/src/experimental/lasieve4_64/athlon64/tdslinie.asm
trunk/src/experimental/lasieve4_64/athlon64/tdslinie1.asm
trunk/src/experimental/lasieve4_64/athlon64/tdslinie2.asm
trunk/src/experimental/lasieve4_64/athlon64/tdslinie3.asm
trunk/src/experimental/lasieve4_64/athlon64/zeit.c
trunk/src/experimental/lasieve4_64/athlon64/zeit.h
trunk/src/experimental/lasieve4_64/cweb.INSTALL.and.USE
trunk/src/experimental/lasieve4_64/fbgen.c
trunk/src/experimental/lasieve4_64/fbgen.h
trunk/src/experimental/lasieve4_64/generic/32bit.h
trunk/src/experimental/lasieve4_64/generic/gcd32.c
trunk/src/experimental/lasieve4_64/generic/lasched.w
trunk/src/experimental/lasieve4_64/generic/medsched.w
trunk/src/experimental/lasieve4_64/generic/modinv32.c
trunk/src/experimental/lasieve4_64/generic/mpqs.c
trunk/src/experimental/lasieve4_64/generic/psp.c
trunk/src/experimental/lasieve4_64/generic/siever-config32.w
trunk/src/experimental/lasieve4_64/generic/siever-config64.w
trunk/src/experimental/lasieve4_64/gmp-aux.c
trunk/src/experimental/lasieve4_64/gmp-aux.h
trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c
trunk/src/experimental/lasieve4_64/if.c
trunk/src/experimental/lasieve4_64/if.h
trunk/src/experimental/lasieve4_64/input-poly.c
trunk/src/experimental/lasieve4_64/input-poly.h
trunk/src/experimental/lasieve4_64/input-poly.orig.c
trunk/src/experimental/lasieve4_64/itanium/32bit.h
trunk/src/experimental/lasieve4_64/itanium/MMX-Td.c
trunk/src/experimental/lasieve4_64/itanium/MMX-Td1.asm
trunk/src/experimental/lasieve4_64/itanium/asmdefs.asm
trunk/src/experimental/lasieve4_64/itanium/gcd32.c
trunk/src/experimental/lasieve4_64/itanium/lasched.w
trunk/src/experimental/lasieve4_64/itanium/lasched0.asm
trunk/src/experimental/lasieve4_64/itanium/lasched1.asm
trunk/src/experimental/lasieve4_64/itanium/lasched2.asm
trunk/src/experimental/lasieve4_64/itanium/lasched3.asm
trunk/src/experimental/lasieve4_64/itanium/lasieve-setup.asm
trunk/src/experimental/lasieve4_64/itanium/ls-defs.asm
trunk/src/experimental/lasieve4_64/itanium/medsched.w
trunk/src/experimental/lasieve4_64/itanium/medsched0.asm
trunk/src/experimental/lasieve4_64/itanium/modinv15.asm
trunk/src/experimental/lasieve4_64/itanium/modinv32.c
trunk/src/experimental/lasieve4_64/itanium/mpqs.c
trunk/src/experimental/lasieve4_64/itanium/mpz-td.asm
trunk/src/experimental/lasieve4_64/itanium/mpz-trialdiv.w
trunk/src/experimental/lasieve4_64/itanium/psp.c
trunk/src/experimental/lasieve4_64/itanium/ri-aux.asm
trunk/src/experimental/lasieve4_64/itanium/schedsieve3.asm
trunk/src/experimental/lasieve4_64/itanium/siever-config.w
trunk/src/experimental/lasieve4_64/itanium/slinie.asm
trunk/src/experimental/lasieve4_64/lasieve-prepn.c
trunk/src/experimental/lasieve4_64/lasieve-prepn.h
trunk/src/experimental/lasieve4_64/mips/32bit.h
trunk/src/experimental/lasieve4_64/mips/gcd32.c
trunk/src/experimental/lasieve4_64/mips/lasched.h
trunk/src/experimental/lasieve4_64/mips/lasched3.asm
trunk/src/experimental/lasieve4_64/mips/lasieve-prepn.asm
trunk/src/experimental/lasieve4_64/mips/ls-defs.asm
trunk/src/experimental/lasieve4_64/mips/medsched.h
trunk/src/experimental/lasieve4_64/mips/medsched2.asm
trunk/src/experimental/lasieve4_64/mips/modinv1002.asm
trunk/src/experimental/lasieve4_64/mips/mpqs.c
trunk/src/experimental/lasieve4_64/mips/psp.c
trunk/src/experimental/lasieve4_64/mips/pt64.asm
trunk/src/experimental/lasieve4_64/mips/ri-aux.asm
trunk/src/experimental/lasieve4_64/mips/sieve-from-sched4p.asm
trunk/src/experimental/lasieve4_64/mips/siever-config.w
trunk/src/experimental/lasieve4_64/mips/slinie.asm
trunk/src/experimental/lasieve4_64/mips/tdsieve-from-sched4q.asm
trunk/src/experimental/lasieve4_64/mips/ula2.asm
trunk/src/experimental/lasieve4_64/mpqs.c
trunk/src/experimental/lasieve4_64/mpz-ull.c
trunk/src/experimental/lasieve4_64/orig_gnfs-lasieve4e.c
trunk/src/experimental/lasieve4_64/piii/32bit.h
trunk/src/experimental/lasieve4_64/piii/MMX-TD.c
trunk/src/experimental/lasieve4_64/piii/MMX-TD1.asm
trunk/src/experimental/lasieve4_64/piii/asm_mul128.asm
trunk/src/experimental/lasieve4_64/piii/asm_mul64.asm
trunk/src/experimental/lasieve4_64/piii/asm_mul96.asm
trunk/src/experimental/lasieve4_64/piii/basemath.c
trunk/src/experimental/lasieve4_64/piii/gcd32.c
trunk/src/experimental/lasieve4_64/piii/lasched.w
trunk/src/experimental/lasieve4_64/piii/lasched0.asm
trunk/src/experimental/lasieve4_64/piii/lasched1.asm
trunk/src/experimental/lasieve4_64/piii/lasched2.asm
trunk/src/experimental/lasieve4_64/piii/lasched3.asm
trunk/src/experimental/lasieve4_64/piii/ls-defs.asm
trunk/src/experimental/lasieve4_64/piii/medsched.w
trunk/src/experimental/lasieve4_64/piii/medsched0.asm
trunk/src/experimental/lasieve4_64/piii/modinv1002.asm
trunk/src/experimental/lasieve4_64/piii/montgomery_mul.c
trunk/src/experimental/lasieve4_64/piii/montgomery_mul.h
trunk/src/experimental/lasieve4_64/piii/mpqs.c
trunk/src/experimental/lasieve4_64/piii/mpqs_eval.asm
trunk/src/experimental/lasieve4_64/piii/mpqs_sieve.asm
trunk/src/experimental/lasieve4_64/piii/mpqs_td.asm
trunk/src/experimental/lasieve4_64/piii/mpz-td.asm
trunk/src/experimental/lasieve4_64/piii/mpz-trialdiv.w
trunk/src/experimental/lasieve4_64/piii/psp.c
trunk/src/experimental/lasieve4_64/piii/ri-aux.asm
trunk/src/experimental/lasieve4_64/piii/search0.asm
trunk/src/experimental/lasieve4_64/piii/sieve-from-sched.S
trunk/src/experimental/lasieve4_64/piii/siever-config.w
trunk/src/experimental/lasieve4_64/piii/slinie1.asm
trunk/src/experimental/lasieve4_64/piii/slinie1A.asm
trunk/src/experimental/lasieve4_64/piii/slinie2.asm
trunk/src/experimental/lasieve4_64/piii/slinie2A.asm
trunk/src/experimental/lasieve4_64/piii/slinie3.asm
trunk/src/experimental/lasieve4_64/piii/slinie3A.asm
trunk/src/experimental/lasieve4_64/piii/slinieG.asm
trunk/src/experimental/lasieve4_64/piii/tdsieve-from-sched.asm
trunk/src/experimental/lasieve4_64/piii/tdslinie.asm
trunk/src/experimental/lasieve4_64/piii/tdslinie1.asm
trunk/src/experimental/lasieve4_64/piii/tdslinie2.asm
trunk/src/experimental/lasieve4_64/piii/tdslinie3.asm
trunk/src/experimental/lasieve4_64/piii-win/32bit.h
trunk/src/experimental/lasieve4_64/piii-win/gcd32.c
trunk/src/experimental/lasieve4_64/piii-win/lasched.w
trunk/src/experimental/lasieve4_64/piii-win/medsched.w
trunk/src/experimental/lasieve4_64/piii-win/modinv32.c
trunk/src/experimental/lasieve4_64/piii-win/mpqs.c
trunk/src/experimental/lasieve4_64/piii-win/psp.c
trunk/src/experimental/lasieve4_64/piii-win/siever-config.w
trunk/src/experimental/lasieve4_64/primgen32.c
trunk/src/experimental/lasieve4_64/primgen32.h
trunk/src/experimental/lasieve4_64/real-poly-aux.c
trunk/src/experimental/lasieve4_64/real-poly-aux.h
trunk/src/experimental/lasieve4_64/recurrence6.c
trunk/src/experimental/lasieve4_64/recurrence6.h
trunk/src/experimental/lasieve4_64/redu2.c
trunk/src/experimental/lasieve4_64/redu2.h
trunk/src/experimental/pol5/Makefile
trunk/src/experimental/pol5/common/profile.c
trunk/src/experimental/pol5/include/poly_stage1.h
trunk/src/experimental/pol5/include/poly_stage2.h
trunk/src/experimental/pol5/include/profile.h
trunk/src/experimental/pol5/pol51m0b.c
trunk/src/experimental/pol5/pol51opt.c
trunk/src/experimental/pol5/stage1/asm_hash5.asm
trunk/src/experimental/pol5/stage1/asm_hash5.s
trunk/src/experimental/pol5/stage1/check.c
trunk/src/experimental/pol5/stage1/knapsack.c
trunk/src/experimental/pol5/stage1/knapsack_approx.c
trunk/src/experimental/pol5/stage1/stage1.c
trunk/src/experimental/pol5/stage1/stage1_impl.h
trunk/src/experimental/pol5/stage1/stage1_inline.h
trunk/src/experimental/pol5/stage1/struct.c
trunk/src/experimental/pol5/stage2/asm_rs.asm
trunk/src/experimental/pol5/stage2/asm_rs.s
trunk/src/experimental/pol5/stage2/assess.c
trunk/src/experimental/pol5/stage2/check.c
trunk/src/experimental/pol5/stage2/dickman.c
trunk/src/experimental/pol5/stage2/primes.c
trunk/src/experimental/pol5/stage2/root_sieve.c
trunk/src/experimental/pol5/stage2/roots.c
trunk/src/experimental/pol5/stage2/stage2.c
trunk/src/experimental/pol5/stage2/stage2_impl.h
trunk/src/experimental/pol5/stage2/stage2_inline.h
trunk/src/experimental/pol5/stage2/translate.c
trunk/src/experimental/pol5/test/rsa100.51.m.old
trunk/src/experimental/pol5/test/rsa100.data
trunk/src/experimental/pol5/test/rsa100_2.51.m
trunk/src/experimental/pol5/test/rsa100_2.cand.old
trunk/src/experimental/pol5/test/rsa100_2.data
trunk/src/experimental/pol5/test/rsa110.51.m.old
trunk/src/experimental/pol5/test/rsa110.data
trunk/src/experimental/pol5/test/rsa120.51.m.old
trunk/src/experimental/pol5/test/rsa120.data
trunk/src/experimental/pol5/test/rsa130.51.m.old
trunk/src/experimental/pol5/test/rsa130.data
trunk/src/experimental/pol5/test/rsa140.51.m.old
trunk/src/experimental/pol5/test/rsa140.data
trunk/src/lasieve4/gnfs-lasieve4e.pdf
Property changes on: trunk/build.vc/vc9/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcproj
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/build.vc/vc9/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcproj
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/COPYING
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/INSTALL
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/Makefile
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/32bit.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/MMX-TD.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/MMX-TD1.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/asm_mul128.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/asm_mul64.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/asm_mul96.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/basemath.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/gcd32.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/lasched.w
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/lasched0.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/lasched1.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/lasched2.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/lasched3.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/ls-defs.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/medsched.w
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/medsched0.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/modinv1002.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/montgomery_mul.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/montgomery_mul.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/mpqs.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/mpqs_eval.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/mpqs_sieve.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/mpqs_td.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/mpz-td.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/mpz-trialdiv.w
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/psp.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/ri-aux.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/search0.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/sieve-from-sched.S
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/siever-config.w
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/slinie1.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/slinie1A.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/slinie2.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/slinie2A.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/slinie3.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/slinie3A.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/slinieG.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/tdsieve-from-sched.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/tdslinie.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/tdslinie1.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/tdslinie2.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon/tdslinie3.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/32bit.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/MMX-TD.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/MMX-TD1.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/MMX-TD2.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/Makefile
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/asm-zeit.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/gcd32.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/gmp-aux.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/gmp-aux.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/if.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/if.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/invtab.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/lasched.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/lasched.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/lasched0.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/lasched1.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/lasched3.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/lasieve-asmprepn.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/lasieve-asmprepn2.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/ls-defs.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/medsched.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/medsched.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/medsched0.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/modinv1000.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/modinv1000b.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/modinv32.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/mpqs-config.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/mpqs_eval.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/mpqs_gauss.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/mpqs_nextpol.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/mpqs_sieve.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/mpqs_sieveinit.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/mpqs_td.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/mpz-td.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/mpz-trialdiv.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/psp.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/pt64.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/ri-aux.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/schedsieve.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/search0.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/siever-config.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/siever-config.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/slinie1A.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/slinie2A.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/slinie3A.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/slinieG.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/tdsieve-from-sched.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/tdslinie.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/tdslinie1.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/tdslinie2.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/tdslinie3.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/zeit.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/athlon64/zeit.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/cweb.INSTALL.and.USE
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/fbgen.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/fbgen.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/generic/32bit.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/generic/gcd32.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/generic/lasched.w
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/generic/medsched.w
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/generic/modinv32.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/generic/mpqs.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/generic/psp.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/generic/siever-config32.w
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/generic/siever-config64.w
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/gmp-aux.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/gmp-aux.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/if.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/if.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/input-poly.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/input-poly.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/input-poly.orig.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/itanium/32bit.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/itanium/MMX-Td.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/itanium/MMX-Td1.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/itanium/asmdefs.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/itanium/gcd32.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/itanium/lasched.w
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/itanium/lasched0.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/itanium/lasched1.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/itanium/lasched2.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/itanium/lasched3.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/itanium/lasieve-setup.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/itanium/ls-defs.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/itanium/medsched.w
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/itanium/medsched0.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/itanium/modinv15.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/itanium/modinv32.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/itanium/mpqs.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/itanium/mpz-td.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/itanium/mpz-trialdiv.w
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/itanium/psp.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/itanium/ri-aux.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/itanium/schedsieve3.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/itanium/siever-config.w
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/itanium/slinie.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/lasieve-prepn.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/lasieve-prepn.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/mips/32bit.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/mips/gcd32.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/mips/lasched.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/mips/lasched3.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/mips/lasieve-prepn.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/mips/ls-defs.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/mips/medsched.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/mips/medsched2.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/mips/modinv1002.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/mips/mpqs.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/mips/psp.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/mips/pt64.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/mips/ri-aux.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/mips/sieve-from-sched4p.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/mips/siever-config.w
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/mips/slinie.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/mips/tdsieve-from-sched4q.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/mips/ula2.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/mpqs.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/mpz-ull.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/orig_gnfs-lasieve4e.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/32bit.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/MMX-TD.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/MMX-TD1.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/asm_mul128.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/asm_mul64.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/asm_mul96.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/basemath.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/gcd32.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/lasched.w
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/lasched0.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/lasched1.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/lasched2.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/lasched3.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/ls-defs.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/medsched.w
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/medsched0.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/modinv1002.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/montgomery_mul.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/montgomery_mul.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/mpqs.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/mpqs_eval.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/mpqs_sieve.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/mpqs_td.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/mpz-td.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/mpz-trialdiv.w
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/psp.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/ri-aux.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/search0.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/sieve-from-sched.S
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/siever-config.w
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/slinie1.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/slinie1A.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/slinie2.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/slinie2A.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/slinie3.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/slinie3A.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/slinieG.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/tdsieve-from-sched.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/tdslinie.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/tdslinie1.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/tdslinie2.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii/tdslinie3.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii-win/32bit.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii-win/gcd32.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii-win/lasched.w
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii-win/medsched.w
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii-win/modinv32.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii-win/mpqs.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii-win/psp.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/piii-win/siever-config.w
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/primgen32.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/primgen32.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/real-poly-aux.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/real-poly-aux.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/recurrence6.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/recurrence6.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/redu2.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/lasieve4_64/redu2.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/Makefile
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/common/profile.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/include/poly_stage1.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/include/poly_stage2.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/include/profile.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/pol51m0b.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/pol51opt.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/stage1/asm_hash5.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/stage1/asm_hash5.s
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/stage1/check.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/stage1/knapsack.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/stage1/knapsack_approx.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/stage1/stage1.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/stage1/stage1_impl.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/stage1/stage1_inline.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/stage1/struct.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/stage2/asm_rs.asm
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/stage2/asm_rs.s
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/stage2/assess.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/stage2/check.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/stage2/dickman.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/stage2/primes.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/stage2/root_sieve.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/stage2/roots.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/stage2/stage2.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/stage2/stage2_impl.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/stage2/stage2_inline.h
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/stage2/translate.c
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/test/rsa100.51.m.old
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/test/rsa100.data
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/test/rsa100_2.51.m
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/test/rsa100_2.cand.old
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/test/rsa100_2.data
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/test/rsa110.51.m.old
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/src/experimental/pol5/test/rsa110.data
_______________________________________...
[truncated message content] |
|
From: <jay...@us...> - 2011-02-03 19:04:03
|
Revision: 408
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=408&view=rev
Author: jaysonking
Date: 2011-02-03 19:03:57 +0000 (Thu, 03 Feb 2011)
Log Message:
-----------
If the input has a "m:" line, use it for verification instead of assuming that the second poly is always linear. If e.g. the second poly is non-linear, the verification inexplicably fails even if the correct "m:" is input. Make it nicer.
Modified Paths:
--------------
trunk/src/experimental/lasieve4_64/input-poly.c
trunk/src/lasieve4/input-poly.c
Modified: trunk/src/experimental/lasieve4_64/input-poly.c
===================================================================
--- trunk/src/experimental/lasieve4_64/input-poly.c 2011-02-02 11:14:45 UTC (rev 407)
+++ trunk/src/experimental/lasieve4_64/input-poly.c 2011-02-03 19:03:57 UTC (rev 408)
@@ -150,8 +150,8 @@
i32_t *bdeg, mpz_t m, FILE *fp)
/*******************************************************/
{ char token[256], value[512], thisLine[1024];
- int i, j, cont=1;
- mpz_t tmp, tmp2, mpow;
+ int i, j, cont=1, have_m=0;
+ mpz_t tmpA, tmpB;
*adeg = *bdeg = 0;
*A = xmalloc(9*sizeof(**A)); /* plenty o' room. */
@@ -170,6 +170,7 @@
mpz_set_str(N, value, 10);
} else if (strncmp(token, "m:", 2)==0) {
mpz_set_str(m, value, 10);
+ have_m=1;
} else if ((token[0]=='c') && (token[1] >= '0') && (token[1] <= '8')) {
mpz_set_str((*A)[token[1]-'0'], value, 10);
*adeg = MAX(*adeg, token[1]-'0');
@@ -182,43 +183,45 @@
}
if (feof(fp)) cont=0;
}
- if (*bdeg == 0) {
+
+ if (have_m == 0) { /* recover m from the linear poly */
+ if (*bdeg == 1) { /* assume *B is linear (it usually is) */
+ mpz_invert(m, (*B)[1], N);
+ mpz_mul(m, m, (*B)[0]);
+ mpz_neg(m, m);
+ mpz_mod(m, m, N);
+ } else {
+ complain("could not find m\n");
+ }
+ } else if (*bdeg == 0) { /* monic linear poly may be omitted */
mpz_set_ui((*B)[1], 1);
mpz_neg((*B)[0], m);
*bdeg=1;
}
/* Verify the polynomials: */
- mpz_init(tmp); mpz_init(tmp2); mpz_init(mpow);
- mpz_set_ui(tmp, 0);
- mpz_set_ui(mpow, 1);
-
- if (*bdeg) {
- mpz_neg(m, (*B)[0]); /* m for temporary use */
- for(i=0; i<=*adeg; i++) {
- mpz_mul(tmp2, mpow, (*A)[i]);
- for(j=i; j <= *adeg; j++)
- mpz_mul(tmp2, tmp2, (*B)[1]);
- mpz_add(tmp, tmp, tmp2);
- mpz_mul(mpow, mpow, m);
- }
- } else {
- for (i=*adeg; i>=0; i--) {
- mpz_mul(tmp, tmp, m);
- mpz_add(tmp, tmp, (*A)[i]);
- }
+ mpz_init_set(tmpA, (*A)[*adeg]);
+ for (i = *adeg - 1; i >= 0; i--) {
+ mpz_mul(tmpA, tmpA, m);
+ mpz_add(tmpA, tmpA, (*A)[i]);
+ mpz_mod(tmpA, tmpA, N);
}
- mpz_mod(tmp, tmp, N);
- if (mpz_sgn(tmp)) {
- printf("Error: the polynomials don't have a common root:\n");
+ mpz_init_set(tmpB, (*B)[*bdeg]);
+ for (i = *bdeg - 1; i >= 0; i--) {
+ mpz_mul(tmpB, tmpB, m);
+ mpz_add(tmpB, tmpB, (*B)[i]);
+ mpz_mod(tmpB, tmpB, N);
+ }
+ if (mpz_sgn(tmpA) || mpz_sgn(tmpB)) {
+ printf("Error: m is not a common root of the polynomials:\n");
for (i=0; i<=*adeg; i++)
- printf("c%d: %s\n", i, mpz_get_str(token, 10, (*A)[i]));
+ printf("c%d: %s\n", i, mpz_get_str(value, 10, (*A)[i]));
for (i=0; i<=*bdeg; i++)
- printf("Y%d: %s\n", i, mpz_get_str(token, 10, (*B)[i]));
+ printf("Y%d: %s\n", i, mpz_get_str(value, 10, (*B)[i]));
printf("n: ");
mpz_out_str(NULL,10,N);
exit(-1);
}
- mpz_clear(tmp2); mpz_clear(mpow); mpz_clear(tmp);
+ mpz_clear(tmpA); mpz_clear(tmpB);
}
#endif
Modified: trunk/src/lasieve4/input-poly.c
===================================================================
--- trunk/src/lasieve4/input-poly.c 2011-02-02 11:14:45 UTC (rev 407)
+++ trunk/src/lasieve4/input-poly.c 2011-02-03 19:03:57 UTC (rev 408)
@@ -148,8 +148,8 @@
i32_t *bdeg, mpz_t m, FILE *fp)
/*******************************************************/
{ char token[256], value[512], thisLine[1024];
- int i, j, cont=1;
- mpz_t tmp, tmp2, mpow;
+ int i, j, cont=1, have_m=0;
+ mpz_t tmpA, tmpB;
*adeg = *bdeg = 0;
*A = xmalloc(9*sizeof(**A)); /* plenty o' room. */
@@ -168,6 +168,7 @@
mpz_set_str(N, value, 10);
} else if (strncmp(token, "m:", 2)==0) {
mpz_set_str(m, value, 10);
+ have_m=1;
} else if ((token[0]=='c') && (token[1] >= '0') && (token[1] <= '8')) {
mpz_set_str((*A)[token[1]-'0'], value, 10);
*adeg = MAX(*adeg, token[1]-'0');
@@ -180,41 +181,45 @@
}
if (feof(fp)) cont=0;
}
- if (*bdeg == 0) {
+
+ if (have_m == 0) { /* recover m from the linear poly */
+ if (*bdeg == 1) { /* assume *B is linear (it usually is) */
+ mpz_invert(m, (*B)[1], N);
+ mpz_mul(m, m, (*B)[0]);
+ mpz_neg(m, m);
+ mpz_mod(m, m, N);
+ } else {
+ complain("could not find m\n");
+ }
+ } else if (*bdeg == 0) { /* monic linear poly may be omitted */
mpz_set_ui((*B)[1], 1);
mpz_neg((*B)[0], m);
*bdeg=1;
}
/* Verify the polynomials: */
- mpz_init(tmp); mpz_init(tmp2); mpz_init(mpow);
- mpz_set_ui(tmp, 0);
- mpz_set_ui(mpow, 1);
-
- if (*bdeg) {
- mpz_neg(m, (*B)[0]); /* m for temporary use */
- for(i=0; i<=*adeg; i++) {
- mpz_mul(tmp2, mpow, (*A)[i]);
- for(j=i; j <= *adeg; j++)
- mpz_mul(tmp2, tmp2, (*B)[1]);
- mpz_add(tmp, tmp, tmp2);
- mpz_mul(mpow, mpow, m);
- }
- } else {
- for (i=*adeg; i>=0; i--) {
- mpz_mul(tmp, tmp, m);
- mpz_add(tmp, tmp, (*A)[i]);
- }
+ mpz_init_set(tmpA, (*A)[*adeg]);
+ for (i = *adeg - 1; i >= 0; i--) {
+ mpz_mul(tmpA, tmpA, m);
+ mpz_add(tmpA, tmpA, (*A)[i]);
+ mpz_mod(tmpA, tmpA, N);
}
- mpz_mod(tmp, tmp, N);
- if (mpz_sgn(tmp)) {
- printf("Error: the polynomials don't have a common root:\n");
+ mpz_init_set(tmpB, (*B)[*bdeg]);
+ for (i = *bdeg - 1; i >= 0; i--) {
+ mpz_mul(tmpB, tmpB, m);
+ mpz_add(tmpB, tmpB, (*B)[i]);
+ mpz_mod(tmpB, tmpB, N);
+ }
+ if (mpz_sgn(tmpA) || mpz_sgn(tmpB)) {
+ printf("Error: m is not a common root of the polynomials:\n");
for (i=0; i<=*adeg; i++)
- printf("c%d: %s\n", i, mpz_get_str(token, 10, (*A)[i]));
+ printf("c%d: %s\n", i, mpz_get_str(value, 10, (*A)[i]));
for (i=0; i<=*bdeg; i++)
- printf("Y%d: %s\n", i, mpz_get_str(token, 10, (*B)[i]));
+ printf("Y%d: %s\n", i, mpz_get_str(value, 10, (*B)[i]));
+ printf("n: ");
+ mpz_out_str(NULL,10,N);
exit(-1);
}
- mpz_clear(tmp2); mpz_clear(mpow); mpz_clear(tmp);
+ mpz_clear(tmpA); mpz_clear(tmpB);
}
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <brg...@us...> - 2011-02-02 11:14:54
|
Revision: 407
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=407&view=rev
Author: brgladman
Date: 2011-02-02 11:14:45 +0000 (Wed, 02 Feb 2011)
Log Message:
-----------
Commit Visual Studio 2010 x64 build for the experimental lattice siever code
Modified Paths:
--------------
trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c
trunk/src/experimental/lasieve4_64/if.c
trunk/src/experimental/lasieve4_64/input-poly.c
trunk/src/experimental/lasieve4_64/mpqs.c
Added Paths:
-----------
trunk/build.vc10/lasieve.exp/
trunk/build.vc10/lasieve.exp/ipch/
trunk/build.vc10/lasieve.exp/ipch/lasieve4i16e-d52b58a1/
trunk/build.vc10/lasieve.exp/lasieve.exp.sln
trunk/build.vc10/lasieve.exp/lasieve4I11e/
trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj
trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj.filters
trunk/build.vc10/lasieve.exp/lasieve4I12e/
trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I11e.vcxproj.filters
trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj
trunk/build.vc10/lasieve.exp/lasieve4I13e/
trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj
trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj.filters
trunk/build.vc10/lasieve.exp/lasieve4I14e/
trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj
trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj.filters
trunk/build.vc10/lasieve.exp/lasieve4I15e/
trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj
trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj.filters
trunk/build.vc10/lasieve.exp/lasieve4I16e/
trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj
trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj.filters
trunk/build.vc10/lasieve.exp/liblasieve/
trunk/build.vc10/lasieve.exp/liblasieve/liblasieve.vcxproj
trunk/build.vc10/lasieve.exp/liblasieve/liblasieve.vcxproj.filters
trunk/build.vc10/lasieve.exp/liblasieveI11/
trunk/build.vc10/lasieve.exp/liblasieveI11/liblasieveI11.vcxproj
trunk/build.vc10/lasieve.exp/liblasieveI11/liblasieveI11.vcxproj.filters
trunk/build.vc10/lasieve.exp/liblasieveI12/
trunk/build.vc10/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj
trunk/build.vc10/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj.filters
trunk/build.vc10/lasieve.exp/liblasieveI13/
trunk/build.vc10/lasieve.exp/liblasieveI13/liblasieveI13.vcxproj
trunk/build.vc10/lasieve.exp/liblasieveI13/liblasieveI13.vcxproj.filters
trunk/build.vc10/lasieve.exp/liblasieveI14/
trunk/build.vc10/lasieve.exp/liblasieveI14/liblasieveI14.vcxproj
trunk/build.vc10/lasieve.exp/liblasieveI14/liblasieveI14.vcxproj.filters
trunk/build.vc10/lasieve.exp/liblasieveI15/
trunk/build.vc10/lasieve.exp/liblasieveI15/liblasieveI15.vcxproj
trunk/build.vc10/lasieve.exp/liblasieveI15/liblasieveI15.vcxproj.filters
trunk/build.vc10/lasieve.exp/liblasieveI16/
trunk/build.vc10/lasieve.exp/liblasieveI16/liblasieveI16.vcxproj
trunk/build.vc10/lasieve.exp/liblasieveI16/liblasieveI16.vcxproj.filters
trunk/build.vc10/lasieve.exp/readme.txt
trunk/src/experimental/lasieve4_64/x64/
trunk/src/experimental/lasieve4_64/x64/32bit.h
trunk/src/experimental/lasieve4_64/x64/MMX-TD.c
trunk/src/experimental/lasieve4_64/x64/MMX-TD1.asm
trunk/src/experimental/lasieve4_64/x64/MMX-TD2.asm
trunk/src/experimental/lasieve4_64/x64/Makefile
trunk/src/experimental/lasieve4_64/x64/asm-zeit.asm
trunk/src/experimental/lasieve4_64/x64/gcd32.c
trunk/src/experimental/lasieve4_64/x64/gmp-aux.c
trunk/src/experimental/lasieve4_64/x64/gmp-aux.h
trunk/src/experimental/lasieve4_64/x64/if.c
trunk/src/experimental/lasieve4_64/x64/if.h
trunk/src/experimental/lasieve4_64/x64/invtab.c
trunk/src/experimental/lasieve4_64/x64/lasched.c
trunk/src/experimental/lasieve4_64/x64/lasched.h
trunk/src/experimental/lasieve4_64/x64/lasched0.asm
trunk/src/experimental/lasieve4_64/x64/lasched1.asm
trunk/src/experimental/lasieve4_64/x64/lasched3.asm
trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn.asm
trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn2.asm
trunk/src/experimental/lasieve4_64/x64/ls-defs.asm
trunk/src/experimental/lasieve4_64/x64/ls-defs.inc
trunk/src/experimental/lasieve4_64/x64/medsched.c
trunk/src/experimental/lasieve4_64/x64/medsched.h
trunk/src/experimental/lasieve4_64/x64/medsched0.asm
trunk/src/experimental/lasieve4_64/x64/modinv1000.asm
trunk/src/experimental/lasieve4_64/x64/modinv1000b.asm
trunk/src/experimental/lasieve4_64/x64/modinv32.c
trunk/src/experimental/lasieve4_64/x64/mpqs-config.h
trunk/src/experimental/lasieve4_64/x64/mpqs_eval.asm
trunk/src/experimental/lasieve4_64/x64/mpqs_gauss.asm
trunk/src/experimental/lasieve4_64/x64/mpqs_nextpol.asm
trunk/src/experimental/lasieve4_64/x64/mpqs_sieve.asm
trunk/src/experimental/lasieve4_64/x64/mpqs_sieveinit.asm
trunk/src/experimental/lasieve4_64/x64/mpqs_td.asm
trunk/src/experimental/lasieve4_64/x64/mpz-td.asm
trunk/src/experimental/lasieve4_64/x64/mpz-trialdiv.c
trunk/src/experimental/lasieve4_64/x64/psp.c
trunk/src/experimental/lasieve4_64/x64/pt64.asm
trunk/src/experimental/lasieve4_64/x64/ri-aux.asm
trunk/src/experimental/lasieve4_64/x64/schedsieve.asm
trunk/src/experimental/lasieve4_64/x64/search0.asm
trunk/src/experimental/lasieve4_64/x64/siever-config.c
trunk/src/experimental/lasieve4_64/x64/siever-config.h
trunk/src/experimental/lasieve4_64/x64/slinie1A.asm
trunk/src/experimental/lasieve4_64/x64/slinie2A.asm
trunk/src/experimental/lasieve4_64/x64/slinie3A.asm
trunk/src/experimental/lasieve4_64/x64/slinieG.asm
trunk/src/experimental/lasieve4_64/x64/tdsieve-from-sched.asm
trunk/src/experimental/lasieve4_64/x64/tdslinie.asm
trunk/src/experimental/lasieve4_64/x64/tdslinie1.asm
trunk/src/experimental/lasieve4_64/x64/tdslinie2.asm
trunk/src/experimental/lasieve4_64/x64/tdslinie3.asm
trunk/src/experimental/lasieve4_64/x64/zeit.c
trunk/src/experimental/lasieve4_64/x64/zeit.h
Added: trunk/build.vc10/lasieve.exp/lasieve.exp.sln
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve.exp.sln (rev 0)
+++ trunk/build.vc10/lasieve.exp/lasieve.exp.sln 2011-02-02 11:14:45 UTC (rev 407)
@@ -0,0 +1,90 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblasieve", "liblasieve\liblasieve.vcxproj", "{6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblasieveI11", "liblasieveI11\liblasieveI11.vcxproj", "{BAF749BD-63E0-437A-B229-6B5A3F570E6A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lasieve4I11e", "lasieve4I11e\lasieve4I11e.vcxproj", "{451C3388-7276-48A1-A336-B2C4DE3C588A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2} = {6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2}
+ {BAF749BD-63E0-437A-B229-6B5A3F570E6A} = {BAF749BD-63E0-437A-B229-6B5A3F570E6A}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblasieveI12", "liblasieveI12\liblasieveI12.vcxproj", "{ECDAC80B-B64E-4B85-AD65-1B9CE8EDB501}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblasieveI13", "liblasieveI13\liblasieveI13.vcxproj", "{9796AF90-3B2F-470F-BDFA-C8AA336594B8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblasieveI14", "liblasieveI14\liblasieveI14.vcxproj", "{36E21BAD-4C26-4C28-9829-2DA09A411FFB}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblasieveI15", "liblasieveI15\liblasieveI15.vcxproj", "{0E6599B1-F8AD-4997-80C9-4E0213E7B326}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblasieveI16", "liblasieveI16\liblasieveI16.vcxproj", "{C215C705-0613-4E32-ABCA-645EC7A0EF9B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lasieve4I12e", "lasieve4I12e\lasieve4I12e.vcxproj", "{BBCFB293-3606-4549-9176-0AF516F84BAC}"
+ ProjectSection(ProjectDependencies) = postProject
+ {ECDAC80B-B64E-4B85-AD65-1B9CE8EDB501} = {ECDAC80B-B64E-4B85-AD65-1B9CE8EDB501}
+ {6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2} = {6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lasieve4I13e", "lasieve4I13e\lasieve4I13e.vcxproj", "{DD4C5F19-1F05-494B-8F12-C4A70444293C}"
+ ProjectSection(ProjectDependencies) = postProject
+ {6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2} = {6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2}
+ {9796AF90-3B2F-470F-BDFA-C8AA336594B8} = {9796AF90-3B2F-470F-BDFA-C8AA336594B8}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lasieve4I14e", "lasieve4I14e\lasieve4I14e.vcxproj", "{BA608E82-06A5-46C5-B0E2-60ED71F38DC4}"
+ ProjectSection(ProjectDependencies) = postProject
+ {6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2} = {6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2}
+ {36E21BAD-4C26-4C28-9829-2DA09A411FFB} = {36E21BAD-4C26-4C28-9829-2DA09A411FFB}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lasieve4I15e", "lasieve4I15e\lasieve4I15e.vcxproj", "{379879A2-FB3D-4A0E-B3FD-94EFE9D035EE}"
+ ProjectSection(ProjectDependencies) = postProject
+ {6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2} = {6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2}
+ {0E6599B1-F8AD-4997-80C9-4E0213E7B326} = {0E6599B1-F8AD-4997-80C9-4E0213E7B326}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lasieve4I16e", "lasieve4I16e\lasieve4I16e.vcxproj", "{3E382630-1512-4975-B165-1CC2F6E0F407}"
+ ProjectSection(ProjectDependencies) = postProject
+ {C215C705-0613-4E32-ABCA-645EC7A0EF9B} = {C215C705-0613-4E32-ABCA-645EC7A0EF9B}
+ {6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2} = {6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2}
+ EndProjectSection
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|x64 = Debug|x64
+ Release|x64 = Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2}.Debug|x64.ActiveCfg = Debug|x64
+ {6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2}.Release|x64.ActiveCfg = Release|x64
+ {BAF749BD-63E0-437A-B229-6B5A3F570E6A}.Debug|x64.ActiveCfg = Debug|x64
+ {BAF749BD-63E0-437A-B229-6B5A3F570E6A}.Release|x64.ActiveCfg = Release|x64
+ {451C3388-7276-48A1-A336-B2C4DE3C588A}.Debug|x64.ActiveCfg = Debug|x64
+ {451C3388-7276-48A1-A336-B2C4DE3C588A}.Release|x64.ActiveCfg = Release|x64
+ {ECDAC80B-B64E-4B85-AD65-1B9CE8EDB501}.Debug|x64.ActiveCfg = Debug|x64
+ {ECDAC80B-B64E-4B85-AD65-1B9CE8EDB501}.Release|x64.ActiveCfg = Release|x64
+ {9796AF90-3B2F-470F-BDFA-C8AA336594B8}.Debug|x64.ActiveCfg = Debug|x64
+ {9796AF90-3B2F-470F-BDFA-C8AA336594B8}.Release|x64.ActiveCfg = Release|x64
+ {36E21BAD-4C26-4C28-9829-2DA09A411FFB}.Debug|x64.ActiveCfg = Debug|x64
+ {36E21BAD-4C26-4C28-9829-2DA09A411FFB}.Release|x64.ActiveCfg = Release|x64
+ {0E6599B1-F8AD-4997-80C9-4E0213E7B326}.Debug|x64.ActiveCfg = Debug|x64
+ {0E6599B1-F8AD-4997-80C9-4E0213E7B326}.Release|x64.ActiveCfg = Release|x64
+ {C215C705-0613-4E32-ABCA-645EC7A0EF9B}.Debug|x64.ActiveCfg = Debug|x64
+ {C215C705-0613-4E32-ABCA-645EC7A0EF9B}.Release|x64.ActiveCfg = Release|x64
+ {BBCFB293-3606-4549-9176-0AF516F84BAC}.Debug|x64.ActiveCfg = Debug|x64
+ {BBCFB293-3606-4549-9176-0AF516F84BAC}.Release|x64.ActiveCfg = Release|x64
+ {DD4C5F19-1F05-494B-8F12-C4A70444293C}.Debug|x64.ActiveCfg = Debug|x64
+ {DD4C5F19-1F05-494B-8F12-C4A70444293C}.Release|x64.ActiveCfg = Release|x64
+ {BA608E82-06A5-46C5-B0E2-60ED71F38DC4}.Debug|x64.ActiveCfg = Debug|x64
+ {BA608E82-06A5-46C5-B0E2-60ED71F38DC4}.Release|x64.ActiveCfg = Release|x64
+ {379879A2-FB3D-4A0E-B3FD-94EFE9D035EE}.Debug|x64.ActiveCfg = Debug|x64
+ {379879A2-FB3D-4A0E-B3FD-94EFE9D035EE}.Release|x64.ActiveCfg = Release|x64
+ {3E382630-1512-4975-B165-1CC2F6E0F407}.Debug|x64.ActiveCfg = Debug|x64
+ {3E382630-1512-4975-B165-1CC2F6E0F407}.Release|x64.ActiveCfg = Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Added: trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj (rev 0)
+++ trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj 2011-02-02 11:14:45 UTC (rev 407)
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{451C3388-7276-48A1-A336-B2C4DE3C588A}</ProjectGuid>
+ <Keyword>Win32Proj</Keyword>
+ <RootNamespace>lasieve4I11e</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <LinkIncremental>true</LinkIncremental>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <LinkIncremental>false</LinkIncremental>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;I_bits=11;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI11.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;I_bits=11;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI11.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\fbgen.c" />
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\gmp-aux.c" />
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\gnfs-lasieve4e.c" />
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\if.c" />
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\input-poly.c" />
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\lasieve-prepn.c" />
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\mpqs.c" />
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\mpz-ull.c" />
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\primgen32.c" />
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\real-poly-aux.c" />
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\recurrence6.c" />
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\redu2.c" />
+ <ClCompile Include="..\..\asprintf.c" />
+ <ClCompile Include="..\..\fnmatch.c" />
+ <ClCompile Include="..\..\getline.c" />
+ <ClCompile Include="..\..\getopt.c" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h" />
+ <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\gmp.h" />
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h" />
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h" />
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h" />
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\siever-config.h" />
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\fbgen.h" />
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\gmp-aux.h" />
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\lasieve-prepn.h" />
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\primgen32.h" />
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\real-poly-aux.h" />
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\recurrence6.h" />
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\redu2.h" />
+ <ClInclude Include="..\..\fnmatch.h" />
+ <ClInclude Include="..\..\getline.h" />
+ <ClInclude Include="..\..\getopt.h" />
+ <ClInclude Include="..\..\unistd.h" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
Added: trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj.filters
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj.filters (rev 0)
+++ trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj.filters 2011-02-02 11:14:45 UTC (rev 407)
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\fbgen.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\gmp-aux.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\gnfs-lasieve4e.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\input-poly.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\lasieve-prepn.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\mpqs.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\mpz-ull.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\primgen32.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\recurrence6.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\redu2.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\real-poly-aux.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\fnmatch.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\getline.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\getopt.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\if.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\asprintf.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\fbgen.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\fnmatch.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\getline.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\gmp-aux.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\lasieve-prepn.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\primgen32.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\real-poly-aux.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\recurrence6.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\redu2.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\unistd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+</Project>
\ No newline at end of file
Added: trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I11e.vcxproj.filters
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I11e.vcxproj.filters (rev 0)
+++ trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I11e.vcxproj.filters 2011-02-02 11:14:45 UTC (rev 407)
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\fbgen.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\gmp-aux.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\gnfs-lasieve4e.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\input-poly.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\lasieve-prepn.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\mpqs.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\mpz-ull.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\primgen32.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\recurrence6.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\redu2.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\real-poly-aux.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\fnmatch.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\getline.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\getopt.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\if.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\asprintf.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\fbgen.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\fnmatch.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\getline.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\gmp-aux.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\lasieve-prepn.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\primgen32.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\real-poly-aux.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\recurrence6.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\redu2.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\unistd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+</Project>
\ No newline at end of file
Added: trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj (rev 0)
+++ trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj 2011-02-02 11:14:45 UTC (rev 407)
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{BBCFB293-3606-4549-9176-0AF516F84BAC}</ProjectGuid>
+ <Keyword>Win32Proj</Keyword>
+ <RootNamespace>lasieve4I11e</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <LinkIncremental>true</LinkIncremental>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <LinkIncremental>true</LinkIncremental>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <LinkIncremental>false</LinkIncremental>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <LinkIncremental>false</LinkIncremental>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;I_bits=12;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;I_bits=12;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI12.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;I_bits=12;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;I_bits=12;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI12.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\fbgen.c" />
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\gmp-aux.c" />
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\gnfs-lasieve4e.c" />
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\if.c" />
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\input-poly.c" />
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\lasieve-prepn.c" />
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\mpqs.c" />
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\mpz-ull.c" />
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\primgen32.c" />
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\real-poly-aux.c" />
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\recurrence6.c" />
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\redu2.c" />
+ <ClCompile Include="..\..\asprintf.c" />
+ <ClCompile Include="..\..\fnmatch.c" />
+ <ClCompile Include="..\..\getline.c" />
+ <ClCompile Include="..\..\getopt.c" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h" />
+ <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\gmp.h" />
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h" />
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h" />
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h" />
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\siever-config.h" />
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\fbgen.h" />
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\gmp-aux.h" />
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\lasieve-prepn.h" />
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\primgen32.h" />
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\real-poly-aux.h" />
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\recurrence6.h" />
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\redu2.h" />
+ <ClInclude Include="..\..\fnmatch.h" />
+ <ClInclude Include="..\..\getline.h" />
+ <ClInclude Include="..\..\getopt.h" />
+ <ClInclude Include="..\..\unistd.h" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
Added: trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj (rev 0)
+++ trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj 2011-02-02 11:14:45 UTC (rev 407)
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{DD4C5F19-1F05-494B-8F12-C4A70444293C}</ProjectGuid>
+ <Keyword>Win32Proj</Keyword>
+ <RootNamespace>lasieve4I11e</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <LinkIncremental>true</LinkIncremental>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <LinkIncremental>true</LinkIncremental>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <LinkIncremental>false</LinkIncremental>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <LinkIncremental>false</LinkIncremental>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;I_bits=13;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;I_bits=13;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI13.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;I_bits=13;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;I_bits=13;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI13.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\fbgen.c" />
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\gmp-aux.c" />
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\gnfs-lasieve4e.c" />
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\if.c" />
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\input-poly.c" />
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\lasieve-prepn.c" />
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\mpqs.c" />
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\mpz-ull.c" />
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\primgen32.c" />
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\real-poly-aux.c" />
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\recurrence6.c" />
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\redu2.c" />
+ <ClCompile Include="..\..\asprintf.c" />
+ <ClCompile Include="..\..\fnmatch.c" />
+ <ClCompile Include="..\..\getline.c" />
+ <ClCompile Include="..\..\getopt.c" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h" />
+ <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\gmp.h" />
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h" />
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h" />
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h" />
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\siever-config.h" />
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\fbgen.h" />
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\gmp-aux.h" />
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\lasieve-prepn.h" />
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\primgen32.h" />
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\real-poly-aux.h" />
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\recurrence6.h" />
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\redu2.h" />
+ <ClInclude Include="..\..\fnmatch.h" />
+ <ClInclude Include="..\..\getline.h" />
+ <ClInclude Include="..\..\getopt.h" />
+ <ClInclude Include="..\..\unistd.h" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
Added: trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj.filters
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj.filters (rev 0)
+++ trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj.filters 2011-02-02 11:14:45 UTC (rev 407)
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\fbgen.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\gmp-aux.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\gnfs-lasieve4e.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\input-poly.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\lasieve-prepn.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\mpqs.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\mpz-ull.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\primgen32.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\recurrence6.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\redu2.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\real-poly-aux.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\fnmatch.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\getline.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\getopt.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\experimental\lasieve4_64\if.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\asprintf.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\fbgen.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\fnmatch.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\getline.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\gmp-aux.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\lasieve-prepn.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\primgen32.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\real-poly-aux.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\recurrence6.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\redu2.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\unistd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+</Project>
\ No newline at end of file
Added: trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj (rev 0)
+++ trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj 2011-02-02 11:14:45 UTC (rev 407)
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{BA608E82-06A5-46C5-B0E2-60ED71F38DC4}</ProjectGuid>
+ <Keyword>Win32Proj</Keyword>
+ <RootNamespace>lasieve4I11e</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalA...
[truncated message content] |
|
From: <brg...@us...> - 2011-01-16 16:46:08
|
Revision: 406
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=406&view=rev
Author: brgladman
Date: 2011-01-16 16:45:59 +0000 (Sun, 16 Jan 2011)
Log Message:
-----------
1. remove bug from lattice sieve code
2. Improve Visual Studio 2010 build files
Modified Paths:
--------------
trunk/build.vc10/ggnfslib/ggnfslib.vcxproj
trunk/build.vc10/ggnfslib/ggnfslib.vcxproj.filters
trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj
trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj.filters
trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj
trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj.filters
trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj
trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj.filters
trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj
trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj.filters
trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj
trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj.filters
trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj
trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj.filters
trunk/build.vc10/makefb/makefb.vcxproj
trunk/build.vc10/matbuild/matbuild.vcxproj
trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj
trunk/build.vc10/matprune/matprune.vcxproj
trunk/build.vc10/matsolve/matsolve.vcxproj
trunk/build.vc10/pol51m0b/pol51m0b.vcxproj
trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj
trunk/build.vc10/pol51m0n/pol51m0n.vcxproj
trunk/build.vc10/pol51opt/pol51opt.vcxproj
trunk/build.vc10/pol51optx/pol51optx.vcxproj
trunk/build.vc10/polyselect/polyselect.vcxproj
trunk/build.vc10/procrels/procrels.vcxproj
trunk/build.vc10/sieve/sieve.vcxproj
trunk/build.vc10/sqrt/sqrt.vcxproj
trunk/src/if.h
trunk/src/lasieve4/gnfs-lasieve4e.c
Removed Paths:
-------------
trunk/build.vc10/mp_lib.vsprops
Modified: trunk/build.vc10/ggnfslib/ggnfslib.vcxproj
===================================================================
--- trunk/build.vc10/ggnfslib/ggnfslib.vcxproj 2011-01-15 11:32:39 UTC (rev 405)
+++ trunk/build.vc10/ggnfslib/ggnfslib.vcxproj 2011-01-16 16:45:59 UTC (rev 406)
@@ -46,19 +46,15 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\mp_lib.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\mp_lib.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\mp_lib.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\mp_lib.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -82,8 +78,8 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -117,8 +113,8 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;_LIB;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_DEBUG;_LIB;WIN64;__x86_64__;GGNFS_HOST_GENERIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -149,8 +145,8 @@
<ClCompile>
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
<PrecompiledHeader>
@@ -163,7 +159,6 @@
</ClCompile>
<Lib>
<AdditionalDependencies>..\..\..\mpir\build.vc10\lib\$(IntDir)mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
<PostBuildEvent>
<Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
@@ -184,8 +179,8 @@
<ClCompile>
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;_LIB;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>NDEBUG;_LIB;WIN64;__x86_64__;GGNFS_HOST_GENERIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
<PrecompiledHeader>
@@ -198,7 +193,6 @@
</ClCompile>
<Lib>
<AdditionalDependencies>..\..\..\mpir\build.vc10\lib\$(IntDir)mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
<PostBuildEvent>
<Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
@@ -260,10 +254,6 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\include\ggnfs.h" />
- <ClInclude Include="..\..\..\include-extra\gmp-impl.h" />
- <ClInclude Include="..\..\..\include-extra\gmp-mparam.h" />
- <ClInclude Include="..\..\..\include-extra\gmp.h" />
- <ClInclude Include="..\..\..\include-extra\longlong.h" />
<ClInclude Include="..\..\..\include\prand.h" />
<ClInclude Include="..\..\..\include\version.h" />
</ItemGroup>
Modified: trunk/build.vc10/ggnfslib/ggnfslib.vcxproj.filters
===================================================================
--- trunk/build.vc10/ggnfslib/ggnfslib.vcxproj.filters 2011-01-15 11:32:39 UTC (rev 405)
+++ trunk/build.vc10/ggnfslib/ggnfslib.vcxproj.filters 2011-01-16 16:45:59 UTC (rev 406)
@@ -82,18 +82,6 @@
<ClInclude Include="..\..\..\include\ggnfs.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\include-extra\gmp-impl.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\include-extra\gmp-mparam.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\include-extra\gmp.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\include-extra\longlong.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\include\prand.h">
<Filter>Header Files</Filter>
</ClInclude>
Modified: trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj 2011-01-15 11:32:39 UTC (rev 405)
+++ trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj 2011-01-16 16:45:59 UTC (rev 406)
@@ -46,19 +46,15 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\mp_lib.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\mp_lib.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\mp_lib.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\mp_lib.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -88,7 +84,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;I_bits=11;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -105,7 +101,7 @@
<EnablePREfast>true</EnablePREfast>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)latsieve12.pdb</ProgramDatabaseFile>
<GenerateMapFile>true</GenerateMapFile>
@@ -134,7 +130,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;I_bits=11;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -149,7 +145,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)latsieve12.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
@@ -178,7 +174,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;I_bits=11;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -191,7 +187,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -220,7 +216,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;I_bits=11;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -233,7 +229,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
Modified: trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj.filters
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj.filters 2011-01-15 11:32:39 UTC (rev 405)
+++ trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj.filters 2011-01-16 16:45:59 UTC (rev 406)
@@ -4,12 +4,6 @@
<Filter Include="Source Files">
<UniqueIdentifier>{ec509471-8a5b-42c3-8050-2dedca99eb32}</UniqueIdentifier>
</Filter>
- <Filter Include="Source Files\ppc32">
- <UniqueIdentifier>{d298c68b-d31f-407f-a809-9c8693466443}</UniqueIdentifier>
- </Filter>
- <Filter Include="Source Files\piii">
- <UniqueIdentifier>{e1867402-924e-4090-bd52-6fa539181071}</UniqueIdentifier>
- </Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{ccb02597-f868-4449-83eb-ca1fd26969fe}</UniqueIdentifier>
</Filter>
@@ -18,43 +12,111 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\src\lasieve4\gmp-aux.c" />
- <ClCompile Include="..\..\src\lasieve4\gnfs-lasieve4e.c" />
- <ClCompile Include="..\..\src\lasieve4\input-poly.c" />
- <ClCompile Include="..\..\src\lasieve4\lasieve-prepn.c" />
- <ClCompile Include="..\..\src\lasieve4\mpqs.c" />
- <ClCompile Include="..\..\src\lasieve4\prho.c" />
- <ClCompile Include="..\..\src\lasieve4\primgen32.c" />
- <ClCompile Include="..\..\src\lasieve4\real-poly-aux.c" />
- <ClCompile Include="..\..\src\lasieve4\recurrence6.c" />
- <ClCompile Include="..\..\src\lasieve4\redu2.c" />
- <ClCompile Include="..\..\src\lasieve4\ppc32\gcd32.c" />
- <ClCompile Include="..\..\src\lasieve4\ppc32\lasched.c" />
- <ClCompile Include="..\..\src\lasieve4\ppc32\medsched.c" />
- <ClCompile Include="..\..\src\lasieve4\ppc32\modinv32.c" />
- <ClCompile Include="..\..\src\lasieve4\ppc32\psp.c" />
- <ClCompile Include="..\..\src\lasieve4\piii\basemath.c" />
- <ClCompile Include="..\..\src\lasieve4\piii\gcd32.c" />
- <ClCompile Include="..\..\src\lasieve4\piii\lasched.c" />
- <ClCompile Include="..\..\src\lasieve4\piii\medsched.c" />
- <ClCompile Include="..\..\src\lasieve4\piii\montgomery_mul.c" />
- <ClCompile Include="..\..\src\lasieve4\piii\psp.c" />
- <ClCompile Include="..\..\src\lasieve4\piii\siever-config.c" />
+ <ClCompile Include="..\..\src\lasieve4\piii\basemath.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\mpqs.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\piii\gcd32.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\ppc32\gcd32.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\gmp-aux.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\gnfs-lasieve4e.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\input-poly.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\piii\lasched.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\ppc32\lasched.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\lasieve-prepn.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\ppc32\medsched.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\piii\medsched.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\ppc32\modinv32.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\piii\montgomery_mul.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\prho.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\primgen32.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\ppc32\psp.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\piii\psp.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\real-poly-aux.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\recurrence6.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\redu2.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\piii\siever-config.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\..\src\if.h" />
- <ClInclude Include="..\..\src\lasieve4\lasieve.h" />
- <ClInclude Include="..\..\src\lasieve4\piii\siever-config.h" />
+ <ClInclude Include="..\..\src\if.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\lasieve.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\piii\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
- <YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm" />
- <YASM Include="..\..\src\lasieve4\piii\asm_mul64.asm" />
- <YASM Include="..\..\src\lasieve4\piii\asm_mul96.asm" />
- <YASM Include="..\..\src\lasieve4\piii\modinv1002.asm" />
- <YASM Include="..\..\src\lasieve4\piii\mpqs_eval.asm" />
- <YASM Include="..\..\src\lasieve4\piii\mpqs_sieve.asm" />
- <YASM Include="..\..\src\lasieve4\piii\mpqs_td.asm" />
- <YASM Include="..\..\src\lasieve4\piii\ri-aux.asm" />
- <YASM Include="..\..\src\lasieve4\piii\sieve-from-sched.asm" />
+ <YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm">
+ <Filter>Assembler Files</Filter>
+ </YASM>
+ <YASM Include="..\..\src\lasieve4\piii\asm_mul64.asm">
+ <Filter>Assembler Files</Filter>
+ </YASM>
+ <YASM Include="..\..\src\lasieve4\piii\asm_mul96.asm">
+ <Filter>Assembler Files</Filter>
+ </YASM>
+ <YASM Include="..\..\src\lasieve4\piii\modinv1002.asm">
+ <Filter>Source Files</Filter>
+ </YASM>
+ <YASM Include="..\..\src\lasieve4\piii\mpqs_eval.asm">
+ <Filter>Assembler Files</Filter>
+ </YASM>
+ <YASM Include="..\..\src\lasieve4\piii\mpqs_sieve.asm">
+ <Filter>Assembler Files</Filter>
+ </YASM>
+ <YASM Include="..\..\src\lasieve4\piii\mpqs_td.asm">
+ <Filter>Assembler Files</Filter>
+ </YASM>
+ <YASM Include="..\..\src\lasieve4\piii\ri-aux.asm">
+ <Filter>Assembler Files</Filter>
+ </YASM>
+ <YASM Include="..\..\src\lasieve4\piii\sieve-from-sched.asm">
+ <Filter>Assembler Files</Filter>
+ </YASM>
</ItemGroup>
</Project>
\ No newline at end of file
Modified: trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj 2011-01-15 11:32:39 UTC (rev 405)
+++ trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj 2011-01-16 16:45:59 UTC (rev 406)
@@ -46,19 +46,15 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\mp_lib.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\mp_lib.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\mp_lib.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\mp_lib.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -88,7 +84,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;I_bits=12;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -105,7 +101,7 @@
<EnablePREfast>true</EnablePREfast>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)latsieve12.pdb</ProgramDatabaseFile>
<GenerateMapFile>true</GenerateMapFile>
@@ -134,7 +130,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;I_bits=12;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -149,7 +145,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)latsieve12.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
@@ -178,7 +174,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;I_bits=12;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -191,7 +187,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -220,7 +216,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;I_bits=12;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -233,7 +229,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
Modified: trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj.filters
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj.filters 2011-01-15 11:32:39 UTC (rev 405)
+++ trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj.filters 2011-01-16 16:45:59 UTC (rev 406)
@@ -4,12 +4,6 @@
<Filter Include="Source Files">
<UniqueIdentifier>{c1bec2b5-f7a6-41fb-bac4-911efc1841cc}</UniqueIdentifier>
</Filter>
- <Filter Include="Source Files\ppc32">
- <UniqueIdentifier>{f8b12490-77e6-463a-9894-d728d575f1a1}</UniqueIdentifier>
- </Filter>
- <Filter Include="Source Files\piii">
- <UniqueIdentifier>{30a51b84-65d1-4b08-bab8-fb63d3d7435e}</UniqueIdentifier>
- </Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{08fa945e-65aa-4759-a5d0-fcdf95326e46}</UniqueIdentifier>
</Filter>
@@ -18,43 +12,111 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\src\lasieve4\gmp-aux.c" />
- <ClCompile Include="..\..\src\lasieve4\gnfs-lasieve4e.c" />
- <ClCompile Include="..\..\src\lasieve4\input-poly.c" />
- <ClCompile Include="..\..\src\lasieve4\lasieve-prepn.c" />
- <ClCompile Include="..\..\src\lasieve4\mpqs.c" />
- <ClCompile Include="..\..\src\lasieve4\prho.c" />
- <ClCompile Include="..\..\src\lasieve4\primgen32.c" />
- <ClCompile Include="..\..\src\lasieve4\real-poly-aux.c" />
- <ClCompile Include="..\..\src\lasieve4\recurrence6.c" />
- <ClCompile Include="..\..\src\lasieve4\redu2.c" />
- <ClCompile Include="..\..\src\lasieve4\ppc32\gcd32.c" />
- <ClCompile Include="..\..\src\lasieve4\ppc32\lasched.c" />
- <ClCompile Include="..\..\src\lasieve4\ppc32\medsched.c" />
- <ClCompile Include="..\..\src\lasieve4\ppc32\modinv32.c" />
- <ClCompile Include="..\..\src\lasieve4\ppc32\psp.c" />
- <ClCompile Include="..\..\src\lasieve4\piii\basemath.c" />
- <ClCompile Include="..\..\src\lasieve4\piii\gcd32.c" />
- <ClCompile Include="..\..\src\lasieve4\piii\lasched.c" />
- <ClCompile Include="..\..\src\lasieve4\piii\medsched.c" />
- <ClCompile Include="..\..\src\lasieve4\piii\montgomery_mul.c" />
- <ClCompile Include="..\..\src\lasieve4\piii\psp.c" />
- <ClCompile Include="..\..\src\lasieve4\piii\siever-config.c" />
+ <ClCompile Include="..\..\src\lasieve4\piii\basemath.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\piii\siever-config.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\piii\gcd32.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\ppc32\gcd32.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\gmp-aux.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\gnfs-lasieve4e.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\input-poly.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\ppc32\lasched.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\piii\lasched.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\lasieve-prepn.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\ppc32\medsched.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\piii\medsched.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\ppc32\modinv32.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\piii\montgomery_mul.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\mpqs.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\prho.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\primgen32.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\ppc32\psp.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\piii\psp.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\real-poly-aux.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\recurrence6.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\redu2.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\..\src\if.h" />
- <ClInclude Include="..\..\src\lasieve4\lasieve.h" />
- <ClInclude Include="..\..\src\lasieve4\piii\siever-config.h" />
+ <ClInclude Include="..\..\src\if.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\piii\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\lasieve.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
- <YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm" />
- <YASM Include="..\..\src\lasieve4\piii\asm_mul64.asm" />
- <YASM Include="..\..\src\lasieve4\piii\asm_mul96.asm" />
- <YASM Include="..\..\src\lasieve4\piii\modinv1002.asm" />
- <YASM Include="..\..\src\lasieve4\piii\mpqs_eval.asm" />
- <YASM Include="..\..\src\lasieve4\piii\mpqs_sieve.asm" />
- <YASM Include="..\..\src\lasieve4\piii\mpqs_td.asm" />
- <YASM Include="..\..\src\lasieve4\piii\ri-aux.asm" />
- <YASM Include="..\..\src\lasieve4\piii\sieve-from-sched.asm" />
+ <YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm">
+ <Filter>Assembler Files</Filter>
+ </YASM>
+ <YASM Include="..\..\src\lasieve4\piii\asm_mul64.asm">
+ <Filter>Assembler Files</Filter>
+ </YASM>
+ <YASM Include="..\..\src\lasieve4\piii\asm_mul96.asm">
+ <Filter>Assembler Files</Filter>
+ </YASM>
+ <YASM Include="..\..\src\lasieve4\piii\mpqs_eval.asm">
+ <Filter>Assembler Files</Filter>
+ </YASM>
+ <YASM Include="..\..\src\lasieve4\piii\mpqs_sieve.asm">
+ <Filter>Assembler Files</Filter>
+ </YASM>
+ <YASM Include="..\..\src\lasieve4\piii\mpqs_td.asm">
+ <Filter>Assembler Files</Filter>
+ </YASM>
+ <YASM Include="..\..\src\lasieve4\piii\sieve-from-sched.asm">
+ <Filter>Assembler Files</Filter>
+ </YASM>
+ <YASM Include="..\..\src\lasieve4\piii\ri-aux.asm">
+ <Filter>Assembler Files</Filter>
+ </YASM>
+ <YASM Include="..\..\src\lasieve4\piii\modinv1002.asm">
+ <Filter>Assembler Files</Filter>
+ </YASM>
</ItemGroup>
</Project>
\ No newline at end of file
Modified: trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj 2011-01-15 11:32:39 UTC (rev 405)
+++ trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj 2011-01-16 16:45:59 UTC (rev 406)
@@ -46,19 +46,15 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\mp_lib.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\mp_lib.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\mp_lib.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\mp_lib.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -88,7 +84,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;I_bits=13;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -102,7 +98,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)latsieve13.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
@@ -130,7 +126,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;I_bits=13;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -144,7 +140,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)latsieve13.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
@@ -172,7 +168,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;I_bits=13;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -185,7 +181,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -214,7 +210,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;I_bits=13;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -227,7 +223,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
Modified: trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj.filters
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj.filters 2011-01-15 11:32:39 UTC (rev 405)
+++ trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj.filters 2011-01-16 16:45:59 UTC (rev 406)
@@ -4,12 +4,6 @@
<Filter Include="Source Files">
<UniqueIdentifier>{002a4ddd-08b0-4421-8390-a99379bdfa66}</UniqueIdentifier>
</Filter>
- <Filter Include="Source Files\ppc32">
- <UniqueIdentifier>{f44aa03d-b6e4-4247-b497-7dc30ae6c548}</UniqueIdentifier>
- </Filter>
- <Filter Include="Source Files\piii">
- <UniqueIdentifier>{dc7a6586-3752-4811-9e6c-fcd122ea2557}</UniqueIdentifier>
- </Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{66c87244-cb1b-4d58-a3df-6af50512efc3}</UniqueIdentifier>
</Filter>
@@ -18,46 +12,114 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\src\lasieve4\gmp-aux.c" />
- <ClCompile Include="..\..\src\lasieve4\gnfs-lasieve4e.c" />
- <ClCompile Include="..\..\src\lasieve4\input-poly.c" />
- <ClCompile Include="..\..\src\lasieve4\lasieve-prepn.c" />
- <ClCompile Include="..\..\src\lasieve4\mpqs.c" />
- <ClCompile Include="..\..\src\lasieve4\prho.c" />
- <ClCompile Include="..\..\src\lasieve4\primgen32.c" />
- <ClCompile Include="..\..\src\lasieve4\real-poly-aux.c" />
- <ClCompile Include="..\..\src\lasieve4\recurrence6.c" />
- <ClCompile Include="..\..\src\lasieve4\redu2.c" />
- <ClCompile Include="..\..\src\lasieve4\ppc32\gcd32.c" />
- <ClCompile Include="..\..\src\lasieve4\ppc32\lasched.c" />
- <ClCompile Include="..\..\src\lasieve4\ppc32\medsched.c" />
- <ClCompile Include="..\..\src\lasieve4\ppc32\modinv32.c" />
- <ClCompile Include="..\..\src\lasieve4\ppc32\psp.c" />
- <ClCompile Include="..\..\src\lasieve4\piii\basemath.c" />
- <ClCompile Include="..\..\src\lasieve4\piii\gcd32.c" />
- <ClCompile Include="..\..\src\lasieve4\piii\lasched.c" />
- <ClCompile Include="..\..\src\lasieve4\piii\medsched.c" />
- <ClCompile Include="..\..\src\lasieve4\piii\montgomery_mul.c" />
- <ClCompile Include="..\..\src\lasieve4\piii\psp.c" />
- <ClCompile Include="..\..\src\lasieve4\piii\siever-config.c" />
+ <ClCompile Include="..\..\src\lasieve4\piii\basemath.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\piii\siever-config.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\ppc32\gcd32.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\piii\gcd32.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\gmp-aux.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\gnfs-lasieve4e.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\input-poly.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\ppc32\lasched.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\piii\lasched.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\lasieve-prepn.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\ppc32\medsched.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\piii\medsched.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\ppc32\modinv32.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\piii\montgomery_mul.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\mpqs.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\prho.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\primgen32.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\ppc32\psp.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\piii\psp.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\real-poly-aux.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\recurrence6.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\redu2.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\if.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\src\lasieve4\generic\32bit.h" />
- <ClInclude Include="..\..\src\lasieve4\lasieve.h" />
- <ClInclude Include="..\..\src\lasieve4\piii\siever-config.h" />
+ <ClInclude Include="..\..\src\lasieve4\lasieve.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\piii\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\generic\32bit.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
- <YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm" />
- <YASM Include="..\..\src\lasieve4\piii\asm_mul64.asm" />
- <YASM Include="..\..\src\lasieve4\piii\asm_mul96.asm" />
- <YASM Include="..\..\src\lasieve4\piii\modinv1002.asm" />
- <YASM Include="..\..\src\lasieve4\piii\mpqs_eval.asm" />
- <YASM Include="..\..\src\lasieve4\piii\mpqs_sieve.asm" />
- <YASM Include="..\..\src\lasieve4\piii\mpqs_td.asm" />
- <YASM Include="..\..\src\lasieve4\piii\ri-aux.asm" />
- <YASM Include="..\..\src\lasieve4\piii\sieve-from-sched.asm" />
+ <YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm">
+ <Filter>Assembler Files</Filter>
+ </YASM>
+ <YASM Include="..\..\src\lasieve4\piii\asm_mul64.asm">
+ <Filter>Assembler Files</Filter>
+ </YASM>
+ <YASM Include="..\..\src\lasieve4\piii\asm_mul96.asm">
+ <Filter>Assembler Files</Filter>
+ </YASM>
+ <YASM Include="..\..\src\lasieve4\piii\mpqs_eval.asm">
+ <Filter>Assembler Files</Filter>
+ </YASM>
+ <YASM Include="..\..\src\lasieve4\piii\mpqs_sieve.asm">
+ <Filter>Assembler Files</Filter>
+ </YASM>
+ <YASM Include="..\..\src\lasieve4\piii\mpqs_td.asm">
+ <Filter>Assembler Files</Filter>
+ </YASM>
+ <YASM Include="..\..\src\lasieve4\piii\sieve-from-sched.asm">
+ <Filter>Assembler Files</Filter>
+ </YASM>
+ <YASM Include="..\..\src\lasieve4\piii\ri-aux.asm">
+ <Filter>Assembler Files</Filter>
+ </YASM>
+ <YASM Include="..\..\src\lasieve4\piii\modinv1002.asm">
+ <Filter>Assembler Files</Filter>
+ </YASM>
</ItemGroup>
</Project>
\ No newline at end of file
Modified: trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj 2011-01-15 11:32:39 UTC (rev 405)
+++ trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj 2011-01-16 16:45:59 UTC (rev 406)
@@ -46,19 +46,15 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\mp_lib.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\mp_lib.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\mp_lib.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\mp_lib.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -88,7 +84,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;I_bits=14;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -102,7 +98,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)latsieve14.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
@@ -130,7 +126,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;I_bits=14;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -144,7 +140,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)latsieve14.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
@@ -172,7 +168,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;I_bits=14;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -185,7 +181,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -214,7 +210,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;I_bits=14;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -227,7 +223,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
Modified: trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj.filters
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj.filters 2011-01-15 11:32:39 UTC (rev 405)
+++ trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj.filters 2011-01-16 16:45:59 UTC (rev 406)
@@ -4,12 +4,6 @@
<Filter Include="Source Files">
<UniqueIdentifier>{1dfb05ba-23d8-47a3-adb5-36682583afbe}</UniqueIdentifier>
</Filter>
- <Filter Include="Source Files\ppc32">
- <UniqueIdentifier>{4e17e032-9607-447c-9a1c-4b987946d1a3}</UniqueIdentifier>
- </Filter>
- <Filter Include="Source Files\piii">
- <UniqueIdentifier>{4bf812e8-51b9-42e2-8a1a-633a7ec8b209}</UniqueIdentifier>
- </Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{119e4b34-3895-444a-a1db-9eb0709d821f}</UniqueIdentifier>
</Filter>
@@ -18,46 +12,114 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\src\lasieve4\gmp-aux.c" />
- <ClCompile Include="..\..\src\lasieve4\gnfs-lasieve4e.c" />
- <ClCompile Include="..\..\src\lasieve4\input-poly.c" />
- <ClCompile Include="..\..\src\lasieve4\lasieve-prepn.c" />
- <ClCompile Include="..\..\src\lasieve4\mpqs.c" />
- <ClCompile Include="..\..\src\lasieve4\prho.c" />
- <ClCompile Include="..\..\src\lasieve4\primgen32.c" />
- <ClCompile Include="..\..\src\lasieve4\real-poly-aux.c" />
- <ClCompile Include="..\..\src\lasieve4\recurrence6.c" />
- <ClCompile Include="..\..\src\lasieve4\redu2.c" />
- <ClCompile Include="..\..\src\lasieve4\ppc32\gcd32.c" />
- <ClCompile Include="..\..\src\lasieve4\ppc32\lasched.c" />
- <ClCompile Include="..\..\src\lasieve4\ppc32\medsched.c" />
- <ClCompile Include="..\..\src\lasieve4\ppc32\modinv32.c" />
- <ClCompile Include="..\..\src\lasieve4\ppc32\psp.c" />
- <ClCompile Include="..\..\src\lasieve4\piii\basemath.c" />
- <ClCompile Include="..\..\src\lasieve4\piii\gcd32.c" />
- <ClCompile Include="..\..\src\lasieve4\piii\lasched.c" />
- <ClCompile Include="..\..\src\lasieve4\piii\medsched.c" />
- <ClCompile Include="..\..\src\lasieve4\piii\montgomery_mul.c" />
- <ClCompile Include="..\..\src\lasieve4\piii\psp.c" />
- <ClCompile Include="..\..\src\lasieve4\piii\siever-config.c" />
+ <ClCompile Include="..\..\src\lasieve4\piii\basemath.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\piii\medsched.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\ppc32\gcd32.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\piii\gcd32.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\gmp-aux.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\gnfs-lasieve4e.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\input-poly.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\ppc32\lasched.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\piii\lasched.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\lasieve-prepn.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\ppc32\medsched.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\ppc32\modinv32.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\piii\siever-config.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\piii\montgomery_mul.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\mpqs.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\prho.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\primgen32.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\ppc32\psp.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\piii\psp.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\real-poly-aux.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\lasieve4\recurrence6.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Inc...
[truncated message content] |
|
From: <brg...@us...> - 2011-01-15 11:32:46
|
Revision: 405
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=405&view=rev
Author: brgladman
Date: 2011-01-15 11:32:39 +0000 (Sat, 15 Jan 2011)
Log Message:
-----------
revert my two changes to the siever code
Modified Paths:
--------------
trunk/src/lasieve4/gnfs-lasieve4e.c
Modified: trunk/src/lasieve4/gnfs-lasieve4e.c
===================================================================
--- trunk/src/lasieve4/gnfs-lasieve4e.c 2011-01-15 10:13:47 UTC (rev 404)
+++ trunk/src/lasieve4/gnfs-lasieve4e.c 2011-01-15 11:32:39 UTC (rev 405)
@@ -2527,23 +2527,22 @@
#endif
#define TRY_RHO_ON_FAILURES
#ifdef TRY_RHO_ON_FAILURES
- nlp[s1] = 0;
{ unsigned long small_factors[10];
- nf = rho_factor(small_factors, large_factors[s1]);
- if(nf >= 1)
- {
- for (i = 0; i < nf; i++) {
- mpz_set_ui(large_primes[s1][i], small_factors[i]);
- if (mpz_sizeinbase(large_primes[s1][i],2) > max_primebits[s1]) {
- n_mpqsvain[s1]++;
- break;
- }
- }
- if (i >= nf)
- nlp[s1] = nf;
+ nf = rho_factor(small_factors, large_factors[s1]);
+ for (i = 0; i < nf; i++) {
+ mpz_set_ui(large_primes[s1][i], small_factors[i]);
+ if (mpz_sizeinbase(large_primes[s1][i],2) > max_primebits[s1]) {
+ n_mpqsvain[s1]++;
+ break;
+ }
}
+ if ((i >= nf) && (nf >= 1))
+ nlp[s1] = nf;
+ else { nlp[s1]=0; }
}
+#else
+ nlp[s1] = 0;
#endif
if (nlp[s1] == 0) {
/* did it fail on a square? */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <brg...@us...> - 2011-01-15 10:13:53
|
Revision: 404
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=404&view=rev
Author: brgladman
Date: 2011-01-15 10:13:47 +0000 (Sat, 15 Jan 2011)
Log Message:
-----------
correct earlier bug fix in the lattice sieve code
Modified Paths:
--------------
trunk/src/lasieve4/gnfs-lasieve4e.c
Modified: trunk/src/lasieve4/gnfs-lasieve4e.c
===================================================================
--- trunk/src/lasieve4/gnfs-lasieve4e.c 2011-01-15 09:02:27 UTC (rev 403)
+++ trunk/src/lasieve4/gnfs-lasieve4e.c 2011-01-15 10:13:47 UTC (rev 404)
@@ -2527,9 +2527,10 @@
#endif
#define TRY_RHO_ON_FAILURES
#ifdef TRY_RHO_ON_FAILURES
+ nlp[s1] = 0;
{ unsigned long small_factors[10];
- nf = rho_factor(small_factors, large_factors[s1]);
+ nf = rho_factor(small_factors, large_factors[s1]);
if(nf >= 1)
{
for (i = 0; i < nf; i++) {
@@ -2542,13 +2543,7 @@
if (i >= nf)
nlp[s1] = nf;
}
- else
- {
- nlp[s1] = 0;
- }
}
-#else
- nlp[s1] = 0;
#endif
if (nlp[s1] == 0) {
/* did it fail on a square? */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <brg...@us...> - 2011-01-15 09:02:33
|
Revision: 403
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=403&view=rev
Author: brgladman
Date: 2011-01-15 09:02:27 +0000 (Sat, 15 Jan 2011)
Log Message:
-----------
correct bug in lattice siever
Modified Paths:
--------------
trunk/src/lasieve4/gnfs-lasieve4e.c
Modified: trunk/src/lasieve4/gnfs-lasieve4e.c
===================================================================
--- trunk/src/lasieve4/gnfs-lasieve4e.c 2011-01-12 12:22:41 UTC (rev 402)
+++ trunk/src/lasieve4/gnfs-lasieve4e.c 2011-01-15 09:02:27 UTC (rev 403)
@@ -2530,16 +2530,22 @@
{ unsigned long small_factors[10];
nf = rho_factor(small_factors, large_factors[s1]);
- for (i = 0; i < nf; i++) {
- mpz_set_ui(large_primes[s1][i], small_factors[i]);
- if (mpz_sizeinbase(large_primes[s1][i],2) > max_primebits[s1]) {
- n_mpqsvain[s1]++;
- break;
- }
+ if(nf >= 1)
+ {
+ for (i = 0; i < nf; i++) {
+ mpz_set_ui(large_primes[s1][i], small_factors[i]);
+ if (mpz_sizeinbase(large_primes[s1][i],2) > max_primebits[s1]) {
+ n_mpqsvain[s1]++;
+ break;
+ }
+ }
+ if (i >= nf)
+ nlp[s1] = nf;
}
- if ((i >= nf) && (nf >= 1))
- nlp[s1] = nf;
- else { nlp[s1]=0; }
+ else
+ {
+ nlp[s1] = 0;
+ }
}
#else
nlp[s1] = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <brg...@us...> - 2011-01-12 12:22:48
|
Revision: 402
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=402&view=rev
Author: brgladman
Date: 2011-01-12 12:22:41 +0000 (Wed, 12 Jan 2011)
Log Message:
-----------
minor build update on Windows
Modified Paths:
--------------
trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj
Modified: trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj 2011-01-12 11:57:31 UTC (rev 401)
+++ trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj 2011-01-12 12:22:41 UTC (rev 402)
@@ -212,7 +212,7 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
- <Optimization>Disabled</Optimization>
+ <Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;I_bits=16;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <brg...@us...> - 2011-01-12 11:57:39
|
Revision: 401
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=401&view=rev
Author: brgladman
Date: 2011-01-12 11:57:31 +0000 (Wed, 12 Jan 2011)
Log Message:
-----------
Correct location of the GMP/MPIR header file
Modified Paths:
--------------
trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj
trunk/build.vc10/mp_lib.props
Removed Paths:
-------------
trunk/build.vc10/gmp.h
Deleted: trunk/build.vc10/gmp.h
===================================================================
--- trunk/build.vc10/gmp.h 2010-10-07 02:26:00 UTC (rev 400)
+++ trunk/build.vc10/gmp.h 2011-01-12 11:57:31 UTC (rev 401)
@@ -1,2187 +0,0 @@
-/* Definitions for GNU multiple precision functions. -*- mode: c -*-
-
-Copyright 1991, 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003,
-2004, 2005, 2006, 2007 Free Software Foundation, Inc.
-
-This file is part of the GNU MP Library.
-
-The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 3 of the License, or (at your
-option) any later version.
-
-The GNU MP Library is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with the GNU MP Library. If not, see http://www.gnu.org/licenses/. */
-
-#ifndef __GMP_H__
-
-#if defined (__cplusplus)
-#include <iosfwd> /* for std::istream, std::ostream, std::string */
-#endif
-
-
-#if ! defined (__GMP_WITHIN_CONFIGURE)
-# if defined( _MSC_VER )
-# if defined( _WIN64 )
-# define __GMP_BITS_PER_MP_LIMB 64
-# define GMP_LIMB_BITS 64
-# define SIZEOF_MP_LIMB_T 8
-# define _LONG_LONG_LIMB 1
-# elif defined( _WIN32 )
-# define __GMP_BITS_PER_MP_LIMB 32
-# define GMP_LIMB_BITS 32
-# define SIZEOF_MP_LIMB_T 4
-# ifdef _LONG_LONG_LIMB
-# undef _LONG_LONG_LIMB
-# endif
-# else
-# error This is the wrong version of gmp.h
-# endif
-# endif
-# define GMP_NAIL_BITS 0
-#endif
-#define GMP_NUMB_BITS (GMP_LIMB_BITS - GMP_NAIL_BITS)
-#define GMP_NUMB_MASK ((~ __GMP_CAST (mp_limb_t, 0)) >> GMP_NAIL_BITS)
-#define GMP_NUMB_MAX GMP_NUMB_MASK
-#define GMP_NAIL_MASK (~ GMP_NUMB_MASK)
-
-
-/* The following (everything under ifndef __GNU_MP__) must be identical in
- gmp.h and mp.h to allow both to be included in an application or during
- the library build. */
-#ifndef __GNU_MP__
-#define __GNU_MP__ 4
-
-#define __need_size_t /* tell gcc stddef.h we only want size_t */
-#if defined (__cplusplus)
-#include <cstddef> /* for size_t */
-#else
-#include <stddef.h> /* for size_t */
-#endif
-#undef __need_size_t
-
-
-
-/* __STDC__ - some ANSI compilers define this only to 0, hence the use of
- "defined" and not "__STDC__-0". In particular Sun workshop C 5.0
- sets __STDC__ to 0, but requires "##" for token pasting.
-
- _AIX - gnu ansidecl.h asserts that all known AIX compilers are ANSI but
- don't always define __STDC__.
-
- __DECC - current versions of DEC C (5.9 for instance) for alpha are ANSI,
- but don't define __STDC__ in their default mode. Don't know if old
- versions might have been K&R, but let's not worry about that unless
- someone is still using one.
-
- _mips - gnu ansidecl.h says the RISC/OS MIPS compiler is ANSI in SVR4
- mode, but doesn't define __STDC__.
-
- _MSC_VER - Microsoft C is ANSI, but __STDC__ is undefined unless the /Za
- option is given (in which case it's 1).
-
- _WIN32 - tested for by gnu ansidecl.h, no doubt on the assumption that
- all w32 compilers are ansi.
-
- Note: This same set of tests is used by gen-psqr.c and
- demos/expr/expr-impl.h, so if anything needs adding, then be sure to
- update those too. */
-
-#if defined (__STDC__) \
- || defined (__cplusplus) \
- || defined (_AIX) \
- || defined (__DECC) \
- || (defined (__mips) && defined (_SYSTYPE_SVR4)) \
- || defined (_MSC_VER) \
- || defined (_WIN32)
-#define __GMP_HAVE_CONST 1
-#define __GMP_HAVE_PROTOTYPES 1
-#define __GMP_HAVE_TOKEN_PASTE 1
-#else
-#define __GMP_HAVE_CONST 0
-#define __GMP_HAVE_PROTOTYPES 0
-#define __GMP_HAVE_TOKEN_PASTE 0
-#endif
-
-
-#if __GMP_HAVE_CONST
-#define __gmp_const const
-#define __gmp_signed signed
-#else
-#define __gmp_const
-#define __gmp_signed
-#endif
-
-
-/* __GMP_DECLSPEC supports Windows DLL versions of libgmp, and is empty in
- all other circumstances.
-
- When compiling objects for libgmp, __GMP_DECLSPEC is an export directive,
- or when compiling for an application it's an import directive. The two
- cases are differentiated by __GMP_WITHIN_GMP defined by the GMP Makefiles
- (and not defined from an application).
-
- __GMP_DECLSPEC_XX is similarly used for libgmpxx. __GMP_WITHIN_GMPXX
- indicates when building libgmpxx, and in that case libgmpxx functions are
- exports, but libgmp functions which might get called are imports.
-
- libmp.la uses __GMP_DECLSPEC, just as if it were libgmp.la. libgmp and
- libmp don't call each other, so there's no conflict or confusion.
-
- Libtool DLL_EXPORT define is not used.
-
- There's no attempt to support GMP built both static and DLL. Doing so
- would mean applications would have to tell us which of the two is going
- to be used when linking, and that seems very tedious and error prone if
- using GMP by hand, and equally tedious from a package since autoconf and
- automake don't give much help.
-
- __GMP_DECLSPEC is required on all documented global functions and
- variables, the various internals in gmp-impl.h etc can be left unadorned.
- But internals used by the test programs or speed measuring programs
- should have __GMP_DECLSPEC, and certainly constants or variables must
- have it or the wrong address will be resolved.
-
- In gcc __declspec can go at either the start or end of a prototype.
-
- In Microsoft C __declspec must go at the start, or after the type like
- void __declspec(...) *foo()". There's no __dllexport or anything to
- guard against someone foolish #defining dllexport. _export used to be
- available, but no longer.
-
- In Borland C _export still exists, but needs to go after the type, like
- "void _export foo();". Would have to change the __GMP_DECLSPEC syntax to
- make use of that. Probably more trouble than it's worth. */
-
-#if defined (__GNUC__)
-#define __GMP_DECLSPEC_EXPORT __declspec(__dllexport__)
-#define __GMP_DECLSPEC_IMPORT __declspec(__dllimport__)
-#endif
-#if defined (_MSC_VER) || defined (__BORLANDC__)
-#define __GMP_DECLSPEC_EXPORT __declspec(dllexport)
-#define __GMP_DECLSPEC_IMPORT __declspec(dllimport)
-#endif
-#ifdef __WATCOMC__
-#define __GMP_DECLSPEC_EXPORT __export
-#define __GMP_DECLSPEC_IMPORT __import
-#endif
-#ifdef __IBMC__
-#define __GMP_DECLSPEC_EXPORT _Export
-#define __GMP_DECLSPEC_IMPORT _Import
-#endif
-
-#if __GMP_LIBGMP_DLL
-#if __GMP_WITHIN_GMP
-/* compiling to go into a DLL libgmp */
-#define __GMP_DECLSPEC __GMP_DECLSPEC_EXPORT
-#else
-/* compiling to go into an application which will link to a DLL libgmp */
-#define __GMP_DECLSPEC __GMP_DECLSPEC_IMPORT
-#endif
-#else
-/* all other cases */
-#define __GMP_DECLSPEC
-#endif
-
-
-#ifdef __GMP_SHORT_LIMB
-typedef unsigned int mp_limb_t;
-typedef int mp_limb_signed_t;
-#else
-#ifdef _LONG_LONG_LIMB
-typedef unsigned long long int mp_limb_t;
-typedef long long int mp_limb_signed_t;
-#else
-typedef unsigned long int mp_limb_t;
-typedef long int mp_limb_signed_t;
-#endif
-#endif
-
-/* For reference, note that the name __mpz_struct gets into C++ mangled
- function names, which means although the "__" suggests an internal, we
- must leave this name for binary compatibility. */
-typedef struct
-{
- int _mp_alloc; /* Number of *limbs* allocated and pointed
- to by the _mp_d field. */
- int _mp_size; /* abs(_mp_size) is the number of limbs the
- last field points to. If _mp_size is
- negative this is a negative number. */
- mp_limb_t *_mp_d; /* Pointer to the limbs. */
-} __mpz_struct;
-
-#endif /* __GNU_MP__ */
-
-
-typedef __mpz_struct MP_INT; /* gmp 1 source compatibility */
-typedef __mpz_struct mpz_t[1];
-
-typedef mp_limb_t * mp_ptr;
-typedef __gmp_const mp_limb_t * mp_srcptr;
-#if defined (_CRAY) && ! defined (_CRAYMPP)
-/* plain `int' is much faster (48 bits) */
-#define __GMP_MP_SIZE_T_INT 1
-typedef int mp_size_t;
-typedef int mp_exp_t;
-#else
-#define __GMP_MP_SIZE_T_INT 0
-typedef long int mp_size_t;
-typedef long int mp_exp_t;
-#endif
-
-typedef struct
-{
- __mpz_struct _mp_num;
- __mpz_struct _mp_den;
-} __mpq_struct;
-
-typedef __mpq_struct MP_RAT; /* gmp 1 source compatibility */
-typedef __mpq_struct mpq_t[1];
-
-typedef struct
-{
- int _mp_prec; /* Max precision, in number of `mp_limb_t's.
- Set by mpf_init and modified by
- mpf_set_prec. The area pointed to by the
- _mp_d field contains `prec' + 1 limbs. */
- int _mp_size; /* abs(_mp_size) is the number of limbs the
- last field points to. If _mp_size is
- negative this is a negative number. */
- mp_exp_t _mp_exp; /* Exponent, in the base of `mp_limb_t'. */
- mp_limb_t *_mp_d; /* Pointer to the limbs. */
-} __mpf_struct;
-
-/* typedef __mpf_struct MP_FLOAT; */
-typedef __mpf_struct mpf_t[1];
-
-/* Available random number generation algorithms. */
-typedef enum
-{
- GMP_RAND_ALG_DEFAULT = 0,
- GMP_RAND_ALG_LC = GMP_RAND_ALG_DEFAULT /* Linear congruential. */
-} gmp_randalg_t;
-
-/* Random state struct. */
-typedef struct
-{
- mpz_t _mp_seed; /* _mp_d member points to state of the generator. */
- gmp_randalg_t _mp_alg; /* Currently unused. */
- union {
- void *_mp_lc; /* Pointer to function pointers structure. */
- } _mp_algdata;
-} __gmp_randstate_struct;
-typedef __gmp_randstate_struct gmp_randstate_t[1];
-
-/* Types for function declarations in gmp files. */
-/* ??? Should not pollute user name space with these ??? */
-typedef __gmp_const __mpz_struct *mpz_srcptr;
-typedef __mpz_struct *mpz_ptr;
-typedef __gmp_const __mpf_struct *mpf_srcptr;
-typedef __mpf_struct *mpf_ptr;
-typedef __gmp_const __mpq_struct *mpq_srcptr;
-typedef __mpq_struct *mpq_ptr;
-
-
-/* This is not wanted in mp.h, so put it outside the __GNU_MP__ common
- section. */
-#if __GMP_LIBGMP_DLL
-#if __GMP_WITHIN_GMPXX
-/* compiling to go into a DLL libgmpxx */
-#define __GMP_DECLSPEC_XX __GMP_DECLSPEC_EXPORT
-#else
-/* compiling to go into a application which will link to a DLL libgmpxx */
-#define __GMP_DECLSPEC_XX __GMP_DECLSPEC_IMPORT
-#endif
-#else
-/* all other cases */
-#define __GMP_DECLSPEC_XX
-#endif
-
-
-#if __GMP_HAVE_PROTOTYPES
-#define __GMP_PROTO(x) x
-#else
-#define __GMP_PROTO(x) ()
-#endif
-
-#ifndef __MPN
-#if __GMP_HAVE_TOKEN_PASTE
-#define __MPN(x) __gmpn_##x
-#else
-#define __MPN(x) __gmpn_/**/x
-#endif
-#endif
-
-/* For reference, "defined(EOF)" cannot be used here. In g++ 2.95.4,
- <iostream> defines EOF but not FILE. */
-#if defined (FILE) \
- || defined (H_STDIO) \
- || defined (_H_STDIO) /* AIX */ \
- || defined (_STDIO_H) /* glibc, Sun, SCO */ \
- || defined (_STDIO_H_) /* BSD, OSF */ \
- || defined (__STDIO_H) /* Borland */ \
- || defined (__STDIO_H__) /* IRIX */ \
- || defined (_STDIO_INCLUDED) /* HPUX */ \
- || defined (__dj_include_stdio_h_) /* DJGPP */ \
- || defined (_FILE_DEFINED) /* Microsoft */ \
- || defined (__STDIO__) /* Apple MPW MrC */ \
- || defined (_MSL_STDIO_H) /* Metrowerks */ \
- || defined (_STDIO_H_INCLUDED) /* QNX4 */ \
- || defined (_ISO_STDIO_ISO_H) /* Sun C++ */
-#define _GMP_H_HAVE_FILE 1
-#endif
-
-/* In ISO C, if a prototype involving "struct obstack *" is given without
- that structure defined, then the struct is scoped down to just the
- prototype, causing a conflict if it's subsequently defined for real. So
- only give prototypes if we've got obstack.h. */
-#if defined (_OBSTACK_H) /* glibc <obstack.h> */
-#define _GMP_H_HAVE_OBSTACK 1
-#endif
-
-/* The prototypes for gmp_vprintf etc are provided only if va_list is
- available, via an application having included <stdarg.h> or <varargs.h>.
- Usually va_list is a typedef so can't be tested directly, but C99
- specifies that va_start is a macro (and it was normally a macro on past
- systems too), so look for that.
-
- <stdio.h> will define some sort of va_list for vprintf and vfprintf, but
- let's not bother trying to use that since it's not standard and since
- application uses for gmp_vprintf etc will almost certainly require the
- whole <stdarg.h> or <varargs.h> anyway. */
-
-#ifdef va_start
-#define _GMP_H_HAVE_VA_LIST 1
-#endif
-
-/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */
-#if defined (__GNUC__) && defined (__GNUC_MINOR__)
-#define __GMP_GNUC_PREREQ(maj, min) \
- ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
-#else
-#define __GMP_GNUC_PREREQ(maj, min) 0
-#endif
-
-/* "pure" is in gcc 2.96 and up, see "(gcc)Function Attributes". Basically
- it means a function does nothing but examine its arguments and memory
- (global or via arguments) to generate a return value, but changes nothing
- and has no side-effects. __GMP_NO_ATTRIBUTE_CONST_PURE lets
- tune/common.c etc turn this off when trying to write timing loops. */
-#if __GMP_GNUC_PREREQ (2,96) && ! defined (__GMP_NO_ATTRIBUTE_CONST_PURE)
-#define __GMP_ATTRIBUTE_PURE __attribute__ ((__pure__))
-#else
-#define __GMP_ATTRIBUTE_PURE
-#endif
-
-
-/* __GMP_CAST allows us to use static_cast in C++, so our macros are clean
- to "g++ -Wold-style-cast".
-
- Casts in "extern inline" code within an extern "C" block don't induce
- these warnings, so __GMP_CAST only needs to be used on documented
- macros. */
-
-#ifdef __cplusplus
-#define __GMP_CAST(type, expr) (static_cast<type> (expr))
-#else
-#define __GMP_CAST(type, expr) ((type) (expr))
-#endif
-
-
-/* An empty "throw ()" means the function doesn't throw any C++ exceptions,
- this can save some stack frame info in applications.
-
- Currently it's given only on functions which never divide-by-zero etc,
- don't allocate memory, and are expected to never need to allocate memory.
- This leaves open the possibility of a C++ throw from a future GMP
- exceptions scheme.
-
- mpz_set_ui etc are omitted to leave open the lazy allocation scheme
- described in doc/tasks.html. mpz_get_d etc are omitted to leave open
- exceptions for float overflows.
-
- Note that __GMP_NOTHROW must be given on any inlines the same as on their
- prototypes (for g++ at least, where they're used together). Note also
- that g++ 3.0 demands that __GMP_NOTHROW is before other attributes like
- __GMP_ATTRIBUTE_PURE. */
-
-#if defined (__cplusplus)
-#define __GMP_NOTHROW throw ()
-#else
-#define __GMP_NOTHROW
-#endif
-
-
-/* PORTME: What other compilers have a useful "extern inline"? "static
- inline" would be an acceptable substitute if the compiler (or linker)
- discards unused statics. */
-
- /* gcc has __inline__ in all modes, including strict ansi. Give a prototype
- for an inline too, so as to correctly specify "dllimport" on windows, in
- case the function is called rather than inlined.
- GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
- inline semantics, unless -fgnu89-inline is used. */
-#ifdef __GNUC__
-#ifdef __GNUC_STDC_INLINE__
-#define __GMP_EXTERN_INLINE extern __inline__ __attribute__ ((__gnu_inline__))
-#else
-#define __GMP_EXTERN_INLINE extern __inline__
-#endif
-#define __GMP_INLINE_PROTOTYPES 1
-#endif
-
-/* DEC C (eg. version 5.9) supports "static __inline foo()", even in -std1
- strict ANSI mode. Inlining is done even when not optimizing (ie. -O0
- mode, which is the default), but an unnecessary local copy of foo is
- emitted unless -O is used. "extern __inline" is accepted, but the
- "extern" appears to be ignored, ie. it becomes a plain global function
- but which is inlined within its file. Don't know if all old versions of
- DEC C supported __inline, but as a start let's do the right thing for
- current versions. */
-#ifdef __DECC
-#define __GMP_EXTERN_INLINE static __inline
-#endif
-
-/* SCO OpenUNIX 8 cc supports "static inline foo()" but not in -Xc strict
- ANSI mode (__STDC__ is 1 in that mode). Inlining only actually takes
- place under -O. Without -O "foo" seems to be emitted whether it's used
- or not, which is wasteful. "extern inline foo()" isn't useful, the
- "extern" is apparently ignored, so foo is inlined if possible but also
- emitted as a global, which causes multiple definition errors when
- building a shared libgmp. */
-#ifdef __SCO_VERSION__
-#if __SCO_VERSION__ > 400000000 && __STDC__ != 1 \
- && ! defined (__GMP_EXTERN_INLINE)
-#define __GMP_EXTERN_INLINE static inline
-#endif
-#endif
-
-/* C++ always has "inline" and since it's a normal feature the linker should
- discard duplicate non-inlined copies, or if it doesn't then that's a
- problem for everyone, not just GMP. */
-#if defined (__cplusplus) && ! defined (__GMP_EXTERN_INLINE)
-#define __GMP_EXTERN_INLINE inline
-#endif
-
-/* Don't do any inlining within a configure run, since if the compiler ends
- up emitting copies of the code into the object file it can end up
- demanding the various support routines (like mpn_popcount) for linking,
- making the "alloca" test and perhaps others fail. And on hppa ia64 a
- pre-release gcc 3.2 was seen not respecting the "extern" in "extern
- __inline__", triggering this problem too. */
-#if defined (__GMP_WITHIN_CONFIGURE) && ! __GMP_WITHIN_CONFIGURE_INLINE
-#undef __GMP_EXTERN_INLINE
-#endif
-
-/* By default, don't give a prototype when there's going to be an inline
- version. Note in particular that Cray C++ objects to the combination of
- prototype and inline. */
-#ifdef __GMP_EXTERN_INLINE
-#ifndef __GMP_INLINE_PROTOTYPES
-#define __GMP_INLINE_PROTOTYPES 0
-#endif
-#else
-#define __GMP_INLINE_PROTOTYPES 1
-#endif
-
-
-#define __GMP_ABS(x) ((x) >= 0 ? (x) : -(x))
-#define __GMP_MAX(h,i) ((h) > (i) ? (h) : (i))
-
-/* __GMP_USHRT_MAX is not "~ (unsigned short) 0" because short is promoted
- to int by "~". */
-#define __GMP_UINT_MAX (~ (unsigned) 0)
-#define __GMP_ULONG_MAX (~ (unsigned long) 0)
-#define __GMP_USHRT_MAX ((unsigned short) ~0)
-
-
-/* __builtin_expect is in gcc 3.0, and not in 2.95. */
-#if __GMP_GNUC_PREREQ (3,0)
-#define __GMP_LIKELY(cond) __builtin_expect ((cond) != 0, 1)
-#define __GMP_UNLIKELY(cond) __builtin_expect ((cond) != 0, 0)
-#else
-#define __GMP_LIKELY(cond) (cond)
-#define __GMP_UNLIKELY(cond) (cond)
-#endif
-
-#ifdef _CRAY
-#define __GMP_CRAY_Pragma(str) _Pragma (str)
-#else
-#define __GMP_CRAY_Pragma(str)
-#endif
-
-
-/* Allow direct user access to numerator and denominator of a mpq_t object. */
-#define mpq_numref(Q) (&((Q)->_mp_num))
-#define mpq_denref(Q) (&((Q)->_mp_den))
-
-
-#if defined (__cplusplus)
-extern "C" {
-#ifdef _GMP_H_HAVE_FILE
-using std::FILE;
-#endif
-#endif
-
-#define mp_set_memory_functions __gmp_set_memory_functions
-__GMP_DECLSPEC void mp_set_memory_functions __GMP_PROTO ((void *(*) (size_t),
- void *(*) (void *, size_t, size_t),
- void (*) (void *, size_t))) __GMP_NOTHROW;
-
-#define mp_get_memory_functions __gmp_get_memory_functions
-__GMP_DECLSPEC void mp_get_memory_functions __GMP_PROTO ((void *(**) (size_t),
- void *(**) (void *, size_t, size_t),
- void (**) (void *, size_t))) __GMP_NOTHROW;
-
-#define mp_bits_per_limb __gmp_bits_per_limb
-__GMP_DECLSPEC extern __gmp_const int mp_bits_per_limb;
-
-#define gmp_errno __gmp_errno
-__GMP_DECLSPEC extern int gmp_errno;
-
-#define gmp_version __gmp_version
-__GMP_DECLSPEC extern __gmp_const char * __gmp_const gmp_version;
-
-
-/**************** Random number routines. ****************/
-
-/* obsolete */
-#define gmp_randinit __gmp_randinit
-__GMP_DECLSPEC void gmp_randinit __GMP_PROTO ((gmp_randstate_t, gmp_randalg_t, ...));
-
-#define gmp_randinit_default __gmp_randinit_default
-__GMP_DECLSPEC void gmp_randinit_default __GMP_PROTO ((gmp_randstate_t));
-
-#define gmp_randinit_lc_2exp __gmp_randinit_lc_2exp
-__GMP_DECLSPEC void gmp_randinit_lc_2exp __GMP_PROTO ((gmp_randstate_t,
- mpz_srcptr, unsigned long int,
- unsigned long int));
-
-#define gmp_randinit_lc_2exp_size __gmp_randinit_lc_2exp_size
-__GMP_DECLSPEC int gmp_randinit_lc_2exp_size __GMP_PROTO ((gmp_randstate_t, unsigned long));
-
-#define gmp_randinit_mt __gmp_randinit_mt
-__GMP_DECLSPEC void gmp_randinit_mt __GMP_PROTO ((gmp_randstate_t));
-
-#define gmp_randinit_set __gmp_randinit_set
-void gmp_randinit_set __GMP_PROTO ((gmp_randstate_t, __gmp_const __gmp_randstate_struct *));
-
-#define gmp_randseed __gmp_randseed
-__GMP_DECLSPEC void gmp_randseed __GMP_PROTO ((gmp_randstate_t, mpz_srcptr));
-
-#define gmp_randseed_ui __gmp_randseed_ui
-__GMP_DECLSPEC void gmp_randseed_ui __GMP_PROTO ((gmp_randstate_t, unsigned long int));
-
-#define gmp_randclear __gmp_randclear
-__GMP_DECLSPEC void gmp_randclear __GMP_PROTO ((gmp_randstate_t));
-
-#define gmp_urandomb_ui __gmp_urandomb_ui
-unsigned long gmp_urandomb_ui __GMP_PROTO ((gmp_randstate_t, unsigned long));
-
-#define gmp_urandomm_ui __gmp_urandomm_ui
-unsigned long gmp_urandomm_ui __GMP_PROTO ((gmp_randstate_t, unsigned long));
-
-
-/**************** Formatted output routines. ****************/
-
-#define gmp_asprintf __gmp_asprintf
-__GMP_DECLSPEC int gmp_asprintf __GMP_PROTO ((char **, __gmp_const char *, ...));
-
-#define gmp_fprintf __gmp_fprintf
-#ifdef _GMP_H_HAVE_FILE
-__GMP_DECLSPEC int gmp_fprintf __GMP_PROTO ((FILE *, __gmp_const char *, ...));
-#endif
-
-#define gmp_obstack_printf __gmp_obstack_printf
-#if defined (_GMP_H_HAVE_OBSTACK)
-__GMP_DECLSPEC int gmp_obstack_printf __GMP_PROTO ((struct obstack *, __gmp_const char *, ...));
-#endif
-
-#define gmp_obstack_vprintf __gmp_obstack_vprintf
-#if defined (_GMP_H_HAVE_OBSTACK) && defined (_GMP_H_HAVE_VA_LIST)
-__GMP_DECLSPEC int gmp_obstack_vprintf __GMP_PROTO ((struct obstack *, __gmp_const char *, va_list));
-#endif
-
-#define gmp_printf __gmp_printf
-__GMP_DECLSPEC int gmp_printf __GMP_PROTO ((__gmp_const char *, ...));
-
-#define gmp_snprintf __gmp_snprintf
-__GMP_DECLSPEC int gmp_snprintf __GMP_PROTO ((char *, size_t, __gmp_const char *, ...));
-
-#define gmp_sprintf __gmp_sprintf
-__GMP_DECLSPEC int gmp_sprintf __GMP_PROTO ((char *, __gmp_const char *, ...));
-
-#define gmp_vasprintf __gmp_vasprintf
-#if defined (_GMP_H_HAVE_VA_LIST)
-__GMP_DECLSPEC int gmp_vasprintf __GMP_PROTO ((char **, __gmp_const char *, va_list));
-#endif
-
-#define gmp_vfprintf __gmp_vfprintf
-#if defined (_GMP_H_HAVE_FILE) && defined (_GMP_H_HAVE_VA_LIST)
-__GMP_DECLSPEC int gmp_vfprintf __GMP_PROTO ((FILE *, __gmp_const char *, va_list));
-#endif
-
-#define gmp_vprintf __gmp_vprintf
-#if defined (_GMP_H_HAVE_VA_LIST)
-__GMP_DECLSPEC int gmp_vprintf __GMP_PROTO ((__gmp_const char *, va_list));
-#endif
-
-#define gmp_vsnprintf __gmp_vsnprintf
-#if defined (_GMP_H_HAVE_VA_LIST)
-__GMP_DECLSPEC int gmp_vsnprintf __GMP_PROTO ((char *, size_t, __gmp_const char *, va_list));
-#endif
-
-#define gmp_vsprintf __gmp_vsprintf
-#if defined (_GMP_H_HAVE_VA_LIST)
-__GMP_DECLSPEC int gmp_vsprintf __GMP_PROTO ((char *, __gmp_const char *, va_list));
-#endif
-
-
-/**************** Formatted input routines. ****************/
-
-#define gmp_fscanf __gmp_fscanf
-#ifdef _GMP_H_HAVE_FILE
-__GMP_DECLSPEC int gmp_fscanf __GMP_PROTO ((FILE *, __gmp_const char *, ...));
-#endif
-
-#define gmp_scanf __gmp_scanf
-__GMP_DECLSPEC int gmp_scanf __GMP_PROTO ((__gmp_const char *, ...));
-
-#define gmp_sscanf __gmp_sscanf
-__GMP_DECLSPEC int gmp_sscanf __GMP_PROTO ((__gmp_const char *, __gmp_const char *, ...));
-
-#define gmp_vfscanf __gmp_vfscanf
-#if defined (_GMP_H_HAVE_FILE) && defined (_GMP_H_HAVE_VA_LIST)
-__GMP_DECLSPEC int gmp_vfscanf __GMP_PROTO ((FILE *, __gmp_const char *, va_list));
-#endif
-
-#define gmp_vscanf __gmp_vscanf
-#if defined (_GMP_H_HAVE_VA_LIST)
-__GMP_DECLSPEC int gmp_vscanf __GMP_PROTO ((__gmp_const char *, va_list));
-#endif
-
-#define gmp_vsscanf __gmp_vsscanf
-#if defined (_GMP_H_HAVE_VA_LIST)
-__GMP_DECLSPEC int gmp_vsscanf __GMP_PROTO ((__gmp_const char *, __gmp_const char *, va_list));
-#endif
-
-
-/**************** Integer (i.e. Z) routines. ****************/
-
-#define _mpz_realloc __gmpz_realloc
-#define mpz_realloc __gmpz_realloc
-__GMP_DECLSPEC void *_mpz_realloc __GMP_PROTO ((mpz_ptr, mp_size_t));
-
-#define mpz_abs __gmpz_abs
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_abs)
-__GMP_DECLSPEC void mpz_abs __GMP_PROTO ((mpz_ptr, mpz_srcptr));
-#endif
-
-#define mpz_add __gmpz_add
-__GMP_DECLSPEC void mpz_add __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_add_ui __gmpz_add_ui
-__GMP_DECLSPEC void mpz_add_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_addmul __gmpz_addmul
-__GMP_DECLSPEC void mpz_addmul __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_addmul_ui __gmpz_addmul_ui
-__GMP_DECLSPEC void mpz_addmul_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_and __gmpz_and
-__GMP_DECLSPEC void mpz_and __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_array_init __gmpz_array_init
-__GMP_DECLSPEC void mpz_array_init __GMP_PROTO ((mpz_ptr, mp_size_t, mp_size_t));
-
-#define mpz_bin_ui __gmpz_bin_ui
-__GMP_DECLSPEC void mpz_bin_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_bin_uiui __gmpz_bin_uiui
-__GMP_DECLSPEC void mpz_bin_uiui __GMP_PROTO ((mpz_ptr, unsigned long int, unsigned long int));
-
-#define mpz_cdiv_q __gmpz_cdiv_q
-__GMP_DECLSPEC void mpz_cdiv_q __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_cdiv_q_2exp __gmpz_cdiv_q_2exp
-__GMP_DECLSPEC void mpz_cdiv_q_2exp __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long));
-
-#define mpz_cdiv_q_ui __gmpz_cdiv_q_ui
-__GMP_DECLSPEC unsigned long int mpz_cdiv_q_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_cdiv_qr __gmpz_cdiv_qr
-__GMP_DECLSPEC void mpz_cdiv_qr __GMP_PROTO ((mpz_ptr, mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_cdiv_qr_ui __gmpz_cdiv_qr_ui
-__GMP_DECLSPEC unsigned long int mpz_cdiv_qr_ui __GMP_PROTO ((mpz_ptr, mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_cdiv_r __gmpz_cdiv_r
-__GMP_DECLSPEC void mpz_cdiv_r __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_cdiv_r_2exp __gmpz_cdiv_r_2exp
-__GMP_DECLSPEC void mpz_cdiv_r_2exp __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long));
-
-#define mpz_cdiv_r_ui __gmpz_cdiv_r_ui
-__GMP_DECLSPEC unsigned long int mpz_cdiv_r_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_cdiv_ui __gmpz_cdiv_ui
-__GMP_DECLSPEC unsigned long int mpz_cdiv_ui __GMP_PROTO ((mpz_srcptr, unsigned long int)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_clear __gmpz_clear
-__GMP_DECLSPEC void mpz_clear __GMP_PROTO ((mpz_ptr));
-
-#define mpz_clrbit __gmpz_clrbit
-__GMP_DECLSPEC void mpz_clrbit __GMP_PROTO ((mpz_ptr, unsigned long int));
-
-#define mpz_cmp __gmpz_cmp
-__GMP_DECLSPEC int mpz_cmp __GMP_PROTO ((mpz_srcptr, mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_cmp_d __gmpz_cmp_d
-__GMP_DECLSPEC int mpz_cmp_d __GMP_PROTO ((mpz_srcptr, double)) __GMP_ATTRIBUTE_PURE;
-
-#define _mpz_cmp_si __gmpz_cmp_si
-__GMP_DECLSPEC int _mpz_cmp_si __GMP_PROTO ((mpz_srcptr, signed long int)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define _mpz_cmp_ui __gmpz_cmp_ui
-__GMP_DECLSPEC int _mpz_cmp_ui __GMP_PROTO ((mpz_srcptr, unsigned long int)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_cmpabs __gmpz_cmpabs
-__GMP_DECLSPEC int mpz_cmpabs __GMP_PROTO ((mpz_srcptr, mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_cmpabs_d __gmpz_cmpabs_d
-__GMP_DECLSPEC int mpz_cmpabs_d __GMP_PROTO ((mpz_srcptr, double)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_cmpabs_ui __gmpz_cmpabs_ui
-__GMP_DECLSPEC int mpz_cmpabs_ui __GMP_PROTO ((mpz_srcptr, unsigned long int)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_com __gmpz_com
-__GMP_DECLSPEC void mpz_com __GMP_PROTO ((mpz_ptr, mpz_srcptr));
-
-#define mpz_combit __gmpz_combit
-__GMP_DECLSPEC void mpz_combit __GMP_PROTO ((mpz_ptr, unsigned long int));
-
-#define mpz_congruent_p __gmpz_congruent_p
-__GMP_DECLSPEC int mpz_congruent_p __GMP_PROTO ((mpz_srcptr, mpz_srcptr, mpz_srcptr)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_congruent_2exp_p __gmpz_congruent_2exp_p
-__GMP_DECLSPEC int mpz_congruent_2exp_p __GMP_PROTO ((mpz_srcptr, mpz_srcptr, unsigned long)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_congruent_ui_p __gmpz_congruent_ui_p
-__GMP_DECLSPEC int mpz_congruent_ui_p __GMP_PROTO ((mpz_srcptr, unsigned long, unsigned long)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_divexact __gmpz_divexact
-__GMP_DECLSPEC void mpz_divexact __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_divexact_ui __gmpz_divexact_ui
-__GMP_DECLSPEC void mpz_divexact_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long));
-
-#define mpz_divisible_p __gmpz_divisible_p
-__GMP_DECLSPEC int mpz_divisible_p __GMP_PROTO ((mpz_srcptr, mpz_srcptr)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_divisible_ui_p __gmpz_divisible_ui_p
-__GMP_DECLSPEC int mpz_divisible_ui_p __GMP_PROTO ((mpz_srcptr, unsigned long)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_divisible_2exp_p __gmpz_divisible_2exp_p
-__GMP_DECLSPEC int mpz_divisible_2exp_p __GMP_PROTO ((mpz_srcptr, unsigned long)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_dump __gmpz_dump
-__GMP_DECLSPEC void mpz_dump __GMP_PROTO ((mpz_srcptr));
-
-#define mpz_export __gmpz_export
-__GMP_DECLSPEC void *mpz_export __GMP_PROTO ((void *, size_t *, int, size_t, int, size_t, mpz_srcptr));
-
-#define mpz_fac_ui __gmpz_fac_ui
-__GMP_DECLSPEC void mpz_fac_ui __GMP_PROTO ((mpz_ptr, unsigned long int));
-
-#define mpz_fdiv_q __gmpz_fdiv_q
-__GMP_DECLSPEC void mpz_fdiv_q __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_fdiv_q_2exp __gmpz_fdiv_q_2exp
-__GMP_DECLSPEC void mpz_fdiv_q_2exp __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_fdiv_q_ui __gmpz_fdiv_q_ui
-__GMP_DECLSPEC unsigned long int mpz_fdiv_q_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_fdiv_qr __gmpz_fdiv_qr
-__GMP_DECLSPEC void mpz_fdiv_qr __GMP_PROTO ((mpz_ptr, mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_fdiv_qr_ui __gmpz_fdiv_qr_ui
-__GMP_DECLSPEC unsigned long int mpz_fdiv_qr_ui __GMP_PROTO ((mpz_ptr, mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_fdiv_r __gmpz_fdiv_r
-__GMP_DECLSPEC void mpz_fdiv_r __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_fdiv_r_2exp __gmpz_fdiv_r_2exp
-__GMP_DECLSPEC void mpz_fdiv_r_2exp __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_fdiv_r_ui __gmpz_fdiv_r_ui
-__GMP_DECLSPEC unsigned long int mpz_fdiv_r_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_fdiv_ui __gmpz_fdiv_ui
-__GMP_DECLSPEC unsigned long int mpz_fdiv_ui __GMP_PROTO ((mpz_srcptr, unsigned long int)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_fib_ui __gmpz_fib_ui
-__GMP_DECLSPEC void mpz_fib_ui __GMP_PROTO ((mpz_ptr, unsigned long int));
-
-#define mpz_fib2_ui __gmpz_fib2_ui
-__GMP_DECLSPEC void mpz_fib2_ui __GMP_PROTO ((mpz_ptr, mpz_ptr, unsigned long int));
-
-#define mpz_fits_sint_p __gmpz_fits_sint_p
-__GMP_DECLSPEC int mpz_fits_sint_p __GMP_PROTO ((mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_fits_slong_p __gmpz_fits_slong_p
-__GMP_DECLSPEC int mpz_fits_slong_p __GMP_PROTO ((mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_fits_sshort_p __gmpz_fits_sshort_p
-__GMP_DECLSPEC int mpz_fits_sshort_p __GMP_PROTO ((mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_fits_uint_p __gmpz_fits_uint_p
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_fits_uint_p)
-__GMP_DECLSPEC int mpz_fits_uint_p __GMP_PROTO ((mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-#endif
-
-#define mpz_fits_ulong_p __gmpz_fits_ulong_p
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_fits_ulong_p)
-__GMP_DECLSPEC int mpz_fits_ulong_p __GMP_PROTO ((mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-#endif
-
-#define mpz_fits_ushort_p __gmpz_fits_ushort_p
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_fits_ushort_p)
-__GMP_DECLSPEC int mpz_fits_ushort_p __GMP_PROTO ((mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-#endif
-
-#define mpz_gcd __gmpz_gcd
-__GMP_DECLSPEC void mpz_gcd __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_gcd_ui __gmpz_gcd_ui
-__GMP_DECLSPEC unsigned long int mpz_gcd_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_gcdext __gmpz_gcdext
-__GMP_DECLSPEC void mpz_gcdext __GMP_PROTO ((mpz_ptr, mpz_ptr, mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_get_d __gmpz_get_d
-__GMP_DECLSPEC double mpz_get_d __GMP_PROTO ((mpz_srcptr)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_get_d_2exp __gmpz_get_d_2exp
-__GMP_DECLSPEC double mpz_get_d_2exp __GMP_PROTO ((signed long int *, mpz_srcptr));
-
-#define mpz_get_si __gmpz_get_si
-__GMP_DECLSPEC /* signed */ long int mpz_get_si __GMP_PROTO ((mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_get_str __gmpz_get_str
-__GMP_DECLSPEC char *mpz_get_str __GMP_PROTO ((char *, int, mpz_srcptr));
-
-#define mpz_get_ui __gmpz_get_ui
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_get_ui)
-__GMP_DECLSPEC unsigned long int mpz_get_ui __GMP_PROTO ((mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-#endif
-
-#define mpz_getlimbn __gmpz_getlimbn
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_getlimbn)
-__GMP_DECLSPEC mp_limb_t mpz_getlimbn __GMP_PROTO ((mpz_srcptr, mp_size_t)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-#endif
-
-#define mpz_hamdist __gmpz_hamdist
-__GMP_DECLSPEC unsigned long int mpz_hamdist __GMP_PROTO ((mpz_srcptr, mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_import __gmpz_import
-__GMP_DECLSPEC void mpz_import __GMP_PROTO ((mpz_ptr, size_t, int, size_t, int, size_t, __gmp_const void *));
-
-#define mpz_init __gmpz_init
-__GMP_DECLSPEC void mpz_init __GMP_PROTO ((mpz_ptr));
-
-#define mpz_init2 __gmpz_init2
-__GMP_DECLSPEC void mpz_init2 __GMP_PROTO ((mpz_ptr, unsigned long));
-
-#define mpz_init_set __gmpz_init_set
-__GMP_DECLSPEC void mpz_init_set __GMP_PROTO ((mpz_ptr, mpz_srcptr));
-
-#define mpz_init_set_d __gmpz_init_set_d
-__GMP_DECLSPEC void mpz_init_set_d __GMP_PROTO ((mpz_ptr, double));
-
-#define mpz_init_set_si __gmpz_init_set_si
-__GMP_DECLSPEC void mpz_init_set_si __GMP_PROTO ((mpz_ptr, signed long int));
-
-#define mpz_init_set_str __gmpz_init_set_str
-__GMP_DECLSPEC int mpz_init_set_str __GMP_PROTO ((mpz_ptr, __gmp_const char *, int));
-
-#define mpz_init_set_ui __gmpz_init_set_ui
-__GMP_DECLSPEC void mpz_init_set_ui __GMP_PROTO ((mpz_ptr, unsigned long int));
-
-#define mpz_inp_raw __gmpz_inp_raw
-#ifdef _GMP_H_HAVE_FILE
-__GMP_DECLSPEC size_t mpz_inp_raw __GMP_PROTO ((mpz_ptr, FILE *));
-#endif
-
-#define mpz_inp_str __gmpz_inp_str
-#ifdef _GMP_H_HAVE_FILE
-__GMP_DECLSPEC size_t mpz_inp_str __GMP_PROTO ((mpz_ptr, FILE *, int));
-#endif
-
-#define mpz_invert __gmpz_invert
-__GMP_DECLSPEC int mpz_invert __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_ior __gmpz_ior
-__GMP_DECLSPEC void mpz_ior __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_jacobi __gmpz_jacobi
-__GMP_DECLSPEC int mpz_jacobi __GMP_PROTO ((mpz_srcptr, mpz_srcptr)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_kronecker mpz_jacobi /* alias */
-
-#define mpz_kronecker_si __gmpz_kronecker_si
-__GMP_DECLSPEC int mpz_kronecker_si __GMP_PROTO ((mpz_srcptr, long)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_kronecker_ui __gmpz_kronecker_ui
-__GMP_DECLSPEC int mpz_kronecker_ui __GMP_PROTO ((mpz_srcptr, unsigned long)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_si_kronecker __gmpz_si_kronecker
-__GMP_DECLSPEC int mpz_si_kronecker __GMP_PROTO ((long, mpz_srcptr)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_ui_kronecker __gmpz_ui_kronecker
-__GMP_DECLSPEC int mpz_ui_kronecker __GMP_PROTO ((unsigned long, mpz_srcptr)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_lcm __gmpz_lcm
-__GMP_DECLSPEC void mpz_lcm __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_lcm_ui __gmpz_lcm_ui
-__GMP_DECLSPEC void mpz_lcm_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long));
-
-#define mpz_legendre mpz_jacobi /* alias */
-
-#define mpz_lucnum_ui __gmpz_lucnum_ui
-__GMP_DECLSPEC void mpz_lucnum_ui __GMP_PROTO ((mpz_ptr, unsigned long int));
-
-#define mpz_lucnum2_ui __gmpz_lucnum2_ui
-__GMP_DECLSPEC void mpz_lucnum2_ui __GMP_PROTO ((mpz_ptr, mpz_ptr, unsigned long int));
-
-#define mpz_millerrabin __gmpz_millerrabin
-__GMP_DECLSPEC int mpz_millerrabin __GMP_PROTO ((mpz_srcptr, int)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_mod __gmpz_mod
-__GMP_DECLSPEC void mpz_mod __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_mod_ui mpz_fdiv_r_ui /* same as fdiv_r because divisor unsigned */
-
-#define mpz_mul __gmpz_mul
-__GMP_DECLSPEC void mpz_mul __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_mul_2exp __gmpz_mul_2exp
-__GMP_DECLSPEC void mpz_mul_2exp __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_mul_si __gmpz_mul_si
-__GMP_DECLSPEC void mpz_mul_si __GMP_PROTO ((mpz_ptr, mpz_srcptr, long int));
-
-#define mpz_mul_ui __gmpz_mul_ui
-__GMP_DECLSPEC void mpz_mul_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_neg __gmpz_neg
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_neg)
-__GMP_DECLSPEC void mpz_neg __GMP_PROTO ((mpz_ptr, mpz_srcptr));
-#endif
-
-#define mpz_nextprime __gmpz_nextprime
-__GMP_DECLSPEC void mpz_nextprime __GMP_PROTO ((mpz_ptr, mpz_srcptr));
-
-#define mpz_out_raw __gmpz_out_raw
-#ifdef _GMP_H_HAVE_FILE
-__GMP_DECLSPEC size_t mpz_out_raw __GMP_PROTO ((FILE *, mpz_srcptr));
-#endif
-
-#define mpz_out_str __gmpz_out_str
-#ifdef _GMP_H_HAVE_FILE
-__GMP_DECLSPEC size_t mpz_out_str __GMP_PROTO ((FILE *, int, mpz_srcptr));
-#endif
-
-#define mpz_perfect_power_p __gmpz_perfect_power_p
-__GMP_DECLSPEC int mpz_perfect_power_p __GMP_PROTO ((mpz_srcptr)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_perfect_square_p __gmpz_perfect_square_p
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_perfect_square_p)
-__GMP_DECLSPEC int mpz_perfect_square_p __GMP_PROTO ((mpz_srcptr)) __GMP_ATTRIBUTE_PURE;
-#endif
-
-#define mpz_popcount __gmpz_popcount
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_popcount)
-__GMP_DECLSPEC unsigned long int mpz_popcount __GMP_PROTO ((mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-#endif
-
-#define mpz_pow_ui __gmpz_pow_ui
-__GMP_DECLSPEC void mpz_pow_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_powm __gmpz_powm
-__GMP_DECLSPEC void mpz_powm __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_powm_ui __gmpz_powm_ui
-__GMP_DECLSPEC void mpz_powm_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int, mpz_srcptr));
-
-#define mpz_probab_prime_p __gmpz_probab_prime_p
-__GMP_DECLSPEC int mpz_probab_prime_p __GMP_PROTO ((mpz_srcptr, int)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_random __gmpz_random
-__GMP_DECLSPEC void mpz_random __GMP_PROTO ((mpz_ptr, mp_size_t));
-
-#define mpz_random2 __gmpz_random2
-__GMP_DECLSPEC void mpz_random2 __GMP_PROTO ((mpz_ptr, mp_size_t));
-
-#define mpz_realloc2 __gmpz_realloc2
-__GMP_DECLSPEC void mpz_realloc2 __GMP_PROTO ((mpz_ptr, unsigned long));
-
-#define mpz_remove __gmpz_remove
-__GMP_DECLSPEC unsigned long int mpz_remove __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_root __gmpz_root
-__GMP_DECLSPEC int mpz_root __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_rootrem __gmpz_rootrem
-__GMP_DECLSPEC void mpz_rootrem __GMP_PROTO ((mpz_ptr,mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_rrandomb __gmpz_rrandomb
-__GMP_DECLSPEC void mpz_rrandomb __GMP_PROTO ((mpz_ptr, gmp_randstate_t, unsigned long int));
-
-#define mpz_scan0 __gmpz_scan0
-__GMP_DECLSPEC unsigned long int mpz_scan0 __GMP_PROTO ((mpz_srcptr, unsigned long int)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_scan1 __gmpz_scan1
-__GMP_DECLSPEC unsigned long int mpz_scan1 __GMP_PROTO ((mpz_srcptr, unsigned long int)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_set __gmpz_set
-__GMP_DECLSPEC void mpz_set __GMP_PROTO ((mpz_ptr, mpz_srcptr));
-
-#define mpz_set_d __gmpz_set_d
-__GMP_DECLSPEC void mpz_set_d __GMP_PROTO ((mpz_ptr, double));
-
-#define mpz_set_f __gmpz_set_f
-__GMP_DECLSPEC void mpz_set_f __GMP_PROTO ((mpz_ptr, mpf_srcptr));
-
-#define mpz_set_q __gmpz_set_q
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_set_q)
-__GMP_DECLSPEC void mpz_set_q __GMP_PROTO ((mpz_ptr, mpq_srcptr));
-#endif
-
-#define mpz_set_si __gmpz_set_si
-__GMP_DECLSPEC void mpz_set_si __GMP_PROTO ((mpz_ptr, signed long int));
-
-#define mpz_set_str __gmpz_set_str
-__GMP_DECLSPEC int mpz_set_str __GMP_PROTO ((mpz_ptr, __gmp_const char *, int));
-
-#define mpz_set_ui __gmpz_set_ui
-__GMP_DECLSPEC void mpz_set_ui __GMP_PROTO ((mpz_ptr, unsigned long int));
-
-#define mpz_setbit __gmpz_setbit
-__GMP_DECLSPEC void mpz_setbit __GMP_PROTO ((mpz_ptr, unsigned long int));
-
-#define mpz_size __gmpz_size
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_size)
-__GMP_DECLSPEC size_t mpz_size __GMP_PROTO ((mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-#endif
-
-#define mpz_sizeinbase __gmpz_sizeinbase
-__GMP_DECLSPEC size_t mpz_sizeinbase __GMP_PROTO ((mpz_srcptr, int)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_sqrt __gmpz_sqrt
-__GMP_DECLSPEC void mpz_sqrt __GMP_PROTO ((mpz_ptr, mpz_srcptr));
-
-#define mpz_sqrtrem __gmpz_sqrtrem
-__GMP_DECLSPEC void mpz_sqrtrem __GMP_PROTO ((mpz_ptr, mpz_ptr, mpz_srcptr));
-
-#define mpz_sub __gmpz_sub
-__GMP_DECLSPEC void mpz_sub __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_sub_ui __gmpz_sub_ui
-__GMP_DECLSPEC void mpz_sub_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_ui_sub __gmpz_ui_sub
-__GMP_DECLSPEC void mpz_ui_sub __GMP_PROTO ((mpz_ptr, unsigned long int, mpz_srcptr));
-
-#define mpz_submul __gmpz_submul
-__GMP_DECLSPEC void mpz_submul __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_submul_ui __gmpz_submul_ui
-__GMP_DECLSPEC void mpz_submul_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_swap __gmpz_swap
-__GMP_DECLSPEC void mpz_swap __GMP_PROTO ((mpz_ptr, mpz_ptr)) __GMP_NOTHROW;
-
-#define mpz_tdiv_ui __gmpz_tdiv_ui
-__GMP_DECLSPEC unsigned long int mpz_tdiv_ui __GMP_PROTO ((mpz_srcptr, unsigned long int)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_tdiv_q __gmpz_tdiv_q
-__GMP_DECLSPEC void mpz_tdiv_q __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_tdiv_q_2exp __gmpz_tdiv_q_2exp
-__GMP_DECLSPEC void mpz_tdiv_q_2exp __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_tdiv_q_ui __gmpz_tdiv_q_ui
-__GMP_DECLSPEC unsigned long int mpz_tdiv_q_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_tdiv_qr __gmpz_tdiv_qr
-__GMP_DECLSPEC void mpz_tdiv_qr __GMP_PROTO ((mpz_ptr, mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_tdiv_qr_ui __gmpz_tdiv_qr_ui
-__GMP_DECLSPEC unsigned long int mpz_tdiv_qr_ui __GMP_PROTO ((mpz_ptr, mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_tdiv_r __gmpz_tdiv_r
-__GMP_DECLSPEC void mpz_tdiv_r __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_tdiv_r_2exp __gmpz_tdiv_r_2exp
-__GMP_DECLSPEC void mpz_tdiv_r_2exp __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_tdiv_r_ui __gmpz_tdiv_r_ui
-__GMP_DECLSPEC unsigned long int mpz_tdiv_r_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_tstbit __gmpz_tstbit
-__GMP_DECLSPEC int mpz_tstbit __GMP_PROTO ((mpz_srcptr, unsigned long int)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_ui_pow_ui __gmpz_ui_pow_ui
-__GMP_DECLSPEC void mpz_ui_pow_ui __GMP_PROTO ((mpz_ptr, unsigned long int, unsigned long int));
-
-#define mpz_urandomb __gmpz_urandomb
-__GMP_DECLSPEC void mpz_urandomb __GMP_PROTO ((mpz_ptr, gmp_randstate_t, unsigned long int));
-
-#define mpz_urandomm __gmpz_urandomm
-__GMP_DECLSPEC void mpz_urandomm __GMP_PROTO ((mpz_ptr, gmp_randstate_t, mpz_srcptr));
-
-#define mpz_xor __gmpz_xor
-#define mpz_eor __gmpz_xor
-__GMP_DECLSPEC void mpz_xor __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-
-/**************** Rational (i.e. Q) routines. ****************/
-
-#define mpq_abs __gmpq_abs
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpq_abs)
-__GMP_DECLSPEC void mpq_abs __GMP_PROTO ((mpq_ptr, mpq_srcptr));
-#endif
-
-#define mpq_add __gmpq_add
-__GMP_DECLSPEC void mpq_add __GMP_PROTO ((mpq_ptr, mpq_srcptr, mpq_srcptr));
-
-#define mpq_canonicalize __gmpq_canonicalize
-__GMP_DECLSPEC void mpq_canonicalize __GMP_PROTO ((mpq_ptr));
-
-#define mpq_clear __gmpq_clear
-__GMP_DECLSPEC void mpq_clear __GMP_PROTO ((mpq_ptr));
-
-#define mpq_cmp __gmpq_cmp
-__GMP_DECLSPEC int mpq_cmp __GMP_PROTO ((mpq_srcptr, mpq_srcptr)) __GMP_ATTRIBUTE_PURE;
-
-#define _mpq_cmp_si __gmpq_cmp_si
-__GMP_DECLSPEC int _mpq_cmp_si __GMP_PROTO ((mpq_srcptr, long, unsigned long)) __GMP_ATTRIBUTE_PURE;
-
-#define _mpq_cmp_ui __gmpq_cmp_ui
-__GMP_DECLSPEC int _mpq_cmp_ui __GMP_PROTO ((mpq_srcptr, unsigned long int, unsigned long int)) __GMP_ATTRIBUTE_PURE;
-
-#define mpq_div __gmpq_div
-__GMP_DECLSPEC void mpq_div __GMP_PROTO ((mpq_ptr, mpq_srcptr, mpq_srcptr));
-
-#define mpq_div_2exp __gmpq_div_2exp
-__GMP_DECLSPEC void mpq_div_2exp __GMP_PROTO ((mpq_ptr, mpq_srcptr, unsigned long));
-
-#define mpq_equal __gmpq_equal
-__GMP_DECLSPEC int mpq_equal __GMP_PROTO ((mpq_srcptr, mpq_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpq_get_num __gmpq_get_num
-__GMP_DECLSPEC void mpq_get_num __GMP_PROTO ((mpz_ptr, mpq_srcptr));
-
-#define mpq_get_den __gmpq_get_den
-__GMP_DECLSPEC void mpq_get_den __GMP_PROTO ((mpz_ptr, mpq_srcptr));
-
-#define mpq_get_d __gmpq_get_d
-__GMP_DECLSPEC double mpq_get_d __GMP_PROTO ((mpq_srcptr)) __GMP_ATTRIBUTE_PURE;
-
-#define mpq_get_str __gmpq_get_str
-__GMP_DECLSPEC char *mpq_get_str __GMP_PROTO ((char *, int, mpq_srcptr));
-
-#define mpq_init __gmpq_init
-__GMP_DECLSPEC void mpq_init __GMP_PROTO ((mpq_ptr));
-
-#define mpq_inp_str __gmpq_inp_str
-#ifdef _GMP_H_HAVE_FILE
-__GMP_DECLSPEC size_t mpq_inp_str __GMP_PROTO ((mpq_ptr, FILE *, int));
-#endif
-
-#define mpq_inv __gmpq_inv
-__GMP_DECLSPEC void mpq_inv __GMP_PROTO ((mpq_ptr, mpq_srcptr));
-
-#define mpq_mul __gmpq_mul
-__GMP_DECLSPEC void mpq_mul __GMP_PROTO ((mpq_ptr, mpq_srcptr, mpq_srcptr));
-
-#define mpq_mul_2exp __gmpq_mul_2exp
-__GMP_DECLSPEC void mpq_mul_2exp __GMP_PROTO ((mpq_ptr, mpq_srcptr, unsigned long));
-
-#define mpq_neg __gmpq_neg
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpq_neg)
-__GMP_DECLSPEC void mpq_neg __GMP_PROTO ((mpq_ptr, mpq_srcptr));
-#endif
-
-#define mpq_out_str __gmpq_out_str
-#ifdef _GMP_H_HAVE_FILE
-__GMP_DECLSPEC size_t mpq_out_str __GMP_PROTO ((FILE *, int, mpq_srcptr));
-#endif
-
-#define mpq_set __gmpq_set
-__GMP_DECLSPEC void mpq_set __GMP_PROTO ((mpq_ptr, mpq_srcptr));
-
-#define mpq_set_d __gmpq_set_d
-__GMP_DECLSPEC void mpq_set_d __GMP_PROTO ((mpq_ptr, double));
-
-#define mpq_set_den __gmpq_set_den
-__GMP_DECLSPEC void mpq_set_den __GMP_PROTO ((mpq_ptr, mpz_srcptr));
-
-#define mpq_set_f __gmpq_set_f
-__GMP_DECLSPEC void mpq_set_f __GMP_PROTO ((mpq_ptr, mpf_srcptr));
-
-#define mpq_set_num __gmpq_set_num
-__GMP_DECLSPEC void mpq_set_num __GMP_PROTO ((mpq_ptr, mpz_srcptr));
-
-#define mpq_set_si __gmpq_set_si
-__GMP_DECLSPEC void mpq_set_si __GMP_PROTO ((mpq_ptr, signed long int, unsigned long int));
-
-#define mpq_set_str __gmpq_set_str
-__GMP_DECLSPEC int mpq_set_str __GMP_PROTO ((mpq_ptr, __gmp_const char *, int));
-
-#define mpq_set_ui __gmpq_set_ui
-__GMP_DECLSPEC void mpq_set_ui __GMP_PROTO ((mpq_ptr, unsigned long int, unsigned long int));
-
-#define mpq_set_z __gmpq_set_z
-__GMP_DECLSPEC void mpq_set_z __GMP_PROTO ((mpq_ptr, mpz_srcptr));
-
-#define mpq_sub __gmpq_sub
-__GMP_DECLSPEC void mpq_sub __GMP_PROTO ((mpq_ptr, mpq_srcptr, mpq_srcptr));
-
-#define mpq_swap __gmpq_swap
-__GMP_DECLSPEC void mpq_swap __GMP_PROTO ((mpq_ptr, mpq_ptr)) __GMP_NOTHROW;
-
-
-/**************** Float (i.e. F) routines. ****************/
-
-#define mpf_abs __gmpf_abs
-__GMP_DECLSPEC void mpf_abs __GMP_PROTO ((mpf_ptr, mpf_srcptr));
-
-#define mpf_add __gmpf_add
-__GMP_DECLSPEC void mpf_add __GMP_PROTO ((mpf_ptr, mpf_srcptr, mpf_srcptr));
-
-#define mpf_add_ui __gmpf_add_ui
-__GMP_DECLSPEC void mpf_add_ui __GMP_PROTO ((mpf_ptr, mpf_srcptr, unsigned long int));
-#define mpf_ceil __gmpf_ceil
-__GMP_DECLSPEC void mpf_ceil __GMP_PROTO ((mpf_ptr, mpf_srcptr));
-
-#define mpf_clear __gmpf_clear
-__GMP_DECLSPEC void mpf_clear __GMP_PROTO ((mpf_ptr));
-
-#define mpf_cmp __gmpf_cmp
-__GMP_DECLSPEC int mpf_cmp __GMP_PROTO ((mpf_srcptr, mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_cmp_d __gmpf_cmp_d
-__GMP_DECLSPEC int mpf_cmp_d __GMP_PROTO ((mpf_srcptr, double)) __GMP_ATTRIBUTE_PURE;
-
-#define mpf_cmp_si __gmpf_cmp_si
-__GMP_DECLSPEC int mpf_cmp_si __GMP_PROTO ((mpf_srcptr, signed long int)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_cmp_ui __gmpf_cmp_ui
-__GMP_DECLSPEC int mpf_cmp_ui __GMP_PROTO ((mpf_srcptr, unsigned long int)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_div __gmpf_div
-__GMP_DECLSPEC void mpf_div __GMP_PROTO ((mpf_ptr, mpf_srcptr, mpf_srcptr));
-
-#define mpf_div_2exp __gmpf_div_2exp
-__GMP_DECLSPEC void mpf_div_2exp __GMP_PROTO ((mpf_ptr, mpf_srcptr, unsigned long int));
-
-#define mpf_div_ui __gmpf_div_ui
-__GMP_DECLSPEC void mpf_div_ui __GMP_PROTO ((mpf_ptr, mpf_srcptr, unsigned long int));
-
-#define mpf_dump __gmpf_dump
-__GMP_DECLSPEC void mpf_dump __GMP_PROTO ((mpf_srcptr));
-
-#define mpf_eq __gmpf_eq
-__GMP_DECLSPEC int mpf_eq __GMP_PROTO ((mpf_srcptr, mpf_srcptr, unsigned long int)) __GMP_ATTRIBUTE_PURE;
-
-#define mpf_fits_sint_p __gmpf_fits_sint_p
-__GMP_DECLSPEC int mpf_fits_sint_p __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_fits_slong_p __gmpf_fits_slong_p
-__GMP_DECLSPEC int mpf_fits_slong_p __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_fits_sshort_p __gmpf_fits_sshort_p
-__GMP_DECLSPEC int mpf_fits_sshort_p __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_fits_uint_p __gmpf_fits_uint_p
-__GMP_DECLSPEC int mpf_fits_uint_p __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_fits_ulong_p __gmpf_fits_ulong_p
-__GMP_DECLSPEC int mpf_fits_ulong_p __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_fits_ushort_p __gmpf_fits_ushort_p
-__GMP_DECLSPEC int mpf_fits_ushort_p __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_floor __gmpf_floor
-__GMP_DECLSPEC void mpf_floor __GMP_PROTO ((mpf_ptr, mpf_srcptr));
-
-#define mpf_get_d __gmpf_get_d
-__GMP_DECLSPEC double mpf_get_d __GMP_PROTO ((mpf_srcptr)) __GMP_ATTRIBUTE_PURE;
-
-#define mpf_get_d_2exp __gmpf_get_d_2exp
-__GMP_DECLSPEC double mpf_get_d_2exp __GMP_PROTO ((signed long int *, mpf_srcptr));
-
-#define mpf_get_default_prec __gmpf_get_default_prec
-__GMP_DECLSPEC unsigned long int mpf_get_default_prec __GMP_PROTO ((void)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_get_prec __gmpf_get_prec
-__GMP_DECLSPEC unsigned long int mpf_get_prec __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_get_si __gmpf_get_si
-__GMP_DECLSPEC long mpf_get_si __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_get_str __gmpf_get_str
-__GMP_DECLSPEC char *mpf_get_str __GMP_PROTO ((char *, mp_exp_t *, int, size_t, mpf_srcptr));
-
-#define mpf_get_ui __gmpf_get_ui
-__GMP_DECLSPEC unsigned long mpf_get_ui __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_init __gmpf_init
-__GMP_DECLSPEC void mpf_init __GMP_PROTO ((mpf_ptr));
-
-#define mpf_init2 __gmpf_init2
-__GMP_DECLSPEC void mpf_init2 __GMP_PROTO ((mpf_ptr, unsigned long int));
-
-#define mpf_init_set __gmpf_init_set
-__GMP_DECLSPEC void mpf_init_set __GMP_PROTO ((mpf_ptr, mpf_srcptr));
-
-#define mpf_init_set_d __gmpf_init_set_d
-__GMP_DECLSPEC void mpf_init_set_d __GMP_PROTO ((mpf_ptr, double));
-
-#define mpf_init_set_si __gmpf_init_set_si
-__GMP_DECLSPEC void mpf_init_set_si __GMP_PROTO ((mpf_ptr, signed long int));
-
-#define mpf_init_set_str __gmpf_init_set_str
-__GMP_DECLSPEC int mpf_init_set_str __GMP_PROTO ((mpf_ptr, __gmp_const char *, int));
-
-#define mpf_init_set_ui __gmpf_init_set_ui
-__GMP_DECLSPEC void mpf_init_set_ui __GMP_PROTO ((mpf_ptr, unsigned long int));
-
-#define mpf_inp_str __gmpf_inp_str
-#ifdef _GMP_H_HAVE_FILE
-__GMP_DECLSPEC size_t mpf_inp_str __GMP_PROTO ((mpf_ptr, FILE *, int));
-#endif
-
-#define mpf_integer_p __gmpf_integer_p
-__GMP_DECLSPEC int mpf_integer_p __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_mul __gmpf_mul
-__GMP_DECLSPEC void mpf_mul __GMP_PROTO ((mpf_ptr, mpf_srcptr, mpf_srcptr));
-
-#define mpf_mul_2exp __gmpf_mul_2exp
-__GMP_DECLSPEC void mpf_mul_2exp __GMP_PROTO ((mpf_ptr, mpf_srcptr, unsigned long int));
-
-#define mpf_mul_ui __gmpf_mul_ui
-__GMP_DECLSPEC void mpf_mul_ui __GMP_PROTO ((mpf_ptr, mpf_srcptr, unsigned long int));
-
-#define mpf_neg __gmpf_neg
-__GMP_DECLSPEC void mpf_neg __GMP_PROTO ((mpf_ptr, mpf_srcptr));
-
-#define mpf_out_str __gmpf_out_str
-#ifdef _GMP_H_HAVE_FILE
-__GMP_DECLSPEC size_t mpf_out_str __GMP_PROTO ((FILE *, int, size_t, mpf_srcptr));
-#endif
-
-#define mpf_pow_ui __gmpf_pow_ui
-__GMP_DECLSPEC void mpf_pow_ui __GMP_PROTO ((mpf_ptr, mpf_srcptr, unsigned long int));
-
-#define mpf_random2 __gmpf_random2
-__GMP_DECLSPEC void mpf_random2 __GMP_PROTO ((mpf_ptr, mp_size_t, mp_exp_t));
-
-#define mpf_reldiff __gmpf_reldiff
-__GMP_DECLSPEC void mpf_reldiff __GMP_PROTO ((mpf_ptr, mpf_srcptr, mpf_srcptr));
-
-#define mpf_set __gmpf_set
-__GMP_DECLSPEC void mpf_set __GMP_PROTO ((mpf_ptr, mpf_srcptr));
-
-#define mpf_set_d __gmpf_set_d
-__GMP_DECLSPEC void mpf_set_d __GMP_PROTO ((mpf_ptr, double));
-
-#define mpf_set_default_prec __gmpf_set_default_prec
-__GMP_DECLSPEC void mpf_set_default_prec __GMP_PROTO ((unsigned long int)) __GMP_NOTHROW;
-
-#define mpf_set_prec __gmpf_set_prec
-__GMP_DECLSPEC void mpf_set_prec __GMP_PROTO ((mpf_ptr, unsigned long int));
-
-#define mpf_set_prec_raw __gmpf_set_prec_raw
-__GMP_DECLSPEC void mpf_set_prec_raw __GMP_PROTO ((mpf_ptr, unsigned long int)) __GMP_NOTHROW;
-
-#define mpf_set_q __gmpf_set_q
-__GMP_DECLSPEC void mpf_set_q __GMP_PROTO ((mpf_ptr, mpq_srcptr));
-
-#define mpf_set_si __gmpf_set_si
-__GMP_DECLSPEC void mpf_set_si __GMP_PROTO ((mpf_ptr, signed long int));
-
-#define mpf_set_str __gmpf_set_str
-__GMP_DECLSPEC int mpf_set_str __GMP_PROTO ((mpf_ptr, __gmp_const char *, int));
-
-#define mpf_set_ui __gmpf_set_ui
-__GMP_DECLSPEC void mpf_set_ui __GMP_PROTO ((mpf_ptr, unsigned long int));
-
-#define mpf_set_z __gmpf_set_z
-__GMP_DECLSPEC void mpf_set_z __GMP_PROTO ((mpf_ptr, mpz_srcptr));
-
-#define mpf_size __gmpf_size
-__GMP_DECLSPEC size_t mpf_size __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_sqrt __gmpf_sqrt
-__GMP_DECLSPEC void mpf_sqrt __GMP_PROTO ((mpf_ptr, mpf_srcptr));
-
-#define mpf_sqrt_ui __gmpf_sqrt_ui
-__GMP_DECLSPEC void mpf_sqrt_ui __GMP_PROTO ((mpf_ptr, unsigned long int));
-
-#define mpf_sub __gmpf_sub
-__GMP_DECLSPEC void mpf_sub __GMP_PROTO ((mpf_ptr, mpf_srcptr, mpf_srcptr));
-
-#define mpf_sub_ui __gmpf_sub_ui
-__GMP_DECLSPEC void mpf_sub_ui __GMP_PROTO ((mpf_ptr, mpf_srcptr, unsigned long int));
-
-#define mpf_swap __gmpf_swap
-__GMP_DECLSPEC void mpf_swap __GMP_PROTO ((mpf_ptr, mpf_ptr)) __GMP_NOTHROW;
-
-#define mpf_trunc __gmpf_trunc
-__GMP_DECLSPEC void mpf_trunc __GMP_PROTO ((mpf_ptr, mpf_srcptr));
-
-#define mpf_ui_div __gmpf_ui_div
-__GMP_DECLSPEC void mpf_ui_div __GMP_PROTO ((mpf_ptr, unsigned long int, mpf_srcptr));
-
-#define mpf_ui_sub __gmpf_ui_sub
-__GMP_DECLSPEC void mpf_ui_sub __GMP_PROTO ((mpf_ptr, unsigned long int, mpf_srcptr));
-
-#define mpf_urandomb __gmpf_urandomb
-__GMP_DECLSPEC void mpf_urandomb __GMP_PROTO ((mpf_t, gmp_randstate_t, unsigned long int));
-
-
-/************ Low level positive-integer (i.e. N) routines. ************/
-
-/* This is ugly, but we need to make user calls reach the prefixed function. */
-
-#define mpn_add __MPN(add)
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpn_add)
-__GMP_DECLSPEC mp_limb_t mpn_add __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_srcptr,mp_size_t));
-#endif
-
-#define mpn_add_1 __MPN(add_1)
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpn_add_1)
-__GMP_DECLSPEC mp_limb_t mpn_add_1 __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_limb_t)) __GMP_NOTHROW;
-#endif
-
-#define mpn_add_n __MPN(add_n)
-__GMP_DECLSPEC mp_limb_t mpn_add_n __GMP_PROTO ((mp_ptr, mp_srcptr, mp_srcptr, mp_size_t));
-
-#define mpn_addmul_1 __MPN(addmul_1)
-__GMP_DECLSPEC mp_limb_t mpn_addmul_1 __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_limb_t));
-
-#define mpn_bdivmod __MPN(bdivmod)
-__GMP_DECLSPEC mp_limb_t mpn_bdivmod __GMP_PROTO ((mp_ptr, mp_ptr, mp_size_t, mp_srcptr, mp_size_t, unsigned long int));
-
-#define mpn_cmp __MPN(cmp)
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpn_cmp)
-__GMP_DECLSPEC int mpn_cmp __GMP_PROTO ((mp_srcptr, mp_srcptr, mp_size_t)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-#endif
-
-#define mpn_divexact_by3(dst,src,size) \
- mpn_divexact_by3c (dst, src, size, __GMP_CAST (mp_limb_t, 0))
-
-#define mpn_divexact_by3c __MPN(divexact_by3c)
-__GMP_DECLSPEC mp_limb_t mpn_divexact_by3c __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_limb_t));
-
-#define mpn_divmod_1(qp,np,nsize,dlimb) \
- mpn_divrem_1 (qp, __GMP_CAST (mp_size_t, 0), np, nsize, dlimb)
-
-#define mpn_divrem __MPN(divrem)
-__GMP_DECLSPEC mp_limb_t mpn_divrem __GMP_PROTO ((mp_ptr, mp_size_t, mp_ptr, mp_size_t, mp_srcptr, mp_size_t));
-
-#define mpn_divrem_1 __MPN(divrem_1)
-__GMP_DECLSPEC mp_limb_t mpn_divrem_1 __GMP_PROTO ((mp_ptr, mp_size_t, mp_srcptr, mp_size_t, mp_limb_t));
-
-#define mpn_divrem_2 __MPN(divrem_2)
-__GMP_DECLSPEC mp_limb_t mpn_divrem_2 __GMP_PROTO ((mp_ptr, mp_size_t, mp_ptr, mp_size_t, mp_srcptr));
-
-#define mpn_gcd __MPN(gcd)
-__GMP_DECLSPEC mp_size_t mpn_gcd __GMP_PROTO ((mp_ptr, mp_ptr, mp_size_t, mp_ptr, mp_size_t));
-
-#define mpn_gcd_1 __MPN(gcd_1)
-__GMP_DECLSPEC mp_limb_t mpn_gcd_1 __GMP_PROTO ((mp_srcptr, mp_size_t, mp_limb_t)) __GMP_ATTRIBUTE_PURE;
-
-#define mpn_gcdext __MPN(gcdext)
-__GMP_DECLSPEC mp_size_t mpn_gcdext __GMP_PROTO ((mp_ptr, mp_ptr, mp_size_t *, mp_ptr, mp_size_t, mp_ptr, mp_size_t));
-
-#define mpn_get_str __MPN(get_str)
-__GMP_DECLSPEC size_t mpn_get_str __GMP_PROTO ((unsigned char *, int, mp_ptr, mp_size_t));
-
-#define mpn_hamdist __MPN(hamdist)
-__GMP_DECLSPEC unsigned long int mpn_hamdist __GMP_PROTO ((mp_srcptr, mp_srcptr, mp_size_t)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpn_lshift __MPN(lshift)
-__GMP_DECLSPEC mp_limb_t mpn_lshift __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, unsigned int));
-
-#define mpn_mod_1 __MPN(mod_1)
-__GMP_DECLSPEC mp_limb_t mpn_mod_1 __GMP_PROTO ((mp_srcptr, mp_size_t, mp_limb_t)) __GMP_ATTRIBUTE_PURE;
-
-#define mpn_mul __MPN(mul)
-__GMP_DECLSPEC mp_limb_t mpn_mul __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t));
-
-#define mpn_mul_1 __MPN(mul_1)
-__GMP_DECLSPEC mp_limb_t mpn_m...
[truncated message content] |
|
From: <Ba...@us...> - 2010-10-07 02:26:11
|
Revision: 400
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=400&view=rev
Author: Batalov
Date: 2010-10-07 02:26:00 +0000 (Thu, 07 Oct 2010)
Log Message:
-----------
Equivalent patches for plain lasieve4 (=v.399)
Modified Paths:
--------------
trunk/src/lasieve4/gnfs-lasieve4e.c
Property Changed:
----------------
trunk/src/lasieve4/lasieve.h
Modified: trunk/src/lasieve4/gnfs-lasieve4e.c
===================================================================
--- trunk/src/lasieve4/gnfs-lasieve4e.c 2010-10-06 01:37:17 UTC (rev 399)
+++ trunk/src/lasieve4/gnfs-lasieve4e.c 2010-10-07 02:26:00 UTC (rev 400)
@@ -227,6 +227,7 @@
static mpz_t td_rests[L1_SIZE];
static mpz_t large_factors[2], *(large_primes[2]);
static mpz_t FBb_sq[2];
+static mpz_t FBb_cu[2];
/**************************************************/
void Usage()
@@ -245,9 +246,10 @@
#endif
static u16_t special_q_side, first_td_side, first_sieve_side;
-static u16_t first_psp_side, first_mpqs_side;
static u16_t cmdline_first_sieve_side = USHRT_MAX;
static u16_t cmdline_first_td_side = USHRT_MAX;
+static u16_t cmdline_first_mpqs_side= USHRT_MAX;
+static u16_t cmdline_first_psp_side= USHRT_MAX;
jmp_buf termination_jb;
@@ -2409,9 +2411,12 @@
{
u32_t s, *(fbp_buffers[2]), *(fbp_buffers_ub[2]);
i16_t need_mpqs[2];
+ i16_t need_psp[2];
size_t nlp[2];
clock_t cl;
u32_t ov;
+ u16_t first_psp_side = cmdline_first_psp_side;
+ u16_t first_mpqs_side = cmdline_first_mpqs_side;
s = first_td_side;
fbp_buffers[s] = td_buf1[ci];
@@ -2428,34 +2433,56 @@
mpz_sizeinbase(large_factors[0], 2),
mpz_sizeinbase(large_factors[1], 2));
#endif
+
+ if (first_psp_side > 1 || first_mpqs_side > 1) {
+ if (mpz_cmp(large_factors[0], large_factors[1]) < 0) {
+ if (first_psp_side > 1) first_psp_side = 0;
+ if (first_mpqs_side > 1) first_mpqs_side = 0;
+ }
+ else {
+ if (first_psp_side > 1) first_psp_side = 1;
+ if (first_mpqs_side > 1) first_mpqs_side = 1;
+ }
+ }
+
for (s = 0; s < 2; s++) {
- i16_t is_prime;
+ size_t nb = mpz_sizeinbase(large_factors[s], 2);
+
+ need_psp[s] = 0;
+ if (mpz_cmp(large_factors[s], FBb_sq[s]) < 0) {
+ if (nb <= max_primebits[s])
+ continue;
+ break;
+ }
+ if (mpz_cmp(large_factors[s], FBb_cu[s]) < 0) {
+ if (nb <= max_primebits[s] * 2) {
+ need_psp[s] = 1;
+ continue;
+ }
+ break;
+ }
+ need_psp[s] = 1;
+ }
+ if (s != 2)
+ continue;
+
+ for (s = 0; s < 2; s++) {
u16_t s1;
s1 = s ^ first_psp_side;
- if (mpz_cmp_ui(large_factors[s1], 1) == 0) {
- nlp[s1] = 0;
- need_mpqs[s1] = 0;
- } else {
- if (mpz_cmp(large_factors[s1], FBb_sq[s1]) < 0)
- is_prime = 1;
- else
-// is_prime = psp(large_factors[s1], 1);
- is_prime = psp(large_factors[s1]);
- if (is_prime == 1) {
- if (mpz_sizeinbase(large_factors[s1], 2) >
- max_primebits[s1])
- break;
- else {
- mpz_set(large_primes[s1][0],
- large_factors[s1]);
- need_mpqs[s1] = 0;
- nlp[s1] = 1;
- }
- } else {
- need_mpqs[s1] = 1;
+ need_mpqs[s1] = 0;
+ if (!need_psp[s1]) {
+ if (mpz_cmp_ui(large_factors[s1], 1) == 0)
+ nlp[s1] = 0;
+ else {
+ mpz_set(large_primes[s1][0], large_factors[s1]);
+ nlp[s1] = 1;
}
+ continue;
}
+ if (psp(large_factors[s1]))
+ break;
+ need_mpqs[s1] = 1;
}
if (s != 2)
continue;
@@ -2875,8 +2902,6 @@
process_no = 0;
catch_signals = 0;
- first_psp_side = 2;
- first_mpqs_side = 0;
J_bits = UINT_MAX;
#define NumRead(x) if(sscanf(optarg, "%u" ,(unsigned int*)&x)!=1) Usage()
@@ -2894,9 +2919,13 @@
case 'L':
sysload_cmd = optarg; break;
case 'M':
- NumRead16(first_mpqs_side); break;
+ if (sscanf(optarg, "%hu", &cmdline_first_mpqs_side) != 1)
+ complain("-M %s ???\n", optarg);
+ break;
case 'P':
- NumRead16(first_psp_side); break;
+ if (sscanf(optarg, "%hu", &cmdline_first_psp_side) != 1)
+ complain("-P %s ???\n", optarg);
+ break;
case 'S':
if (sscanf(optarg, "%f", &sigma) != 1) {
errprintf("Cannot read floating point number %s\n", optarg);
@@ -2973,8 +3002,8 @@
if (J_bits == UINT_MAX)
J_bits = I_bits - 1;
- if (first_psp_side == 2)
- first_psp_side = first_mpqs_side;
+ if (cmdline_first_psp_side == USHRT_MAX)
+ cmdline_first_psp_side = cmdline_first_mpqs_side;
#ifndef I_bits
#error Must #define I_bits
#endif
@@ -3409,6 +3438,8 @@
}
mpz_init_set_d(FBb_sq[s], FB_bound[s]);
mpz_mul(FBb_sq[s], FBb_sq[s], FBb_sq[s]);
+ mpz_init_set_d(FBb_cu[s],FB_bound[s]);
+ mpz_pow_ui(FBb_cu[s],FBb_cu[s],3);
}
all_spq_done = 1;
Property changes on: trunk/src/lasieve4/lasieve.h
___________________________________________________________________
Added: svn:keywords
+ Date Rev
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ba...@us...> - 2010-10-06 01:37:26
|
Revision: 399
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=399&view=rev
Author: Batalov
Date: 2010-10-06 01:37:17 +0000 (Wed, 06 Oct 2010)
Log Message:
-----------
A couple of clever patches from JRK
Modified Paths:
--------------
trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c
Modified: trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c
===================================================================
--- trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c 2010-09-09 11:54:17 UTC (rev 398)
+++ trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c 2010-10-06 01:37:17 UTC (rev 399)
@@ -268,6 +268,7 @@
static mpz_t td_rests[L1_SIZE];
static mpz_t large_factors[2],*(large_primes[2]);
static mpz_t FBb_sq[2];
+static mpz_t FBb_cu[2];
void Usage()
@@ -285,9 +286,11 @@
#endif
static u16_t special_q_side,first_td_side,first_sieve_side;
-static u16_t first_psp_side,first_mpqs_side,append_output,exitval;
+static u16_t append_output,exitval;
static u16_t cmdline_first_sieve_side= USHRT_MAX;
static u16_t cmdline_first_td_side= USHRT_MAX;
+static u16_t cmdline_first_mpqs_side= USHRT_MAX;
+static u16_t cmdline_first_psp_side= USHRT_MAX;
#define ALGEBRAIC_SIDE 0
#define RATIONAL_SIDE 1
#define NO_SIDE 2
@@ -440,8 +443,6 @@
process_no= 0;
catch_signals= 0;
- first_psp_side= 2;
- first_mpqs_side= 0;
J_bits= U32_MAX;
#define NumRead(x) if(sscanf(optarg,"%u",&x)!=1) Usage()
@@ -462,10 +463,12 @@
sysload_cmd= optarg;
break;
case'M':
- NumRead16(first_mpqs_side);
+ if(sscanf(optarg,"%hu",&cmdline_first_mpqs_side)!=1)
+ complain("-M %s ???\n",optarg);
break;
case'P':
- NumRead16(first_psp_side);
+ if(sscanf(optarg,"%hu",&cmdline_first_psp_side)!=1)
+ complain("-P %s ???\n",optarg);
break;
case'S':
if(sscanf(optarg,"%f",&sigma)!=1) {
@@ -561,8 +564,8 @@
if(J_bits == U32_MAX)
J_bits = I_bits-1;
- if(first_psp_side == 2)
- first_psp_side = first_mpqs_side;
+ if(cmdline_first_psp_side == USHRT_MAX)
+ cmdline_first_psp_side = cmdline_first_mpqs_side;
#ifndef I_bits
#error Must #define I_bits
#endif
@@ -1317,6 +1320,8 @@
}
mpz_init_set_d(FBb_sq[s],FB_bound[s]);
mpz_mul(FBb_sq[s],FBb_sq[s],FBb_sq[s]);
+ mpz_init_set_d(FBb_cu[s],FB_bound[s]);
+ mpz_pow_ui(FBb_cu[s],FBb_cu[s],3);
}
}
@@ -3859,18 +3864,36 @@
primality_tests()
{
int s;
+ u16_t first_psp_side= cmdline_first_psp_side;
+ int need_test[2];
+
+ if(first_psp_side>1)
+ first_psp_side= (mpz_cmp(large_factors[0],large_factors[1])<0) ? 0 : 1;
for(s= 0;s<2;s++) {
- i16_t is_prime;
+ size_t nb;
+ need_test[s]= 0;
+
+ nb= mpz_sizeinbase(large_factors[s],2);
+ if(mpz_cmp(large_factors[s],FBb_sq[s])<0) {
+ if(nb<=max_primebits[s])continue;
+ return 0;
+ }
+ if(mpz_cmp(large_factors[s],FBb_cu[s])<0) {
+ if(nb<=max_primebits[s]*2) {
+ need_test[s]= 1;
+ continue;
+ }
+ return 0;
+ }
+ need_test[s]= 1;
+ }
+ for(s= 0;s<2;s++) {
u16_t s1;
-
s1= s^first_psp_side;
- if(mpz_cmp_ui(large_factors[s1],1) == 0)continue;
- if(mpz_cmp(large_factors[s1],FBb_sq[s1])<0)is_prime= 1;
- else is_prime= psp(large_factors[s1],1);
- if(is_prime == 1) {
- if(mpz_sizeinbase(large_factors[s1],2)> max_primebits[s1])return 0;
- } else mpz_neg(large_factors[s1],large_factors[s1]);
+ if(!need_test[s1])continue;
+ if(psp(large_factors[s1],1)==1)return 0;
+ mpz_neg(large_factors[s1],large_factors[s1]);
}
return 1;
}
@@ -3924,6 +3947,7 @@
u32_t s,*(fbp_buffers[2]),*(fbp_buffers_ub[2]);
u32_t nlp[2];
clock_t cl;
+ u16_t first_mpqs_side= cmdline_first_mpqs_side;
s= first_td_side;
fbp_buffers[s]= fbp_buf0;
@@ -3937,6 +3961,10 @@
if(primality_tests() == 0)return;
#endif
+ if(first_mpqs_side>1)
+ first_mpqs_side = (mpz_cmp(large_factors[0],large_factors[1])>0) ? 0 : 1;
+ /* Note: here, the large_factors[] values are negative, so the logic is reversed */
+
cl= clock();
for(s= 0;s<2;s++) {
u16_t s1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2010-09-09 11:54:23
|
Revision: 398
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=398&view=rev
Author: sten_
Date: 2010-09-09 11:54:17 +0000 (Thu, 09 Sep 2010)
Log Message:
-----------
* $lasieve variable now holds siever executable file name (to easily change gnfs-lasieve4Ie14 to gnfs-lasieve4Ie16 e.t.c.).
* BUG: .lastjob is not properly saved when handling TODO lists (thanks to Solo and Dmit for bug report and for the fix).
* By default use gnfs-lasieve4Ie16 siever.
Modified Paths:
--------------
trunk/contrib/scripts/nfs_agent.pl
Modified: trunk/contrib/scripts/nfs_agent.pl
===================================================================
--- trunk/contrib/scripts/nfs_agent.pl 2010-07-25 08:56:44 UTC (rev 397)
+++ trunk/contrib/scripts/nfs_agent.pl 2010-09-09 11:54:17 UTC (rev 398)
@@ -24,9 +24,9 @@
#
# How to use:
#
-# 1) Change $nick script parameter and optionally set $output_dir to some shared folder (*.spairs output files will be moved there).
+# 1) Change $nick script parameter and optionally set $output_dir to some shared folder (*.spairs output files will be moved there).
# 2) Place these files into the same directory:
-# - gnfs-lasieve4I14e.exe
+# - gnfs-lasieve4I16e.exe (file name can be changed via $lasieve variable).
# - nfs_agent.pl
# 3) Run the script.
# 4) Ensure it works and forget it for several weeks. :)
@@ -45,6 +45,7 @@
$script = 'sieve/getblock.php'; # ex. '2p643m3/getblock.php';
$task = 'TaskName.1'; # Task name
$blocksize = 'small';
+$lasieve = 'gnfs-lasieve4I16e'; # siever file name.
$output_dir = undef; # ex. for Windows: "\\\\myserver\\spairs"; Output files will be automatically moved to \\myserver\spairs.
# --------------------------
@@ -82,6 +83,7 @@
ExecJob($jobFileName);
}
+
while (1)
{
#
@@ -216,13 +218,6 @@
print JOBFILE $response;
close (JOBFILE);
- #
- # Save .lastjob file
- #
- open(LASTJOBFILE, ">.lastjob") || return 0;
- print LASTJOBFILE "$jobFileName";
- close (LASTJOBFILE);
-
return "$jobFileName";
}
@@ -236,6 +231,13 @@
open(JOBFILE, $jobFileName) || die "Can't open job file ($jobFileName).\n";
+ #
+ # Save .lastjob file
+ #
+ open(LASTJOBFILE, ">.lastjob") || return 0;
+ print LASTJOBFILE "$jobFileName";
+ close (LASTJOBFILE);
+
@JobData = <JOBFILE>;
close (JOBFILE);
@@ -259,8 +261,8 @@
$spqFileName = ".last_spq1234";
unlink "$workFileName", "$spqFileName";
- system ("gnfs-lasieve4I14e -k -o $workFileName -v -a $jobFileName -n1234") == 0
- || die "Error: Unable to execute gnfs-lasieve4I14e.\n";
+ system ("$lasieve -k -o $workFileName -v -a $jobFileName -n1234") == 0
+ || die "Error: Unable to execute $lasieve.\n";
rename ($workFileName, $spairsFileName);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2010-07-25 08:56:50
|
Revision: 397
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=397&view=rev
Author: sten_
Date: 2010-07-25 08:56:44 +0000 (Sun, 25 Jul 2010)
Log Message:
-----------
* "Precomputed factorbase" optimization has been removed (it doesn't speed up things too much, but is known to cause troubles in some cases).
Modified Paths:
--------------
trunk/contrib/scripts/nfs_agent.pl
Modified: trunk/contrib/scripts/nfs_agent.pl
===================================================================
--- trunk/contrib/scripts/nfs_agent.pl 2010-07-20 17:01:00 UTC (rev 396)
+++ trunk/contrib/scripts/nfs_agent.pl 2010-07-25 08:56:44 UTC (rev 397)
@@ -24,12 +24,10 @@
#
# How to use:
#
-# 1) Change $nick script parameter and optionally set $output_dir to some shared folder (*.spairs output files will be moved there).
+# 1) Change $nick script parameter and optionally set $output_dir to some shared folder (*.spairs output files will be moved there).
# 2) Place these files into the same directory:
# - gnfs-lasieve4I14e.exe
-# - sieve.pl
-# - factorbase.dat (optional, just rename block-XXX.job.afb.0 into factorbase.dat)
-# !!! commands to copy factobase.dat tto block-XXX.job.afb.0 are currently disabled. !!!
+# - nfs_agent.pl
# 3) Run the script.
# 4) Ensure it works and forget it for several weeks. :)
#
@@ -261,22 +259,6 @@
$spqFileName = ".last_spq1234";
unlink "$workFileName", "$spqFileName";
- #
- # 1) Copy factorbase.dat to .afb.0 file. Dunno yet how to tell gnfs-lasieve4I14e
- # to use given factorbase file.
- # 2) Execute lasieve
- # 3) Cleanup everything
- #
- if ($^O eq "MSWin32")
- {
- # Win32
- system ("copy factorbase.dat $jobFileName.afb.0");
- }
- else {
- # Unix
- #system ("cp factorbase.dat $jobFileName.afb.0");
- }
-
system ("gnfs-lasieve4I14e -k -o $workFileName -v -a $jobFileName -n1234") == 0
|| die "Error: Unable to execute gnfs-lasieve4I14e.\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2010-07-20 17:01:07
|
Revision: 396
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=396&view=rev
Author: sten_
Date: 2010-07-20 17:01:00 +0000 (Tue, 20 Jul 2010)
Log Message:
-----------
* sieve.pl renamed to nfs_agent.pl (I found people like this name).
* nfs_agent.pl now can automatically move ouput *.spairs files to some central $output_dir folder (for ex. move output to '\\server\spairs'). This feature should be useful for large factorication projects that use a log of machines.
Added Paths:
-----------
trunk/contrib/scripts/nfs_agent.pl
Removed Paths:
-------------
trunk/contrib/scripts/sieve.pl
Copied: trunk/contrib/scripts/nfs_agent.pl (from rev 395, trunk/contrib/scripts/sieve.pl)
===================================================================
--- trunk/contrib/scripts/nfs_agent.pl (rev 0)
+++ trunk/contrib/scripts/nfs_agent.pl 2010-07-20 17:01:00 UTC (rev 396)
@@ -0,0 +1,343 @@
+#!/usr/bin/perl
+#
+##############################################################################
+# sieve.pl #
+# Distributed sieving client script. #
+# Copyright 2006-2010, Sten. #
+##############################################################################
+#
+# This file is part of GGNFS.
+#
+# GGNFS is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# GGNFS is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GGNFS; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# How to use:
+#
+# 1) Change $nick script parameter and optionally set $output_dir to some shared folder (*.spairs output files will be moved there).
+# 2) Place these files into the same directory:
+# - gnfs-lasieve4I14e.exe
+# - sieve.pl
+# - factorbase.dat (optional, just rename block-XXX.job.afb.0 into factorbase.dat)
+# !!! commands to copy factobase.dat tto block-XXX.job.afb.0 are currently disabled. !!!
+# 3) Run the script.
+# 4) Ensure it works and forget it for several weeks. :)
+#
+use Socket;
+
+sub ExecJob($);
+sub GetAndParseJob($);
+sub MoveSpairsToOutputDir();
+
+# --------------------------
+# Main configuration
+# --------------------------
+$nick = 'ChangeMe'; # ex. 'Dmit';
+$host = 'factoring.org'; # http header field
+$script = 'sieve/getblock.php'; # ex. '2p643m3/getblock.php';
+$task = 'TaskName.1'; # Task name
+$blocksize = 'small';
+$output_dir = undef; # ex. for Windows: "\\\\myserver\\spairs"; Output files will be automatically moved to \\myserver\spairs.
+
+# --------------------------
+# Proxy configuration
+# --------------------------
+$server = 'factoring.org'; # ex. 'my.proxy.com';
+$port = 80; # ex. 3128
+$hdr_add = ''; # ex. 'Proxy-Authorization: Basic a384ZrRab5Z7O9luchJKZdZ5ejB2QQ==\n';
+
+$content = "name=$nick&blocksize=$blocksize&blockcount=1&task=$task";
+
+$http = "POST http://$host/$script HTTP/1.0\n".
+ "Host: $host\n".
+ "User-Agent: Factoring Machine 1.0\n".
+ "Referer: $host\n".
+ $hdr_add.
+ "Connection: close\n".
+ "Content-Type: application/x-www-form-urlencoded\n".
+ "Content-Length: ". length($content). "\n\n".
+ $content;
+
+$tcp = getprotobyname('tcp') or die "Couldn't getprotobyname!\n";
+$hosti = inet_aton($server) or die "Couldn't look up host!\n";
+$hosts = sockaddr_in($port, $hosti);
+
+MoveSpairsToOutputDir();
+
+#
+# Open .lastjob file and see if we have terminated unexpectedly last time
+#
+if (open(LASTJOBFILE, ".lastjob") && ($jobFileName = <LASTJOBFILE>))
+{
+ close (LASTJOBFILE);
+ print "Restoring last job: $jobFileName\n";
+ ExecJob($jobFileName);
+}
+
+while (1)
+{
+ #
+ # check if we were signalled to stop processing
+ #
+ if (-e '.stop')
+ {
+ unlink '.stop';
+ last;
+ }
+
+ MoveSpairsToOutputDir();
+
+ #
+ # Check TODO list
+ #
+ if (opendir(DIR, "todo"))
+ {
+ while ($entry = readdir( DIR ))
+ {
+ if (not($entry eq '.' || $entry eq '..')) {last;}
+ }
+
+ if ($entry)
+ {
+ $oldname = "todo\\$entry";
+ $newname = $entry;
+
+ print "Renaming $oldname to $newname\n";
+ rename ($oldname, $newname);
+ ExecJob ($newname);
+ next;
+ }
+ }
+
+ #
+ # Call remote getblock.php script and allocate new job
+ #
+ socket(SOK, PF_INET, SOCK_STREAM, $tcp)
+ || goto sleep_continue;
+ connect(SOK, $hosts)
+ || goto sleep_continue;
+
+ select SOK; $| = 1; select STDOUT;
+ print SOK $http;
+
+ $response = '';
+ while (<SOK>) { $response .= $_; }
+ close SOK;
+
+ #
+ # Extract .job file URL
+ #
+ if (!($response =~ m|"(http://$host.*\.job)"|g))
+ {
+ print "Error: bad server response.\n";
+ goto sleep_continue;
+ }
+
+ #
+ # Download .job file and parse it, save to disk.
+ # N.B. Function sets $blkStart, $blkSize, $blkEnd global
+ # vars as a side effect.
+ #
+ if (!($jobFileName = GetAndParseJob($1)))
+ {
+ print "Error: GetAndParseJob() failed.\n";
+ goto sleep_continue;
+ }
+
+ #
+ # Execute .job file
+ #
+ ExecJob($jobFileName);
+
+ next;
+
+sleep_continue:
+ print "Error: Some error occured. Sleeping 10 seconds.\n";
+ sleep(10); #wait 10 seconds and try again;
+}
+
+############################################################################
+############################################################################
+############################################################################
+
+sub GetAndParseJob($)
+{
+ my $Url = shift(@_);
+
+ #
+ # Retrive .job file from the server
+ #
+ socket(SOK, PF_INET, SOCK_STREAM, $tcp)
+ || return 0;
+ connect(SOK, $hosts)
+ || return 0;
+
+ select SOK; $| = 1; select STDOUT;
+ print SOK "GET $Url HTTP/1.0\n".
+ "Host: $host\n".
+ "User-Agent: Factoring Machine 6.0\n".
+ "Referer: $host\n".
+ $hdr_add.
+ "Connection: close\n".
+ "Content-Type: application/x-www-form-urlencoded\n".
+ "Content-Length: 0\n\n";
+
+ $response = '';
+ while (<SOK>) { $response .= $_; }
+ close SOK;
+
+ #
+ # Remove HTTP header
+ #
+ (($response) = ($response =~ /HTTP.*200.*\r\n\r\n(.*)/s)) || return 0;
+
+ #
+ # Parse .job file and get q0 and qintsize parameters. Also serves as
+ # rudimentary job file syntax check.
+ #
+ (($baseName) = ($response =~ /name:\s+(\S+)/g)) || return 0;
+ (($blkStart) = ($response =~ /q0:\s+(\d+)/g)) || return 0;
+ (($blkSize) = ($response =~ /qintsize:\s+(\d+)/g)) || return 0;
+# $blkEnd = $blkStart + $blkSize;
+
+ #
+ # Save job to file
+ #
+ $jobFileName = sprintf ("%s.%09d.%d.sieve.job", $baseName, $blkStart, $blkSize);
+ open(JOBFILE, ">$jobFileName") || return 0;
+ print JOBFILE $response;
+ close (JOBFILE);
+
+ #
+ # Save .lastjob file
+ #
+ open(LASTJOBFILE, ">.lastjob") || return 0;
+ print LASTJOBFILE "$jobFileName";
+ close (LASTJOBFILE);
+
+ return "$jobFileName";
+}
+
+############################################################################
+############################################################################
+############################################################################
+
+sub ExecJob($)
+{
+ my $jobFileName = shift(@_);
+
+ open(JOBFILE, $jobFileName) || die "Can't open job file ($jobFileName).\n";
+
+ @JobData = <JOBFILE>;
+ close (JOBFILE);
+
+ $JobData = join('', @JobData);
+
+ #
+ # Parse .job file and get q0 and qintsize parameters.
+ #
+ (($baseName) = ($JobData =~ /name:\s+(\S+)/g)) || return 0;
+ (($blkStart) = ($JobData =~ /q0:\s+(\d+)/g)) || return 0;
+ (($blkSize) = ($JobData =~ /qintsize:\s+(\d+)/g)) || return 0;
+# $blkEnd = $blkStart + $blkSize;
+ print sprintf ("block: %09d, size: %d\n", $blkStart, $blkSize);
+
+ #
+ # Delete $baseName.$blkStart-$blkEnd.work for current block (in case we were terminated
+ # abnormally last time, now we restart last block from the beginning).
+ #
+ $workFileName = sprintf ("%s.%09d.%d.work", $baseName, $blkStart, $blkSize);
+ $spairsFileName = sprintf ("%s.%09d.%d.spairs", $baseName, $blkStart, $blkSize);
+ $spqFileName = ".last_spq1234";
+ unlink "$workFileName", "$spqFileName";
+
+ #
+ # 1) Copy factorbase.dat to .afb.0 file. Dunno yet how to tell gnfs-lasieve4I14e
+ # to use given factorbase file.
+ # 2) Execute lasieve
+ # 3) Cleanup everything
+ #
+ if ($^O eq "MSWin32")
+ {
+ # Win32
+ system ("copy factorbase.dat $jobFileName.afb.0");
+ }
+ else {
+ # Unix
+ #system ("cp factorbase.dat $jobFileName.afb.0");
+ }
+
+ system ("gnfs-lasieve4I14e -k -o $workFileName -v -a $jobFileName -n1234") == 0
+ || die "Error: Unable to execute gnfs-lasieve4I14e.\n";
+
+ rename ($workFileName, $spairsFileName);
+
+ unlink ".lastjob", "$jobFileName", "$jobFileName.afb.0", "$spqFileName", "ggnfs.log";
+
+ #
+ # Count number of relations we have found and add record to the log file
+ #
+ if (open(FILE, "< $spairsFileName"))
+ {
+ $count = 0;
+ $count++ while <FILE>;
+ close (FILE);
+
+ # save log line
+ open (LOGFILE, ">> $baseName.sieve.log");
+ print LOGFILE sprintf ("block: %09d\tsize: %d\tnumrels: %d\n", $blkStart, $blkSize, $count);
+ close (LOGFILE);
+ }
+ else
+ {
+ print "Log Error!\n";
+ }
+};
+
+sub MoveSpairsToOutputDir()
+{
+ #
+ # Move .spairs files to the output directory.
+ #
+ if (defined($output_dir))
+ {
+ if (opendir(DIR, "."))
+ {
+ while (my $fileName = readdir(DIR))
+ {
+ if ($fileName eq '.' || $fileName eq '..')
+ {
+ next;
+ }
+
+ if (!($fileName =~ m/.*\.spairs/))
+ {
+ next;
+ }
+
+ if ($^O eq "MSWin32")
+ {
+ # Win32
+ system ("move $fileName \"$output_dir\"");
+ }
+ else
+ {
+ # Unix
+ system ("mv $fileName \"$output_dir\"");
+ }
+ }
+
+ closedir(DIR);
+ }
+ }
+}
Deleted: trunk/contrib/scripts/sieve.pl
===================================================================
--- trunk/contrib/scripts/sieve.pl 2010-06-08 05:46:44 UTC (rev 395)
+++ trunk/contrib/scripts/sieve.pl 2010-07-20 17:01:00 UTC (rev 396)
@@ -1,249 +0,0 @@
-#!/usr/bin/perl
-#
-##############################################################################
-# sieve.pl #
-# Distributed sieving client script. #
-# Copyright 2006, Sten. #
-##############################################################################
-#
-# This file is part of GGNFS.
-#
-# GGNFS is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# GGNFS is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GGNFS; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# How to use:
-#
-# 1) Change $nick script parameter.
-# 2) Place these files into the same directory:
-# - gnfs-lasieve4I14e.exe
-# - sieve.pl
-# - factorbase.dat (optional, just rename block-XXX.job.afb.0 into factorbase.dat)
-# 3) Run the script.
-# 4) Ensure it works and forget about it for several weeks. :)
-#
-
-use Socket;
-
-sub ExecJob($);
-sub GetAndParseJob($);
-
-# --------------------------
-# Configuration
-# --------------------------
-$nick = 'ChangeMe'; # !!!!!!!!!!!! change it !!!!!!!!!!!!!
-$host = 'factoring.org';
-$blocksize = 'small';
-
-$content = "name=$nick&blocksize=$blocksize&blockcount=1";
-
-$http = "POST /distributed/getblock.php HTTP/1.0\n".
- "Host: $host\n".
- "User-Agent: Internet Exploider 6.0\n".
- "Referer: $host\n".
- "Connection: close\n".
- "Content-Type: application/x-www-form-urlencoded\n".
- "Content-Length: ". length($content). "\n\n".
- $content;
-
-$tcp = getprotobyname('tcp') or die "Couldn't getprotobyname!\n";
-$hosti = inet_aton($host) or die "Couldn't look up host!\n";
-$hosts = sockaddr_in(80, $hosti);
-
-#
-# Open .lastjob file and see if we have terminated unexpectedly last time
-#
-if (open(LASTJOBFILE, ".lastjob") && ($JobName = <LASTJOBFILE>))
-{
- close (LASTJOBFILE);
- print "Restoring last job: $JobName\n";
- ExecJob($JobName);
-}
-
-while (1)
-{
- #
- # check if we were signalled to stop processing
- #
- if (-e '.stop')
- {
- unlink '.stop';
- last;
- }
-
- #
- # Call remote getblock.php script and allocate new task
- #
- socket(SOK, PF_INET, SOCK_STREAM, $tcp)
- || goto sleep_continue;
- connect(SOK, $hosts)
- || goto sleep_continue;
-
- select SOK; $| = 1; select STDOUT;
- print SOK $http;
-
- $response = '';
- while (<SOK>) { $response .= $_; }
- close SOK;
-
- #
- # Extract .job file URL
- #
- if (!($response =~ m|"http://$host(.*\.job)"|g))
- {
- print "Error: bad server response.\n";
- goto sleep_continue;
- }
-
- #
- # Download .job file and parse it, save to disk.
- # N.B. Function sets $block, $nblocksize global vars as a side effect.
- #
- if (!($JobName = GetAndParseJob($1)))
- {
- print "Error: GetAndParseJob() failed.\n";
- goto sleep_continue;
- }
-
- #
- # Execute .job file
- #
- ExecJob($JobName);
-
- #
- # Count number of relations we have found and add record to the log file
- #
- if (open(FILE, "< spairs-$block.out"))
- {
- $count = 0;
- $count++ while <FILE>;
- close (FILE);
-
- # save log line
- open (LOGFILE, '>>sieve.log');
- print LOGFILE "range:\t$block\tsize:\t$nblocksize\tnumrels:\t$count\n";
- close (LOGFILE);
- }
- else
- {
- print "Log Error!\n";
- }
-
- next;
-
-sleep_continue:
- print "Error: Some error occured. Sleeping 10 seconds.\n";
- sleep(10); #wait 10 seconds and try again;
-}
-
-sub GetAndParseJob($)
-{
- my $Url = shift(@_);
-
- #
- # Retrive .job file from the server
- #
- socket(SOK, PF_INET, SOCK_STREAM, $tcp)
- || return 0;
- connect(SOK, $hosts)
- || return 0;
-
- select SOK; $| = 1; select STDOUT;
- print SOK "GET $Url HTTP/1.0\n".
- "Host: $host\n".
- "User-Agent: Internet Exploider 6.0\n".
- "Referer: $host\n".
- "Connection: close\n".
- "Content-Type: application/x-www-form-urlencoded\n".
- "Content-Length: 0\n\n";
-
- $response = '';
- while (<SOK>) { $response .= $_; }
- close SOK;
-
- #
- # Remove HTTP header
- #
- (($response) = ($response =~ /HTTP.*200.*\r\n\r\n(.*)/s)) || return 0;
-
- #
- # Parse .job file and get q0 and qintsize parameters. Also serves as
- # rudimentary job file syntax check.
- #
- (($block) = ($response =~ /q0:\s+(\d+)/g)) || return 0;
- (($nblocksize) = ($response =~ /qintsize:\s+(\d+)/g)) || return 0;
-
- #
- # Save job to file
- #
- open(JOBFILE, ">block-$block.job") || return 0;
- print JOBFILE $response;
- close (JOBFILE);
-
- #
- # Save .lastjob file
- #
- open(LASTJOBFILE, ">.lastjob") || return 0;
- print LASTJOBFILE "block-$block.job";
- close (LASTJOBFILE);
-
- return "block-$block.job";
-}
-
-sub ExecJob($)
-{
- my $JobName = shift(@_);
-
- open(JOBFILE, $JobName) || die "Cann't open job file ($JobName).\n";
-
- @JobData = <JOBFILE>;
- close (JOBFILE);
-
- $JobData = join('', @JobData);
-
- #
- # Parse .job file and get q0 and qintsize parameters.
- #
- (($block) = ($JobData =~ /q0:\s+(\d+)/g)) || return 0;
- (($nblocksize) = ($JobData =~ /qintsize:\s+(\d+)/g)) || return 0;
- print "block: $block, size: $nblocksize\n";
-
- #
- # Delete spairs-$block.out for current block (in case we were terminated
- # abnormally last time, now we restart last block from the beginning).
- #
- unlink "spairs-$block.out", ".last_spq1234";
-
- #
- # 1) Copy factorbase.dat to .afb.0 file. Dunno yet how to tell gnfs-lasieve4I14e
- # to use given factorbase file.
- # 2) Execute lasieve
- # 3) Cleanup everything
- #
- if ($^O eq "MSWin32")
- {
- # Win32
- system ("copy factorbase.dat block-$block.job.afb.0");
- system ("gnfs-lasieve4I14e -k -o spairs-$block.out -v -a block-$block.job -n1234") == 0
- || die "Error: Unable to execute gnfs-lasieve4I14e.\n";
- }
- else
- {
- # Unix
- system ("cp factorbase.dat block-$block.job.afb.0");
- system ("gnfs-lasieve4I14e -k -o spairs-$block.out -v -a block-$block.job -n1234") == 0
- || die "Error: Unable to execute gnfs-lasieve4I14e.\n";
- }
-
- unlink ".lastjob", "block-$block.job", "block-$block.job.afb.0", ".last_spq1234", "ggnfs.log";
-};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ba...@us...> - 2010-06-08 05:46:50
|
Revision: 395
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=395&view=rev
Author: Batalov
Date: 2010-06-08 05:46:44 +0000 (Tue, 08 Jun 2010)
Log Message:
-----------
minor
Modified Paths:
--------------
trunk/contrib/remdups/remdups.c
trunk/contrib/remdups/remdups4.c
Modified: trunk/contrib/remdups/remdups.c
===================================================================
--- trunk/contrib/remdups/remdups.c 2010-06-06 19:37:51 UTC (rev 394)
+++ trunk/contrib/remdups/remdups.c 2010-06-08 05:46:44 UTC (rev 395)
@@ -47,9 +47,8 @@
int numbad=0, numdups=0, numuniq=0,numskip=0;
int DIM=1000;
-
if ((argc != 3)&&(argc != 4)) {
- printf("\nusage: %s [table_size] <ggnfs_file> <out_file>\n\n", argv[0]);
+ printf("\nusage: %s [DIM] <ggnfs_file> <out_file>\n\n", argv[0]);
exit(-1);
}
@@ -65,7 +64,7 @@
exit(-1);
}
- printf("Lookup table size (1000-3000 recommended): ");
+ printf("Lookup table size (5 per million relations recommended): ");
scanf("%d",&DIM);
} else {
infile = fopen(argv[2], "r");
@@ -86,11 +85,13 @@
printf("cannot open badfile\n");
exit(-1);
}
-
- if ((DIM<50)||(DIM>100000)) {
- printf("DIM should be between 50 and 100000!\n");
+ if (DIM<20) DIM=20;
+#if 0
+ if (DIM>100000) {
+ printf("DIM should be between 20 and 100000!\n");
exit(1);
}
+#endif
/* initialize arrays */
arra = (uint64**)malloc(MDVAL * sizeof(uint64 *));
@@ -112,7 +113,7 @@
fgets(buf, sizeof(buf), infile);
char *tmp, *field_end;
uint64 a;
- int32 i, j, p;
+ int32 i, j, p, cpos;
if (buf[0] == '#') {
fprintf(outfile, "%s", buf);
@@ -128,11 +129,12 @@
/* Hash used to be in a and b bins; it worked well for SNFS */
/* However, for gnfs, the bins were very shallow */
- /* New hash value a is a nonsensical base-11 hybrid of both a and b -SB 2009 */
+ /* New hash value a is a hybrid of both a and b -SB 2009 */
+ cpos = 0;
if(*tmp=='-') {a=10; tmp++;} else a=0;
for( ; *tmp ; tmp++) {
- if (isdigit(*tmp)) a=11*a+(*tmp-'0');
- else if(*tmp==',') a=11*a+10;
+ if (isdigit(*tmp)) a=10*a+(*tmp-'0');
+ else if(*tmp==',' && !cpos) cpos = tmp-buf; /* must be only one comma between a,b */
else {
if(*tmp==':') {
if ((tmp-2>buf && tmp[-2]==',' && tmp[-1]=='0') || strccnt(tmp+1,':')==1)
@@ -143,6 +145,7 @@
goto skip_;
}
}
+ a=4*a+(cpos&3); /* the "comma position" */
p=a%MDVAL;
for (i=0;i<n[p];i++)
if (a==arra[p][i]) { numdups++; goto skip_; }
Modified: trunk/contrib/remdups/remdups4.c
===================================================================
--- trunk/contrib/remdups/remdups4.c 2010-06-06 19:37:51 UTC (rev 394)
+++ trunk/contrib/remdups/remdups4.c 2010-06-08 05:46:44 UTC (rev 395)
@@ -55,8 +55,8 @@
if (argc == 2) {
DIM=atoi(argv[1]);
} else {
- fprintf(stderr,"\nusage: cat relations.file(s) | %s table_size > out_file \n"
- "\t table_size is a number (1000-3000 recommended)\n\n", argv[0]);
+ fprintf(stderr,"\nusage: cat relations.file(s) | %s DIM > out_file \n"
+ "\t DIM is a number (5 per million relations recommended)\n\n", argv[0]);
exit(-1);
}
@@ -65,11 +65,13 @@
fprintf(stderr,"cannot open badfile\n");
exit(-1);
}
-
- if ((DIM<50)||(DIM>100000)) {
- fprintf(stderr,"DIM should be between 50 and 100000!\n");
+ if (DIM<20) DIM=20;
+#if 0
+ if (DIM>100000) {
+ printf("DIM should be between 20 and 100000!\n");
exit(1);
}
+#endif
/* initialize arrays */
arra = (uint64**)malloc(MDVAL * sizeof(uint64 *));
@@ -90,7 +92,7 @@
while (fgets(buf, sizeof(buf), stdin)) {
char *tmp, *field_end;
uint64 a;
- int32 i, j, p;
+ int32 i, j, p, cpos;
if (buf[0] == '#') {
printf("%s", buf);
@@ -106,11 +108,12 @@
/* Hash used to be in a and b bins; it worked well for SNFS */
/* However, for gnfs, the bins were very shallow */
- /* New hash value a is a nonsensical base-11 hybrid of both a and b -SB 2009 */
+ /* New hash value a is a hybrid of both a and b -SB 2009 */
+ cpos = 0;
if(*tmp=='-') {a=10; tmp++;} else a=0;
for( ; *tmp ; tmp++) {
- if (isdigit(*tmp)) a=11*a+(*tmp-'0');
- else if(*tmp==',') a=11*a+10;
+ if (isdigit(*tmp)) a=10*a+(*tmp-'0');
+ else if(*tmp==',' && !cpos) cpos = tmp-buf; /* must be only one comma between a,b */
else {
if(*tmp==':') {
if ((tmp-2>buf && tmp[-2]==',' && tmp[-1]=='0') || strccnt(tmp+1,':')==1)
@@ -121,6 +124,7 @@
goto skip_;
}
}
+ a=4*a+(cpos&3); /* the "comma position" */
p=a%MDVAL;
for (i=0;i<n[p];i++)
if (a==arra[p][i]) { numdups++; goto skip_; }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ba...@us...> - 2010-06-06 19:37:57
|
Revision: 394
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=394&view=rev
Author: Batalov
Date: 2010-06-06 19:37:51 +0000 (Sun, 06 Jun 2010)
Log Message:
-----------
remdups: one-pass relation filter
Added Paths:
-----------
trunk/contrib/remdups/
trunk/contrib/remdups/remdups.c
trunk/contrib/remdups/remdups4.c
Added: trunk/contrib/remdups/remdups.c
===================================================================
--- trunk/contrib/remdups/remdups.c (rev 0)
+++ trunk/contrib/remdups/remdups.c 2010-06-06 19:37:51 UTC (rev 394)
@@ -0,0 +1,170 @@
+/* remdups.c
+ By Greg Childers
+ This is a standalone one-pass duplicate relations remover;
+ only syntax (a,b:<csv-of-factors>:<csv-of-factors>) is checked and incomplete lines are discarded;
+ validity of relations is not tested (nor is polynomial needed).
+ Hashing of (a,b) values was changed to accomodate for gnfs projects with huge skews (S.Batalov).
+
+ No makefile needed:
+ cc -O3 -o remdups remdups.c
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; see the file COPYING. If not, write to the Free
+ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ 02111-1307, USA.
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+typedef unsigned long uint32;
+typedef long int32;
+typedef unsigned long long uint64;
+
+#define MDVAL 327673
+
+int strccnt(const char *s, int c)
+{
+ const unsigned char *us = (const unsigned char *) s;
+ const unsigned char uc = c;
+ int n = 0;
+ if (!uc) return 1;
+ while (*us) if (*us++ == uc) n++;
+ return n;
+}
+int main(int argc, char **argv) {
+ char buf[512];
+ int mm,nn,av;
+ FILE *infile, *outfile, *badfile;
+ uint64 ** arra;
+ int n[MDVAL]={0};
+ int numbad=0, numdups=0, numuniq=0,numskip=0;
+ int DIM=1000;
+
+
+ if ((argc != 3)&&(argc != 4)) {
+ printf("\nusage: %s [table_size] <ggnfs_file> <out_file>\n\n", argv[0]);
+ exit(-1);
+ }
+
+ if (argc == 3) {
+ infile = fopen(argv[1], "r");
+ if (infile == NULL) {
+ printf("cannot open %s\n", argv[1]);
+ exit(-1);
+ }
+ outfile = fopen(argv[2], "w");
+ if (outfile == NULL) {
+ printf("cannot open %s\n", argv[2]);
+ exit(-1);
+ }
+
+ printf("Lookup table size (1000-3000 recommended): ");
+ scanf("%d",&DIM);
+ } else {
+ infile = fopen(argv[2], "r");
+ if (infile == NULL) {
+ printf("cannot open %s\n", argv[1]);
+ exit(-1);
+ }
+ outfile = fopen(argv[3], "w");
+ if (outfile == NULL) {
+ printf("cannot open %s\n", argv[2]);
+ exit(-1);
+ }
+ DIM=atoi(argv[1]);
+ }
+
+ badfile = fopen("badrels.txt", "a");
+ if (badfile == NULL) {
+ printf("cannot open badfile\n");
+ exit(-1);
+ }
+
+ if ((DIM<50)||(DIM>100000)) {
+ printf("DIM should be between 50 and 100000!\n");
+ exit(1);
+ }
+
+ /* initialize arrays */
+ arra = (uint64**)malloc(MDVAL * sizeof(uint64 *));
+ for(mm = 0; mm < MDVAL; mm++){
+#define CHUNK 2048
+ if((mm % CHUNK) == 0) {
+ arra[mm] = (uint64*)malloc(CHUNK * DIM * sizeof(uint64));
+ if(!arra[mm]) {
+ fprintf(stderr, "out of memory\n");
+ exit(1);
+ }
+ /* memset(arra[mm],0,CHUNK * DIM * sizeof(uint64)); */ /* unnecessary */
+ } else {
+ arra[mm] = arra[mm-1] + DIM;
+ }
+ }
+
+ while (!feof(infile)) {
+ fgets(buf, sizeof(buf), infile);
+ char *tmp, *field_end;
+ uint64 a;
+ int32 i, j, p;
+
+ if (buf[0] == '#') {
+ fprintf(outfile, "%s", buf);
+ continue;
+ }
+
+ if (buf[0] == 'N') {
+ fprintf(outfile, "%s", buf);
+ continue;
+ }
+
+ for(tmp = buf; *tmp && isspace(*tmp); tmp++);
+
+ /* Hash used to be in a and b bins; it worked well for SNFS */
+ /* However, for gnfs, the bins were very shallow */
+ /* New hash value a is a nonsensical base-11 hybrid of both a and b -SB 2009 */
+ if(*tmp=='-') {a=10; tmp++;} else a=0;
+ for( ; *tmp ; tmp++) {
+ if (isdigit(*tmp)) a=11*a+(*tmp-'0');
+ else if(*tmp==',') a=11*a+10;
+ else {
+ if(*tmp==':') {
+ if ((tmp-2>buf && tmp[-2]==',' && tmp[-1]=='0') || strccnt(tmp+1,':')==1)
+ break;
+ }
+ fprintf(badfile, "%s", buf);
+ numbad++;
+ goto skip_;
+ }
+ }
+ p=a%MDVAL;
+ for (i=0;i<n[p];i++)
+ if (a==arra[p][i]) { numdups++; goto skip_; }
+ if (n[p]<DIM) arra[p][n[p]++]=a; /* Not quitting after a whole lot of work! Just stop extending the bin --SB. */
+ else numskip++;
+ numuniq++;
+ if(numuniq % 500000 == 0)
+ fprintf(stderr,"\r %.1fM relns \r", numuniq/1000000.0);
+ for(tmp=buf;*tmp;tmp++) *tmp=tolower(*tmp); /* will compress better */
+ fprintf(outfile, "%s", buf);
+ skip_: ;
+ }
+
+ printf("Found %d unique, %d duplicate, and %d bad relations.\n",numuniq, numdups, numbad);
+ for (av=0,mm=1,nn=n[0];mm<MDVAL;mm++) {if (n[mm]>nn) nn=n[mm]; av+=n[mm];}
+ printf("Largest dimension used: %d of %d\n",nn,DIM);
+ printf("Average dimension used: %.1f of %d\n",((double)av)/MDVAL,DIM);
+ if(nn>=DIM) printf("*** Some redundant relations may have been retained (increase DIM)\n");
+ if(numskip) printf("*** %d (quasi-unique) relations were not hashed\n",numskip);
+ fclose(infile);
+ fclose(outfile);
+ if(numbad) fprintf(badfile, "\n"); /* usually last reln line is truncated and ends up in the bad bin. We don't want them to stick together */
+ fclose(badfile);
+ return 0;
+}
Added: trunk/contrib/remdups/remdups4.c
===================================================================
--- trunk/contrib/remdups/remdups4.c (rev 0)
+++ trunk/contrib/remdups/remdups4.c 2010-06-06 19:37:51 UTC (rev 394)
@@ -0,0 +1,146 @@
+/* remdups4.c
+ By Greg Childers
+ This is a standalone one-pass duplicate relations remover;
+ only syntax (a,b:<csv-of-factors>:<csv-of-factors>) is checked and incomplete lines are discarded;
+ validity of relations is not tested (nor is polynomial needed).
+ Hashing of (a,b) values was changed to accomodate for gnfs projects with huge skews (S.Batalov).
+
+ This version is a filter (stdin, stdout):
+ you may redirect stdout to /dev/null and/or
+ you may use many input relation files (or pipe from zcat, bzcat).
+ However, this needs porting for Windows (use remdups.c instead or get CygWin).
+
+ No makefile needed:
+ cc -O3 -o remdups4 remdups4.c
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; see the file COPYING. If not, write to the Free
+ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ 02111-1307, USA.
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+typedef unsigned long uint32;
+typedef long int32;
+typedef unsigned long long uint64;
+
+#define MDVAL 327673
+
+int strccnt(const char *s, int c)
+{
+ const unsigned char *us = (const unsigned char *) s;
+ const unsigned char uc = c;
+ int n = 0;
+ if (!uc) return 1;
+ while (*us) if (*us++ == uc) n++;
+ return n;
+}
+int main(int argc, char **argv) {
+ char buf[512];
+ int mm,nn,av;
+ FILE *badfile;
+ uint64 ** arra;
+ int n[MDVAL]={0};
+ int numbad=0, numdups=0, numuniq=0,numskip=0;
+ int DIM=1000;
+
+ if (argc == 2) {
+ DIM=atoi(argv[1]);
+ } else {
+ fprintf(stderr,"\nusage: cat relations.file(s) | %s table_size > out_file \n"
+ "\t table_size is a number (1000-3000 recommended)\n\n", argv[0]);
+ exit(-1);
+ }
+
+ badfile = fopen("badrels.txt", "a");
+ if (badfile == NULL) {
+ fprintf(stderr,"cannot open badfile\n");
+ exit(-1);
+ }
+
+ if ((DIM<50)||(DIM>100000)) {
+ fprintf(stderr,"DIM should be between 50 and 100000!\n");
+ exit(1);
+ }
+
+ /* initialize arrays */
+ arra = (uint64**)malloc(MDVAL * sizeof(uint64 *));
+ for(mm = 0; mm < MDVAL; mm++){
+#define CHUNK 2048
+ if((mm % CHUNK) == 0) {
+ arra[mm] = (uint64*)malloc(CHUNK * DIM * sizeof(uint64));
+ if(!arra[mm]) {
+ fprintf(stderr, "out of memory\n");
+ exit(1);
+ }
+ /* memset(arra[mm],0,CHUNK * DIM * sizeof(uint64)); */ /* unnecessary */
+ } else {
+ arra[mm] = arra[mm-1] + DIM;
+ }
+ }
+
+ while (fgets(buf, sizeof(buf), stdin)) {
+ char *tmp, *field_end;
+ uint64 a;
+ int32 i, j, p;
+
+ if (buf[0] == '#') {
+ printf("%s", buf);
+ continue;
+ }
+
+ if (buf[0] == 'N') {
+ printf("%s", buf);
+ continue;
+ }
+
+ for(tmp = buf; *tmp && isspace(*tmp); tmp++);
+
+ /* Hash used to be in a and b bins; it worked well for SNFS */
+ /* However, for gnfs, the bins were very shallow */
+ /* New hash value a is a nonsensical base-11 hybrid of both a and b -SB 2009 */
+ if(*tmp=='-') {a=10; tmp++;} else a=0;
+ for( ; *tmp ; tmp++) {
+ if (isdigit(*tmp)) a=11*a+(*tmp-'0');
+ else if(*tmp==',') a=11*a+10;
+ else {
+ if(*tmp==':') {
+ if ((tmp-2>buf && tmp[-2]==',' && tmp[-1]=='0') || strccnt(tmp+1,':')==1)
+ break;
+ }
+ fprintf(badfile, "%s", buf);
+ numbad++;
+ goto skip_;
+ }
+ }
+ p=a%MDVAL;
+ for (i=0;i<n[p];i++)
+ if (a==arra[p][i]) { numdups++; goto skip_; }
+ if (n[p]<DIM) arra[p][n[p]++]=a; /* Not quitting after a whole lot of work! Just stop extending the bin --SB. */
+ else numskip++;
+ numuniq++;
+ if(numuniq % 500000 == 0)
+ fprintf(stderr,"\r %.1fM relns \r", numuniq/1000000.0);
+ for(tmp=buf;*tmp;tmp++) *tmp=tolower(*tmp); /* will compress better */
+ printf("%s", buf);
+ skip_: ;
+ }
+
+ fprintf(stderr,"Found %d unique, %d duplicate, and %d bad relations.\n",numuniq, numdups, numbad);
+ for (av=0,mm=1,nn=n[0];mm<MDVAL;mm++) {if (n[mm]>nn) nn=n[mm]; av+=n[mm];}
+ fprintf(stderr,"Largest dimension used: %d of %d\n",nn,DIM);
+ fprintf(stderr,"Average dimension used: %.1f of %d\n",((double)av)/MDVAL,DIM);
+ if(nn>=DIM) fprintf(stderr,"*** Some redundant relations may have been retained (increase DIM)\n");
+ if(numskip) fprintf(stderr,"*** %d (quasi-unique) relations were not hashed\n",numskip);
+ if(numbad) fprintf(badfile, "\n"); /* usually last reln line is truncated and ends up in the bad bin. We don't want them to stick together */
+ fclose(badfile);
+ return 0;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ba...@us...> - 2010-06-03 21:37:04
|
Revision: 393
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=393&view=rev
Author: Batalov
Date: 2010-06-03 21:36:58 +0000 (Thu, 03 Jun 2010)
Log Message:
-----------
minor
Modified Paths:
--------------
trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c
trunk/src/lasieve4/gnfs-lasieve4e.c
Modified: trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c
===================================================================
--- trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c 2010-05-29 21:42:42 UTC (rev 392)
+++ trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c 2010-06-03 21:36:58 UTC (rev 393)
@@ -3961,14 +3961,14 @@
if(mpz_sgn(large_primes[s1][1]) == 0) { /* remainder == 0? */
mpz_set(large_primes[s1][1],large_primes[s1][0]);
nlp[s1]= 2;
- if(verbose) {
+ if(verbose > 1) {
fprintf(stderr," mpqs on a prime square ");
mpz_out_str(stderr,10,large_primes[s1][0]);
fprintf(stderr,"^2 ");
}
continue;
}
- if(verbose) {
+ if(verbose > 1) {
fprintf(stderr,"mpqs failed for ");
mpz_out_str(stderr,10,large_factors[s1]);
fprintf(stderr,"(a,b): ");
Modified: trunk/src/lasieve4/gnfs-lasieve4e.c
===================================================================
--- trunk/src/lasieve4/gnfs-lasieve4e.c 2010-05-29 21:42:42 UTC (rev 392)
+++ trunk/src/lasieve4/gnfs-lasieve4e.c 2010-06-03 21:36:58 UTC (rev 393)
@@ -2518,6 +2518,18 @@
nlp[s1] = 0;
#endif
if (nlp[s1] == 0) {
+ /* did it fail on a square? */
+ mpz_sqrtrem(large_primes[s1][0],large_primes[s1][1],large_factors[s1]);
+ if(mpz_sgn(large_primes[s1][1]) == 0) { /* remainder == 0? */
+ mpz_set(large_primes[s1][1],large_primes[s1][0]);
+ nlp[s1]= 2;
+ if(ov > 1) {
+ fprintf(stderr," mpqs on a prime square ");
+ mpz_out_str(stderr,10,large_primes[s1][0]);
+ fprintf(stderr,"^2 ");
+ }
+ continue;
+ }
if (ov > 1) {
fprintf(stderr, "mpqs failed for ");
mpz_out_str(stderr, 10, large_factors[s1]);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ba...@us...> - 2010-05-29 21:42:51
|
Revision: 392
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=392&view=rev
Author: Batalov
Date: 2010-05-29 21:42:42 +0000 (Sat, 29 May 2010)
Log Message:
-----------
rudimentary test of automatic Rev reporting
Modified Paths:
--------------
trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c
Property Changed:
----------------
trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c
Modified: trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c
===================================================================
--- trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c 2010-05-29 21:33:57 UTC (rev 391)
+++ trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c 2010-05-29 21:42:42 UTC (rev 392)
@@ -532,7 +532,11 @@
break;
}
}
-
+
+ if(verbose) { /* first rudimentary test of automatic $Rev reporting */
+ fprintf(stderr, "gnfs-lasieve4I%de (with asm64): L1_BITS=%d, SVN $Revision$\n", I_bits, L1_BITS);
+ }
+
#define LINE_BUF_SIZE 300
if (g_resume != 0) {
Property changes on: trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c
___________________________________________________________________
Added: svn:keywords
+ Date Rev
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
