update Makefile and yafu.ini

yafu/Makefile

@@ -16,7 +16,7 @@
 # code to the public domain.
 #        				   [email protected] 7/28/09
 # ----------------------------------------------------------------------*/
-
+COMPILER = gcc
 CC = gcc
 CFLAGS = -g -m64 -DUSE_SSE2
 #CFLAGS += -march=core2 -mtune=core2
@@ -40,11 +40,11 @@ LIBS = -L.
 INC += -I../ysieve -I../ytools
 LIBS += -L../ysieve -L../ytools
 
-INC += -I../gmp_install/gmp-6.2.0/include
-LIBS += -L../gmp_install/gmp-6.2.0/lib
+INC += -I../gmp-6.2.1/
+LIBS += -L../gmp-6.2.1/
 
-INC += -I../ecm_install/include/
-LIBS += -L../ecm_install/lib/
+INC += -I../avx-ecm/
+LIBS += -L../avx-ecm/
 
 INC += -I../msieve/zlib 
 LIBS += -L../msieve/
@@ -77,17 +77,17 @@ ifeq ($(USE_BMI2),1)
 # -mbmi enables _blsr_u64 and -mbmi2 enables _pdep_u64 when using gcc
   CFLAGS += -mbmi2 -mbmi -DUSE_BMI2
 endif
-
-ifeq ($(USE_AVX2),1)
-	USE_SSE41=1
+
+ifeq ($(USE_AVX2),1)
+	USE_SSE41=1
 	CFLAGS += -DUSE_AVX2 -DUSE_SSE41 
 
 ifeq ($(COMPILER),icc)
 	CFLAGS += -march=core-avx2  
 else
 	CFLAGS += -mavx2 
 endif
-
+
 endif
 
 ifeq ($(USE_SSE41),1)
@@ -145,7 +145,7 @@ ifeq ($(FORCE_GENERIC),1)
 endif
 
 # make sure we get the correct libgmp linked by using an absolute path
-LIBS += -lecm /users/buhrow/src/c/gmp_install/gmp-6.2.0/lib/libgmp.a -lytools -lysieve
+LIBS += -lecm ../gmp-6.2.1/.libs/libgmp.a -lytools -lysieve
 #LIBS += -lecm -lgmp -lytools -lysieve
 
 ifeq ($(SKYLAKEX),1)
@@ -173,7 +173,7 @@ ifeq ($(COMPILER),icc)
 	LIBS +=  -lsvml
 endif
 
-CFLAGS += $(OPT_FLAGS) $(WARN_FLAGS) $(INC)
+CFLAGS += -static $(OPT_FLAGS) $(WARN_FLAGS) $(INC)
 
 x86: CFLAGS += -m32
 

yafu/yafu.ini

@@ -16,7 +16,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % Run all multi-threaded algorithms with specified thread count
-% threads=1
+threads=64
 
 % the number of Rabin-Miller witnesses to use during PRP checks
 % nprp=1
@@ -168,15 +168,15 @@ aprcl_d=200
 
 % Set a threshold below which siqs will not use a savefile (all relations are
 % processed in-memory)
-inmem=70
+inmem=700
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % NFS options
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % relative or absolute path to a directory containing ggnfs-lasieve4I* executables.
 % without these yafu will not use NFS
-ggnfs_dir=..\..\ggnfs-bin\x64\
+%ggnfs_dir=..\..\ggnfs-bin\x64\
 %ggnfs_dir=../../ggnfs-bin/
 
 % comma delimited list of poly files to test sieve
@@ -263,7 +263,7 @@ B1ecm=11000
 % B2ecm=1100000
 
 % specify a path to an ECM executable file
-ecm_path=..\gmp-ecm\bin\x64\Release\ecm.exe
+ecm_path=../avx-ecm/avx-ecm
 %ecm_path=../gmp-ecm/install/mingw/bin/ecm.exe
 %ecm_path=../gmp-ecm/bin/ecm
 
@@ -288,12 +288,12 @@ ext_ecm=1000000000
 % P-1 options
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Set the B1 level for P-1.
-% B1pm1=100000
+B1pm1=100000
 
 % Set the B2 level for P-1.  
 % Only needed if you want something other than the default
 % for the current B1.
-% B2pm1=10000000
+B2pm1=10000000
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % P+1 options
@@ -304,17 +304,17 @@ B1pm1=20000
 % Set the B2 level for P+1.  
 % Only needed if you want something other than the default
 % for the current B1.
-% B2pm1=2000000
+B2pm1=2000000
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Brent-Pollard Rho options
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% rhomax=200
+rhomax=500
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Fermat options
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% fmtmax=1000000
+fmtmax=10000000
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Eratosthenes options
@@ -335,4 +335,4 @@ B1pm1=20000
 % appear below here
 
 
-tune_info=Intel(R) Xeon(R) Gold 5122 CPU @ 3.60GHz,LINUX64,1.59078e-05,0.196092,0.299688,0.0999245,102.36,42
+%tune_info=Intel(R) Xeon(R) Gold 5122 CPU @ 3.60GHz,LINUX64,1.59078e-05,0.196092,0.299688,0.0999245,102.36,42