do not have threads at all if NPROCESSORS=1

[moebius2.git] / Makefile

diff --git a/Makefile b/Makefile
index 899bed653212c8d60029912e09bb0e1cd025fc05..927f45d1a8e60855abc87ebb43f1652cc1f26387 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,15 +4,17 @@ ALLDIMS=33 64 125 246 487 968
 TARGETS= primer lumpy.cfm sgtatham.cfm ring.cfm \
        minimise-33 minimise-64 \
        $(addprefix interpolate-, $(ALLDIMS)) \
-       $(addprefix view-, $(ALLDIMS))
+       $(addprefix view-, $(ALLDIMS)) \
+       $(addprefix output-, $(ALLDIMS))
 SGTATHAM=sgtatham
 
 CWARNS=        -Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow
 CXXWARNS= $(CWARNS) -Wno-shadow -Wno-error
 
 OPTIMISE=      -O2
-CFLAGS=                -MMD $(OPTIMISE) -g $(CWARNS) $(DIMCFLAGS)
+CFLAGS_UNIPROC=        -MMD $(OPTIMISE) -g $(CWARNS) $(DIMCFLAGS)
 CXXFLAGS=      -MMD $(OPTIMISE) -g $(CXXWARNS)
+CFLAGS=                $(CFLAGS_UNIPROC) $(NPROCCFLAGS)
 
 LIBGSL= -lgsl -lgslcblas
 
@@ -30,10 +32,22 @@ minimise:   energy.o graph.o common.o mgraph.o minimise.o half.o
 primer:                primer.o common.o
                $(CC) $(CFLAGS) -o $@ $^ $(LIBGSL)
 
+nprocessors:   nprocessors.o common.o
+               $(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$@
 
@@ -43,7 +57,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$@
 
@@ -66,17 +79,24 @@ $(eval $(call interpolate_aa,125, best-64.CFM))
 view-%:                view+%.o mgraph+%.o common.o
                $(CC) $(CFLAGS) -o $@ $^ $(LIBGSL) -L/usr/X11R6/lib -lX11
 
+output-%:      output+%.o mgraph+%.o common.o
+               $(CC) $(CFLAGS) -o $@ $^ $(LIBGSL) -L/usr/X11R6/lib -lX11
+
 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
 
 view+%.o: view.c
                $(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFSZ=$* $< -o $@
 
+output+%.o: output.c
+               $(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFSZ=$* $< -o $@
+
 mgraph+%.o: mgraph.c
                $(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFSZ=$* $< -o $@
 
@@ -95,7 +115,7 @@ half+%.o: half.c
 interpolate+%.o: interpolate.c
                $(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFSZ=$* $< -o $@
 
-.PRECIOUS: view+%.o mgraph+%.o interpolate+%.o
+.PRECIOUS: view+%.o output+%.o mgraph+%.o interpolate+%.o
 
 clean:
                rm -f prime.data $(TARGETS)