portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2024-11-10 07:55:35 +00:00
Code Releases Activity

Merge branch 'develop' into release/v0.6.0

Browse Source
This commit is contained in:
azusayamaguchi 2016-11-04 22:48:11 +00:00
commit 692b44dac1
6 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@ -1,5 +1,10 @@
# additional include paths necessary to compile the C++ library # additional include paths necessary to compile the C++ library
SUBDIRS = lib benchmarks tests SUBDIRS = lib benchmarks tests
.PHONY: tests
tests:
make -C tests tests
AM_CXXFLAGS += -I$(top_builddir)/include AM_CXXFLAGS += -I$(top_builddir)/include
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4

1
README.md
View File

@ -106,6 +106,7 @@ To minimise the build time, only the tests at the root of the `tests` directory
``` bash ``` bash
make -C tests/<subdir> tests make -C tests/<subdir> tests
``` ```
If you want to build all the tests at once just use `make tests`.
### Build configuration options ### Build configuration options

1
configure.ac
View File

@ -4,7 +4,6 @@ AC_CANONICAL_BUILD
AC_CANONICAL_HOST AC_CANONICAL_HOST
AC_CANONICAL_TARGET AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(subdir-objects) AM_INIT_AUTOMAKE(subdir-objects)
AM_EXTRA_RECURSIVE_TARGETS([tests])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([lib/Grid.h]) AC_CONFIG_SRCDIR([lib/Grid.h])
AC_CONFIG_HEADERS([lib/Config.h]) AC_CONFIG_HEADERS([lib/Config.h])

2
lib/algorithms/CoarsenedMatrix.h
View File

@ -282,7 +282,7 @@ PARALLEL_FOR_LOOP
} else if(SE->_is_local) { } else if(SE->_is_local) {
nbr = in._odata[SE->_offset]; nbr = in._odata[SE->_offset];
} else { } else {
nbr = Stencil.comm_buf[SE->_offset]; nbr = Stencil.CommBuf()[SE->_offset];
} }
res = res + A[point]._odata[ss]*nbr; res = res + A[point]._odata[ss]*nbr;
} }

7
scripts/filelist
View File

@ -20,7 +20,8 @@ for subdir in $dirs; do
TESTS=`ls T*.cc` TESTS=`ls T*.cc`
TESTLIST=`echo ${TESTS} | sed s/.cc//g ` TESTLIST=`echo ${TESTS} | sed s/.cc//g `
PREF=`[ $subdir = '.' ] && echo noinst || echo EXTRA` PREF=`[ $subdir = '.' ] && echo noinst || echo EXTRA`
echo "tests-local: ${TESTLIST}" > Make.inc SUB=`[ $subdir = '.' ] && echo subtests`
echo "tests: ${TESTLIST} ${SUB}" > Make.inc
echo ${PREF}_PROGRAMS = ${TESTLIST} >> Make.inc echo ${PREF}_PROGRAMS = ${TESTLIST} >> Make.inc
echo >> Make.inc echo >> Make.inc
for f in $TESTS; do for f in $TESTS; do
@ -29,6 +30,10 @@ for subdir in $dirs; do
echo ${BNAME}_LDADD=-lGrid>> Make.inc echo ${BNAME}_LDADD=-lGrid>> Make.inc
echo >> Make.inc echo >> Make.inc
done done
if [ $subdir != '.' ]; then
echo CLEANFILES = ${TESTLIST} >> Make.inc
echo >> Make.inc
fi
done done
# benchmarks Make.inc # benchmarks Make.inc

5
tests/Makefile.am
View File

@ -4,4 +4,9 @@ if BUILD_CHROMA_REGRESSION
SUBDIRS+= qdpxx SUBDIRS+= qdpxx
endif endif
.PHONY: subtests
include Make.inc include Make.inc
subtests:
for d in $(SUBDIRS); do make -C $${d} tests; done