Przeglądaj źródła

Remove some element in clean of Makefile

Fromentin Jean 5 lat temu
rodzic
commit
7147e0ff33
2 zmienionych plików z 5 dodań i 5 usunięć
  1. 2 2
      single/Makefile
  2. 3 3
      single/cluster.py

+ 2 - 2
single/Makefile

@@ -2,7 +2,7 @@
 OS     	    = $(shell uname)
 CPPFLAGS    = -DMAX_GENUS=$(MAX_GENUS) #-DNDEBUG
 CXXFLAGS    = -std=c++11 -g -Wall -O3 # -fsanitize=thread # -Winline
-CXX         = g++-7
+CXX         = g++
 TARGET_ARCH = -march=native -mtune=native
 TARGET 	    = wilf_alone
 
@@ -18,7 +18,7 @@ wilf_alone: 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

+ 3 - 3
single/cluster.py

@@ -8,14 +8,14 @@ if __name__=="__main__":
     g=int(sys.argv[1])
     mmax=int((3*(g+2))/5)
     n=0
-    file=open("param_"+repr(g),'w')
+    os.system("make clean;make MAX_GENUS="+repr(g))
+    file=open("output/param_"+repr(g),'w')
     for m in range(2,mmax+1):
         for k in range(1,m):
             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.write("#!/bin/sh\n")
     file.write("#OAR -l core=1,walltime=02:00:00\n")
@@ -23,7 +23,7 @@ if __name__=="__main__":
     file.write("#OAR -q besteffort\n")
     file.write("#OAR -t besteffort\n")
     #OAR -p cputype="skylake"
-    file.write("#OAR --array-param-file param_"+repr(g)+"\n")
+    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")