diff --git a/.travis.yml b/.travis.yml index 591cb34..478295f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,5 @@ install: - ci/install_deps.sh || travis_terminate 1; script: - - mkdir -p build && cd build - - cmake .. - - make - - test/test_all \ No newline at end of file + - ci/build.sh || travis_terminate 1; + - ci/test.sh || travis_terminate 1; \ No newline at end of file diff --git a/ci/build.sh b/ci/build.sh index d163976..6eabf30 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -3,17 +3,12 @@ set -x -e source ci/env.sh which g++ -which nvcc which cmake g++ --version -nvcc --version cmake --version mkdir build cd build -cmake .. \ - -DCMAKE_BUILD_TYPE=$BUILD_TYPE \ - -DCMAKE_PREFIX_PATH=$OPENMPI_PATH \ - -DMPI_HOME=/usr/lib/x86_64-linux-gnu/openmpi/ +cmake .. make VERBOSE=1 \ No newline at end of file diff --git a/ci/install_deps.sh b/ci/install_deps.sh index 5b7c1c1..d39b0e7 100755 --- a/ci/install_deps.sh +++ b/ci/install_deps.sh @@ -2,39 +2,7 @@ set -x -e source ci/env.sh -# Install Cmake if it doesn't exist -mkdir -p $CMAKE_PREFIX -if [[ ! -f $CMAKE_PREFIX/bin/cmake ]]; then - if [[ $TRAVIS_CPU_ARCH == "ppc64le" ]]; then - wget -qSL https://cmake.org/files/v3.13/cmake-3.13.5.tar.gz -O cmake.tar.gz - tar -xf cmake.tar.gz --strip-components=1 -C $CMAKE_PREFIX - rm cmake.tar.gz - cd $CMAKE_PREFIX - ./bootstrap --prefix=$CMAKE_PREFIX - make -j `nproc` install - elif [[ $TRAVIS_CPU_ARCH == "amd64" ]]; then - wget -qSL https://cmake.org/files/v3.13/cmake-3.13.5-Linux-x86_64.tar.gz -O cmake.tar.gz - tar -xf cmake.tar.gz --strip-components=1 -C $CMAKE_PREFIX - rm cmake.tar.gz - fi -fi -cd $HOME - sudo apt-get update sudo apt-get install -y --no-install-recommends \ - libopenmpi-dev openmpi-bin + cmake -## install CUDA -sudo apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1604/x86_64/7fa2af80.pub - -if [[ $TRAVIS_CPU_ARCH == "ppc64le" ]]; then - CUDA102="https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/ppc64el/cuda-repo-ubuntu1804_10.2.89-1_ppc64el.deb" -elif [[ $TRAVIS_CPU_ARCH == "amd64" ]]; then - CUDA102="http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-repo-ubuntu1804_10.2.89-1_amd64.deb" -fi - -wget -SL $CUDA102 -O cuda.deb -sudo dpkg -i cuda.deb -sudo apt-get update -sudo apt-get install -y --no-install-recommends \ - cuda-toolkit-10-2