mirror of
https://github.com/nwchemgit/nwchem.git
synced 2026-07-21 06:25:21 -04:00
QUICK_BUILD=1 skips dependencies step
This commit is contained in:
parent
a9a09978f4
commit
c7f590728d
5 changed files with 43 additions and 7 deletions
|
|
@ -159,13 +159,13 @@ sngl_to_dbl dbl_to_sngl 64_to_32 32_to_64:
|
|||
$(MAKE) -C $$dir $@ || exit 1 ; \
|
||||
done
|
||||
touch $@
|
||||
|
||||
ifndef QUICK_BUILD
|
||||
deps_stamp:
|
||||
for dir in $(SUBDIRS); do \
|
||||
$(MAKE) -i -C $$dir dependencies include_stamp ; \
|
||||
done
|
||||
touch $@
|
||||
|
||||
endif
|
||||
clear_64_to_32:
|
||||
-$(RM) 32_to_64
|
||||
|
||||
|
|
|
|||
|
|
@ -229,6 +229,7 @@ endif
|
|||
endif
|
||||
|
||||
|
||||
ifndef QUICK_BUILD
|
||||
ifdef HEADERS
|
||||
include_stamp: $(HEADERS)
|
||||
ifdef SUBDIRS
|
||||
|
|
@ -253,6 +254,7 @@ ifdef SUBDIRS
|
|||
endif
|
||||
touch include_stamp
|
||||
endif
|
||||
endif
|
||||
ifdef CONVERT_ALL
|
||||
64_to_32:
|
||||
$(CNFDIR)/64_to_32 *.F *.f *.c *.f90
|
||||
|
|
@ -389,8 +391,9 @@ $(BINDIR)/depend.x:
|
|||
( cd $(CNFDIR); $(MAKE) $@ ; )
|
||||
|
||||
dependencies: $(wildcard *.c) $(wildcard *.F) $(BINDIR)/depend.x
|
||||
ifndef QUICK_BUILD
|
||||
$(BINDIR)/depend.x $(LIB_INCLUDES) $(INCPATH) > dependencies
|
||||
|
||||
endif
|
||||
|
||||
-include dependencies
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
include ../config/makefile.h
|
||||
|
||||
SUBDIRS = $(NWSUBDIRS)
|
||||
|
||||
ifndef QUICK_BUILD
|
||||
includes:
|
||||
for dir in $(SUBDIRS); do \
|
||||
echo Making include_stamp in $(SRCDIR)/$$dir ; \
|
||||
|
|
@ -17,7 +17,7 @@ includes:
|
|||
|
||||
include_stamp sngl_to_dbl dbl_to_sngl 64_to_32 32_to_64:
|
||||
@echo Nothing to be done
|
||||
|
||||
endif
|
||||
# In this directory, clean does not do anything -- we only want get rid of
|
||||
# up the include files if there's a serious cleanup.
|
||||
|
||||
|
|
|
|||
|
|
@ -77,6 +77,17 @@ fi
|
|||
fi
|
||||
if [[ -z "$TRAVIS_HOME" ]]; then
|
||||
env
|
||||
mkdir -p ../bin/MACX64
|
||||
gcc -o ../bin/MACX64/depend.x config/depend.c
|
||||
make nwchem_config
|
||||
cd libext && make V=-1 && cd ..
|
||||
cd tools && make V=-1 && cd ..
|
||||
nohup make USE_INTERNALBLAS=y deps_stamp >& deps.log &
|
||||
sleep 120s
|
||||
echo tail deps.log '@@@'
|
||||
tail -10 deps.log
|
||||
echo done tail deps.log '@@@'
|
||||
export QUICK_BUILD=1
|
||||
if [[ -z "$FOPT" ]]; then
|
||||
make V=0 -j3
|
||||
else
|
||||
|
|
@ -85,6 +96,7 @@ fi
|
|||
else
|
||||
../travis/sleep_loop.sh make V=1 FOPTIMIZE="$FOPT" -j3
|
||||
fi
|
||||
unset QUICK_BUILD
|
||||
cd $TRAVIS_BUILD_DIR/src/64to32blas
|
||||
make
|
||||
cd $TRAVIS_BUILD_DIR/src
|
||||
|
|
@ -97,6 +109,17 @@ fi
|
|||
export MAKEFLAGS=-j3
|
||||
echo "$FOPT$FDOPT"
|
||||
if [[ -z "$TRAVIS_HOME" ]]; then
|
||||
mkdir -p ../bin/LINUX64
|
||||
gcc -o ../bin/LINUX64/depend.x config/depend.c
|
||||
make nwchem_config
|
||||
cd libext && make V=-1 && cd ..
|
||||
cd tools && make V=-1 && cd ..
|
||||
make USE_INTERNALBLAS=y deps_stamp >& deps.log &
|
||||
sleep 75s
|
||||
echo tail deps.log '@@@'
|
||||
tail -10 deps.log
|
||||
echo done tail deps.log '@@@'
|
||||
export QUICK_BUILD=1
|
||||
if [[ -z "$FOPT" ]]; then
|
||||
make V=0 -j3
|
||||
else
|
||||
|
|
@ -105,6 +128,7 @@ if [[ -z "$TRAVIS_HOME" ]]; then
|
|||
else
|
||||
../travis/sleep_loop.sh make V=1 FOPTIMIZE="$FOPT" -j3
|
||||
fi
|
||||
unset QUICK_BUILD
|
||||
cd $TRAVIS_BUILD_DIR/src/64to32blas
|
||||
make
|
||||
cd $TRAVIS_BUILD_DIR/src
|
||||
|
|
|
|||
|
|
@ -18,7 +18,16 @@ fi
|
|||
cd $TRAVIS_BUILD_DIR/src
|
||||
make nwchem_config
|
||||
if [[ ! -z "$USE_64TO32" ]]; then
|
||||
echo " CONVERSION 64_to_32"
|
||||
make 64_to_32 CONVERT_ALL=y
|
||||
echo " CONVERSION 64_to_32"
|
||||
os=`uname`
|
||||
echo output redirected to 64.log
|
||||
if [[ "$os" == "Darwin" ]]; then
|
||||
make 64_to_32 >& 64log
|
||||
else
|
||||
make 64_to_32 CONVERT_ALL=y >& 64log
|
||||
fi
|
||||
echo @@@@ tail 64log
|
||||
tail -30 64log
|
||||
echo @@@
|
||||
fi
|
||||
env
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue