diff --git a/.travis.yml b/.travis.yml index d5bb5bebf..c92212065 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,19 +12,22 @@ compiler: - clang env: - - RUN_TEST=1 THREADING="none" BUILD_CONFIG="auto" - - RUN_TEST=1 THREADING="none" BUILD_CONFIG="reference" - - RUN_TEST=0 THREADING="openmp" BUILD_CONFIG="auto" - - RUN_TEST=0 THREADING="pthreads" BUILD_CONFIG="auto" - - RUN_TEST=0 THREADING="tbb" BUILD_CONFIG="auto" + - TEST_INSTALL=0 RUN_TEST=1 THREADING="none" BUILD_CONFIG="auto" + - TEST_INSTALL=0 RUN_TEST=1 THREADING="none" BUILD_CONFIG="reference" + - TEST_INSTALL=1 RUN_TEST=0 THREADING="none" BUILD_CONFIG="auto" + - TEST_INSTALL=0 RUN_TEST=0 THREADING="openmp" BUILD_CONFIG="auto" + - TEST_INSTALL=0 RUN_TEST=0 THREADING="pthreads" BUILD_CONFIG="auto" + - TEST_INSTALL=0 RUN_TEST=0 THREADING="tbb" BUILD_CONFIG="auto" matrix: exclude: - - env: RUN_TEST=1 THREADING="none" BUILD_CONFIG="auto" + - env: TEST_INSTALL=0 RUN_TEST=1 THREADING="none" BUILD_CONFIG="auto" os: osx - - env: RUN_TEST=1 THREADING="none" BUILD_CONFIG="reference" + - env: TEST_INSTALL=0 RUN_TEST=1 THREADING="none" BUILD_CONFIG="reference" os: osx - - env: RUN_TEST=0 THREADING="tbb" BUILD_CONFIG="auto" + - env: TEST_INSTALL=1 RUN_TEST=0 THREADING="none" BUILD_CONFIG="auto" + os: osx + - env: TEST_INSTALL=0 RUN_TEST=0 THREADING="tbb" BUILD_CONFIG="auto" os: osx before_install: @@ -65,7 +68,11 @@ script: - $CC --version - $CXX --version - as --version - - ./configure CC="$CC" CXX="$CXX" --enable-threading="$THREADING" --enable-config="$BUILD_CONFIG" + - ./configure CC="$CC" CXX="$CXX" --enable-threading="$THREADING" --enable-config="$BUILD_CONFIG" --prefix=`pwd`/install - cat config.log src/external/tci/config.log - make -j 2 - if [ $RUN_TEST -eq 1 ]; then travis_wait 30 bin/test; fi + - 'if [ $TEST_INSTALL -eq 1 ]; then + make install; + $CXX -std=c++11 -o test_install -I./install/include test/test_install.cxx -L./install/lib -ltblis; + fi' diff --git a/test/test_install.cxx b/test/test_install.cxx new file mode 100644 index 000000000..1dd44661c --- /dev/null +++ b/test/test_install.cxx @@ -0,0 +1,12 @@ +#include + +using namespace tblis; + +int main() +{ + tensor A({10, 4, 3}); + tensor B({3, 4, 6, 7}); + tensor C({7, 10, 6}); + + mult(1.0, A, "abc", B, "cbde", 0.0, C, "ead"); +}