better with more bendingness costs

[moebius2.git] / Makefile

diff --git a/Makefile b/Makefile
index d3ddd4f8facfc7bb21bb85d9963aec99bc643d0f..706c35af1f06b2e09142dfbee730d62a178a96e6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 ALLDIMS=33 64 125 246 487 968
 TARGETS= primer lumpy.cfm sgtatham.cfm ring.cfm \
-       minimise-33 minimise-64 \
+       minimise-33 minimise-64 minimise-125 minimise-246 \
        $(addprefix interpolate-, $(ALLDIMS)) \
        $(addprefix view-, $(ALLDIMS)) \
        $(addprefix output-, $(ALLDIMS))
@@ -11,9 +11,10 @@ SGTATHAM=sgtatham
 CWARNS=        -Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow
 CXXWARNS= $(CWARNS) -Wno-shadow -Wno-error
 
-OPTIMISE=      -O2
-CFLAGS=                -MMD $(OPTIMISE) -g $(CWARNS) $(DIMCFLAGS)
+OPTIMISE=      -O3
+CFLAGS_UNIPROC=        -MMD $(OPTIMISE) -g $(CWARNS) $(DIMCFLAGS)
 CXXFLAGS=      -MMD $(OPTIMISE) -g $(CXXWARNS)
+CFLAGS=                $(CFLAGS_UNIPROC) $(NPROCCFLAGS)
 
 LIBGSL= -lgsl -lgslcblas
 
@@ -23,7 +24,8 @@ all:          $(TARGETS)
 
 compute:       all
                $(MAKE) best-33.CFM
-               $(MAKE) best-968.CFM
+               $(MAKE) best-64.CFM
+#              $(MAKE) best-968.CFM
 
 minimise:      energy.o graph.o common.o mgraph.o minimise.o half.o
                $(CXX) $(CXXFLAGS) -o $@ $^ $(LIBGSL)
@@ -32,12 +34,21 @@ primer:             primer.o common.o
                $(CC) $(CFLAGS) -o $@ $^ $(LIBGSL)
 
 nprocessors:   nprocessors.o common.o
-               $(CC) $(CFLAGS) -o $@ $^ $(LIBGSL)
+               $(CC) $(CFLAGS_UNIPROC) -o $@ $^ $(LIBGSL)
+
+common.o nprocessors.o: %.o: %.c
+               $(CC) -c $(CPPFLAGS) $(CFLAGS_UNIPROC) $< -o $@
+
+.nprocessors.make: ./nprocessors
+       set -e; n=`./nprocessors`; \
+       echo "NPROCCFLAGS := -DNPROCESSORS=$$n" $o
+
+include .nprocessors.make
+
 
 prime.data:    primer
                ./$^ $o
 
-
 sgtatham.cfm:  sgtatham-regenerator prime.data $(SGTATHAM)/z.typescript
                ./$^ -T -o$@
 
@@ -47,7 +58,6 @@ lumpy.cfm: oldmoebius-converter prime.data ../moebius/ins-new ../moebius/a.out
 ring.cfm: oldmoebius-converter prime.data /dev/null ../moebius/a.out
                ./$^ -o$@
 
-
 best-33.CFM:
                ./minimise-33 sgtatham.cfm -iwip-33.cfm -o$@
 
@@ -76,8 +86,9 @@ output-%:     output+%.o mgraph+%.o common.o
 interpolate-%: interpolate+%.o mgraph+%.o common.o
                $(CC) $(CFLAGS) -o $@ $^ $(LIBGSL)
 
-minimise-%:    energy+%.o graph+%.o mgraph+%.o minimise+%.o half+%.o common.o
-               $(CXX) $(CXXFLAGS) -o $@ $^ $(LIBGSL)
+minimise-%:    energy+%.o graph+%.o mgraph+%.o minimise+%.o \
+                       half+%.o parallel.o common.o
+               $(CXX) $(CXXFLAGS) -o $@ $^ $(LIBGSL) -lpthread
 
 # this ridiculous repetition is due to make being too lame
 
@@ -110,10 +121,10 @@ interpolate+%.o: interpolate.c
 clean:
                rm -f prime.data $(TARGETS)
                rm -f *.o *.new *.tmp *.rej *.orig core vgcore.* *~
-               rm -f *.d *.cfm
+               rm -f *.d .alternately_*
 
 realclean:     clean
-               rm -f *.CFM
+               rm -f *.cfm *.CFM
 
 %.d: