Merge branch 'master' of https://gogs.univ-littoral.fr/fromenti/wilf

single/Makefile

@@ -2,9 +2,9 @@
 OS     	    = $(shell uname)
 CPPFLAGS    = -DMAX_GENUS=$(MAX_GENUS) #-DNDEBUG
 CXXFLAGS    = -std=c++11 -g -Wall -O3 # -fsanitize=thread # -Winline
-CXX         = g++-7
-TARGET_ARCH = -march=native -mtune=native
-TARGET 	    = wilf_alone
+CXX         = g++
+TARGET_ARCH = -march=corei7 -mtune=corei7
+TARGET 	    = wilf_alone_3
 
 # Pour compiler avec une valeur différente: make MAX_GENUS=35
 DEFAULT_MAX_GENUS=40
@@ -14,11 +14,11 @@ all: $(TARGET)
 
 monoid.o: monoid.cpp monoid.hpp
 treewalk.o: treewalk.cpp treewalk.hpp monoid.hpp
-wilf_alone: treewalk.o monoid.o
+wilf_alone_3: treewalk.o monoid.o
 	$(CXX) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
 clean:
-	rm -rf $(TARGET) *.o *~ output/* param_* oar_wilf.sh
+	rm -rf $(TARGET) *.o *~ 
 
 test: all
 	./treewalk

single/cluster.py

@@ -8,23 +8,24 @@ if __name__=="__main__":
     g=int(sys.argv[1])
     mmax=int((3*(g+2))/5)
     n=0
-    file=open("output/param_"+repr(g),'w')
+    os.system("make clean;make MAX_GENUS="+repr(g))
+    file=open("output3/param_"+repr(g),'w')
     for m in range(2,mmax+1):
-        for k in range(1,m):
+        for k in range(1,2):
             file.write(repr(m)+' '+repr(k)+"\n")
             n+=1
     file.close()
     print("Split in ",n," subtasks")
-    os.system("make clean;make MAX_GENUS="+repr(g))
-    file=open("oar_wilf.sh",'w')
+    file=open("oar_wilf_3.sh",'w')
     file.write("#!/bin/sh\n")
-    file.write("#OAR -l core=1,walltime=02:00:00\n")
+    file.write("#OAR -l core=1,walltime=1:00:00\n")
     file.write("#OAR -t idempotent\n")
     file.write("#OAR -q besteffort\n")
     file.write("#OAR -t besteffort\n")
-    #OAR -p cputype="skylake"
-    file.write("#OAR --array-param-file output/param_"+repr(g)+"\n")
-    file.write("#OAR -O output/job.%jobid%.output\n")
-    file.write("#OAR -E output/job.%jobid%.error\n")
-    file.write("wilf_alone $*\n")
+#    file.write('#OAR -p cputype="skylake" or cputype="braodwell"\n')
+    file.write("#OAR --array-param-file output3/param_"+repr(g)+"\n")
+    file.write("#OAR -O output3/job.%jobid%.output\n")
+    file.write("#OAR -E output3/job.%jobid%.error\n")
+    file.write("cd /nfs/home/lmpa/jfromentin/wilf/single\n")
+    file.write("./wilf_alone_3 $*\n")
     file.close()

single/monoid.cpp

@@ -56,14 +56,19 @@ void print_monoid_gen(const monoid &m)
   std::cout<<'>'<<std::endl;
 }
 
+#include <cmath>
+
+
 void output(const monoid& m,fstream& f){
-  f<<"w = "<<m.wilf<<" : < ";
-  for (auto i=1; i<SIZE; i++){
+  int q=ceil(float(m.conductor)/float(m.min));
+  int rho=q*m.min-m.conductor;
+  f<<"w = "<<m.wilf<<", c = "<<m.conductor<<", r = "<<rho<<" : ["<<m.min;
+  for (auto i=m.min+1; i<SIZE; i++){
     if(m.decs[i]==1){
-      f<<i<<' ';
+      f<<','<<i;
     }
   }
-  f<<'>'<<endl;
+  f<<']'<<endl;
 }
 
 void print_epi8(epi8 bl)

single/monoid.hpp

@@ -288,6 +288,48 @@ void remove_generator(monoid &__restrict__ dst,
       CASE_UNROLL(17);
 #endif 
 #if NBLOCKS > 19
+      CASE_UNROLL(18);
+#endif
+#if NBLOCKS > 20
+      CASE_UNROLL(19);
+#endif
+#if NBLOCKS > 21
+      CASE_UNROLL(20);
+#endif
+#if NBLOCKS > 22
+      CASE_UNROLL(21);
+#endif
+#if NBLOCKS > 23
+      CASE_UNROLL(22);
+#endif
+#if NBLOCKS > 24
+      CASE_UNROLL(23);
+#endif
+#if NBLOCKS > 25
+      CASE_UNROLL(24);
+#endif
+#if NBLOCKS > 26
+      CASE_UNROLL(25);
+#endif
+#if NBLOCKS > 27
+      CASE_UNROLL(26);
+#endif
+#if NBLOCKS > 28
+      CASE_UNROLL(27);
+#endif
+#if NBLOCKS > 29
+      CASE_UNROLL(28);
+#endif
+#if NBLOCKS > 30
+      CASE_UNROLL(29);
+#endif
+#if NBLOCKS > 31
+      CASE_UNROLL(30);
+#endif
+#if NBLOCKS > 32
+      CASE_UNROLL(31);
+#endif      
+#if NBLOCKS > 33
 #error "Too many blocks"
 #endif
     }

single/oar_wilf.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+#OAR -l core=1,walltime=200:00:00
+#OAR -t idempotent
+#OAR -q besteffort
+#OAR -t besteffort
+#OAR -p cputype="skylake"
+#OAR --array-param-file output/param_80
+#OAR -O output/job.%jobid%.output
+#OAR -E output/job.%jobid%.error
+cd /nfs/home/lmpa/jfromentin/wilf/single
+./wilf_alone $*

single/oar_wilf_2.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+#OAR -l core=1,walltime=1:00:00
+#OAR -t idempotent
+#OAR -q besteffort
+#OAR -t besteffort
+#OAR --array-param-file output2/param_100
+#OAR -O output2/job.%jobid%.output
+#OAR -E output2/job.%jobid%.error
+cd /nfs/home/lmpa/jfromentin/wilf/single
+./wilf_alone_2 $*

single/oar_wilf_3.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+#OAR -l core=1,walltime=1:00:00
+#OAR -t idempotent
+#OAR -q besteffort
+#OAR -t besteffort
+#OAR --array-param-file output3/param_177
+#OAR -O output3/job.%jobid%.output
+#OAR -E output3/job.%jobid%.error
+cd /nfs/home/lmpa/jfromentin/wilf/single
+./wilf_alone_3 $*

single/output/job.581309.error

@@ -0,0 +1 @@
+## OAR [2019-06-14 17:50:53] Job 581309 KILLED ##

single/output/job.581330.error

@@ -0,0 +1 @@
+## OAR [2019-06-14 17:50:53] Job 581330 KILLED ##

single/output/job.581352.error

@@ -0,0 +1 @@
+## OAR [2019-06-14 17:51:19] Job 581352 KILLED ##

single/output/job.581364.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{24}\{37}.
+ Computation time = 0.000591 s.

single/output/job.581365.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{24}\{38}.
+ Computation time = 0.0003981 s.

single/output/job.581366.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{24}\{39}.
+ Computation time = 0.0007234 s.

single/output/job.581367.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{24}\{40}.
+ Computation time = 0.0003357 s.

single/output/job.581368.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{24}\{41}.
+ Computation time = 0.0003393 s.

single/output/job.582275.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{2}\{3}.
+ Computation time = 0.0003308 s.

single/output/job.582276.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{3}\{4}.
+ Computation time = 0.0005279 s.

single/output/job.582277.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{3}\{5}.
+ Computation time = 0.0004792 s.

single/output/job.582278.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{4}\{5}.
+ Computation time = 0.0006487 s.

single/output/job.582279.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{4}\{6}.
+ Computation time = 0.0003969 s.

single/output/job.582280.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{4}\{7}.
+ Computation time = 0.000393 s.

single/output/job.582281.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{5}\{6}.
+ Computation time = 0.0003898 s.

single/output/job.582282.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{5}\{7}.
+ Computation time = 0.000372 s.

single/output/job.582283.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{5}\{8}.
+ Computation time = 0.0003949 s.

single/output/job.582284.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{5}\{9}.
+ Computation time = 0.000865 s.

single/output/job.582285.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{6}\{7}.
+ Computation time = 0.000962 s.

single/output/job.582286.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{6}\{8}.
+ Computation time = 0.0007792 s.

single/output/job.582287.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{6}\{9}.
+ Computation time = 0.0008798 s.

single/output/job.582288.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{6}\{10}.
+ Computation time = 0.0004814 s.

single/output/job.582289.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{6}\{11}.
+ Computation time = 0.0006997 s.

single/output/job.582290.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{7}\{8}.
+ Computation time = 0.001358 s.

single/output/job.582291.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{7}\{9}.
+ Computation time = 0.0006146 s.

single/output/job.582292.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{7}\{10}.
+ Computation time = 0.0003765 s.

single/output/job.582293.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{7}\{11}.
+ Computation time = 0.0005065 s.

single/output/job.582294.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{7}\{12}.
+ Computation time = 0.0003984 s.

single/output/job.582295.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{7}\{13}.
+ Computation time = 0.0003922 s.

single/output/job.582296.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{8}\{9}.
+ Computation time = 0.0009524 s.

single/output/job.582297.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{8}\{10}.
+ Computation time = 0.0004282 s.

single/output/job.582298.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{8}\{11}.
+ Computation time = 0.00186 s.

single/output/job.582299.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{8}\{12}.
+ Computation time = 0.0003996 s.

single/output/job.582300.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{8}\{13}.
+ Computation time = 0.0004726 s.

single/output/job.582301.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{8}\{14}.
+ Computation time = 0.0003033 s.

single/output/job.582302.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{8}\{15}.
+ Computation time = 0.0006312 s.

single/output/job.582303.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{9}\{10}.
+ Computation time = 0.0006926 s.

single/output/job.582304.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{9}\{11}.
+ Computation time = 0.0003694 s.

single/output/job.582305.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{9}\{12}.
+ Computation time = 0.0003629 s.

single/output/job.582306.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{9}\{13}.
+ Computation time = 0.001691 s.

single/output/job.582307.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{9}\{14}.
+ Computation time = 0.0003828 s.

single/output/job.582308.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{9}\{15}.
+ Computation time = 0.0002978 s.

single/output/job.582309.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{9}\{16}.
+ Computation time = 0.0003738 s.

single/output/job.582310.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{9}\{17}.
+ Computation time = 0.00188 s.

single/output/job.582311.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{10}\{11}.
+ Computation time = 0.005254 s.

single/output/job.582312.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{10}\{12}.
+ Computation time = 0.007184 s.

single/output/job.582313.output

@@ -0,0 +1,2 @@
+Testing Wilf's conjecture for numerical semigroups of genus <= 80 which are sons of O_{10}\{13}.
+ Computation time = 0.00042 s.