chiark
/
gitweb
/
~ian
/
moebius2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
do not remove *.cfm on make clean; do remove .alternately_*
[moebius2.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index a0b643ad32012771c1163fd74dbc8f7557b94236..af43f43b5190b063b05237a45de9c928930bce39 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-11,9
+11,7
@@
SGTATHAM=sgtatham
CWARNS= -Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow
CXXWARNS= $(CWARNS) -Wno-shadow -Wno-error
CWARNS= -Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow
CXXWARNS= $(CWARNS) -Wno-shadow -Wno-error
-NPROCCFLAGS := -DNPROCESSORS=$(shell ./nprocessors)
-
-OPTIMISE= -O2
+OPTIMISE= -O3
CFLAGS_UNIPROC= -MMD $(OPTIMISE) -g $(CWARNS) $(DIMCFLAGS)
CXXFLAGS= -MMD $(OPTIMISE) -g $(CXXWARNS)
CFLAGS= $(CFLAGS_UNIPROC) $(NPROCCFLAGS)
CFLAGS_UNIPROC= -MMD $(OPTIMISE) -g $(CWARNS) $(DIMCFLAGS)
CXXFLAGS= -MMD $(OPTIMISE) -g $(CXXWARNS)
CFLAGS= $(CFLAGS_UNIPROC) $(NPROCCFLAGS)
@@
-26,7
+24,8
@@
all: $(TARGETS)
compute: all
$(MAKE) best-33.CFM
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)
minimise: energy.o graph.o common.o mgraph.o minimise.o half.o
$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBGSL)
@@
-40,6
+39,13
@@
nprocessors: nprocessors.o common.o
common.o nprocessors.o: %.o: %.c
$(CC) -c $(CPPFLAGS) $(CFLAGS_UNIPROC) $< -o $@
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
prime.data: primer
./$^ $o
@@
-80,8
+86,9
@@
output-%: output+%.o mgraph+%.o common.o
interpolate-%: interpolate+%.o mgraph+%.o common.o
$(CC) $(CFLAGS) -o $@ $^ $(LIBGSL)
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
# this ridiculous repetition is due to make being too lame
@@
-114,10
+121,10
@@
interpolate+%.o: interpolate.c
clean:
rm -f prime.data $(TARGETS)
rm -f *.o *.new *.tmp *.rej *.orig core vgcore.* *~
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
realclean: clean
- rm -f *.CFM
+ rm -f *.
cfm *.
CFM
%.d:
%.d: