From 8ff8379a4661fb4e5c104df892f8dc0b0d4c340f Mon Sep 17 00:00:00 2001 From: Faruk D Date: Thu, 1 Mar 2018 18:07:59 +0100 Subject: [PATCH 01/17] fix invisible character in test script --- test-builds/test-ubuntu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-builds/test-ubuntu.sh b/test-builds/test-ubuntu.sh index 7b76101..68ee888 100755 --- a/test-builds/test-ubuntu.sh +++ b/test-builds/test-ubuntu.sh @@ -1,6 +1,6 @@ #!/bin/bash -echo "Building SageCal" && \ +echo "Building SageCal" && \ echo "Branch --> $BRANCH" && \ cd /travis/workdir && \ mkdir build && cd build && \ From 1991c7924b7ee2c2ad7fd99de51c6fa517dacb29 Mon Sep 17 00:00:00 2001 From: Faruk D Date: Wed, 4 Apr 2018 17:46:35 +0200 Subject: [PATCH 02/17] organize build scripts --- .gitignore | 2 ++ .travis.yml | 18 ++++++++++-------- .../ubuntu/compile-ubuntu.sh | 0 build-tests/ubuntu/prepare-ubuntu.sh | 9 +++++++++ 4 files changed, 21 insertions(+), 8 deletions(-) rename test-builds/test-ubuntu.sh => build-tests/ubuntu/compile-ubuntu.sh (100%) create mode 100755 build-tests/ubuntu/prepare-ubuntu.sh diff --git a/.gitignore b/.gitignore index 4e08c7a..cb06cfc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +build + .idea */*.png diff --git a/.travis.yml b/.travis.yml index 6565cc9..7505b71 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,16 +8,18 @@ language: cpp before_install: - docker pull ubuntu:xenial - docker run -itd -v "${TRAVIS_BUILD_DIR}:/travis/workdir" --name ubuntu-build ubuntu:xenial + - docker pull base/archlinux + - docker run -itd -v "${TRAVIS_BUILD_DIR}:/travis/workdir" --name arch-build base/archlinux script: - export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi) - echo "TRAVIS_BRANCH=$TRAVIS_BRANCH, PR=$PR, BRANCH=$BRANCH" - - docker exec ubuntu-build apt-get update -y - - docker exec ubuntu-build apt-get install software-properties-common -y - - docker exec ubuntu-build add-apt-repository -s ppa:kernsuite/kern-3 -y - - docker exec ubuntu-build apt-add-repository multiverse - - docker exec ubuntu-build apt-get update -y - - docker exec ubuntu-build apt-get install -y git cmake g++ pkg-config libcfitsio-bin libcfitsio-dev libopenblas-base libopenblas-dev wcslib-dev wcslib-tools libglib2.0-dev libcasa-casa2 casacore-dev casacore-data casacore-tools - - | - docker exec --env BRANCH=$BRANCH ubuntu-build /bin/bash -c "/travis/workdir/test-builds/test-ubuntu.sh" + #- docker exec ubuntu-build apt-get update -y + #- docker exec ubuntu-build apt-get install software-properties-common -y + #- docker exec ubuntu-build add-apt-repository -s ppa:kernsuite/kern-3 -y + #- docker exec ubuntu-build apt-add-repository multiverse + #- docker exec ubuntu-build apt-get update -y + #- docker exec ubuntu-build apt-get install -y git cmake g++ pkg-config libcfitsio-bin libcfitsio-dev libopenblas-base libopenblas-dev wcslib-dev wcslib-tools libglib2.0-dev libcasa-casa2 casacore-dev casacore-data casacore-tools + - docker exec --env BRANCH=$BRANCH ubuntu-build /bin/bash -c "/travis/workdir/build-tests/ubuntu/prepare-ubuntu.sh" + - docker exec --env BRANCH=$BRANCH ubuntu-build /bin/bash -c "/travis/workdir/build-tests/ubuntu/compile-ubuntu.sh" diff --git a/test-builds/test-ubuntu.sh b/build-tests/ubuntu/compile-ubuntu.sh similarity index 100% rename from test-builds/test-ubuntu.sh rename to build-tests/ubuntu/compile-ubuntu.sh diff --git a/build-tests/ubuntu/prepare-ubuntu.sh b/build-tests/ubuntu/prepare-ubuntu.sh new file mode 100755 index 0000000..79cf219 --- /dev/null +++ b/build-tests/ubuntu/prepare-ubuntu.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +apt-get update -y +apt-get install software-properties-common -y +add-apt-repository -s ppa:kernsuite/kern-3 -y +apt-add-repository multiverse +apt-get update -y +apt-get install -y git cmake g++ pkg-config libcfitsio-bin libcfitsio-dev libopenblas-base libopenblas-dev wcslib-dev wcslib-tools libglib2.0-dev libcasa-casa2 casacore-dev casacore-data casacore-tools + From 71d281d517507cbe91df3b4efa0dc6bc096d50be Mon Sep 17 00:00:00 2001 From: Faruk D Date: Wed, 4 Apr 2018 17:49:54 +0200 Subject: [PATCH 03/17] cleanup travis configuration --- .travis.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7505b71..f31574a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,12 +14,6 @@ before_install: script: - export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi) - echo "TRAVIS_BRANCH=$TRAVIS_BRANCH, PR=$PR, BRANCH=$BRANCH" - #- docker exec ubuntu-build apt-get update -y - #- docker exec ubuntu-build apt-get install software-properties-common -y - #- docker exec ubuntu-build add-apt-repository -s ppa:kernsuite/kern-3 -y - #- docker exec ubuntu-build apt-add-repository multiverse - #- docker exec ubuntu-build apt-get update -y - #- docker exec ubuntu-build apt-get install -y git cmake g++ pkg-config libcfitsio-bin libcfitsio-dev libopenblas-base libopenblas-dev wcslib-dev wcslib-tools libglib2.0-dev libcasa-casa2 casacore-dev casacore-data casacore-tools - docker exec --env BRANCH=$BRANCH ubuntu-build /bin/bash -c "/travis/workdir/build-tests/ubuntu/prepare-ubuntu.sh" - docker exec --env BRANCH=$BRANCH ubuntu-build /bin/bash -c "/travis/workdir/build-tests/ubuntu/compile-ubuntu.sh" From b771e7ef171fc91d577fbef3a7962efb176338a1 Mon Sep 17 00:00:00 2001 From: Faruk D Date: Wed, 4 Apr 2018 18:02:49 +0200 Subject: [PATCH 04/17] add archlinux build test --- .travis.yml | 2 ++ build-tests/arch/compile-arch.sh | 11 +++++++++++ build-tests/arch/prepare-arch.sh | 4 ++++ 3 files changed, 17 insertions(+) create mode 100755 build-tests/arch/compile-arch.sh create mode 100755 build-tests/arch/prepare-arch.sh diff --git a/.travis.yml b/.travis.yml index f31574a..464ab11 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,4 +16,6 @@ script: - echo "TRAVIS_BRANCH=$TRAVIS_BRANCH, PR=$PR, BRANCH=$BRANCH" - docker exec --env BRANCH=$BRANCH ubuntu-build /bin/bash -c "/travis/workdir/build-tests/ubuntu/prepare-ubuntu.sh" - docker exec --env BRANCH=$BRANCH ubuntu-build /bin/bash -c "/travis/workdir/build-tests/ubuntu/compile-ubuntu.sh" + - docker exec --env BRANCH=$BRANCH arch-build /bin/bash -c "/travis/workdir/build-tests/arch/prepare-arch.sh" + - docker exec --env BRANCH=$BRANCH arch-build /bin/bash -c "/travis/workdir/build-tests/arch/compile-arch.sh" diff --git a/build-tests/arch/compile-arch.sh b/build-tests/arch/compile-arch.sh new file mode 100755 index 0000000..68ee888 --- /dev/null +++ b/build-tests/arch/compile-arch.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +echo "Building SageCal" && \ +echo "Branch --> $BRANCH" && \ +cd /travis/workdir && \ +mkdir build && cd build && \ +cmake .. -DENABLE_CUDA=OFF && \ +make -j4 && \ +ls -alsrt ./dist/bin && \ +./dist/bin/sagecal + diff --git a/build-tests/arch/prepare-arch.sh b/build-tests/arch/prepare-arch.sh new file mode 100755 index 0000000..cbd94ad --- /dev/null +++ b/build-tests/arch/prepare-arch.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +pacman -Syy --needed --noconfirm \ + base-devel cmake git glib2 cfitsio wcslib From 19e0b8a7aa981cf95f7b40a08d4684dda1737f0f Mon Sep 17 00:00:00 2001 From: Faruk D Date: Wed, 4 Apr 2018 18:17:19 +0200 Subject: [PATCH 05/17] create separate build folders for each test --- build-tests/arch/compile-arch.sh | 2 +- build-tests/ubuntu/compile-ubuntu.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-tests/arch/compile-arch.sh b/build-tests/arch/compile-arch.sh index 68ee888..3d1260c 100755 --- a/build-tests/arch/compile-arch.sh +++ b/build-tests/arch/compile-arch.sh @@ -3,7 +3,7 @@ echo "Building SageCal" && \ echo "Branch --> $BRANCH" && \ cd /travis/workdir && \ -mkdir build && cd build && \ +mkdir build-arch && cd build-arch && \ cmake .. -DENABLE_CUDA=OFF && \ make -j4 && \ ls -alsrt ./dist/bin && \ diff --git a/build-tests/ubuntu/compile-ubuntu.sh b/build-tests/ubuntu/compile-ubuntu.sh index 68ee888..061a81a 100755 --- a/build-tests/ubuntu/compile-ubuntu.sh +++ b/build-tests/ubuntu/compile-ubuntu.sh @@ -3,7 +3,7 @@ echo "Building SageCal" && \ echo "Branch --> $BRANCH" && \ cd /travis/workdir && \ -mkdir build && cd build && \ +mkdir build-ubuntu && cd build-ubuntu && \ cmake .. -DENABLE_CUDA=OFF && \ make -j4 && \ ls -alsrt ./dist/bin && \ From 369623d587388776f6a02fa120ed8370b367c9eb Mon Sep 17 00:00:00 2001 From: Faruk D Date: Fri, 24 Aug 2018 13:32:29 +0200 Subject: [PATCH 06/17] add scientific linux --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 464ab11..b0a9db3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,8 @@ before_install: - docker run -itd -v "${TRAVIS_BUILD_DIR}:/travis/workdir" --name ubuntu-build ubuntu:xenial - docker pull base/archlinux - docker run -itd -v "${TRAVIS_BUILD_DIR}:/travis/workdir" --name arch-build base/archlinux + - docker pull docker pull scientificlinux/sl:7 + - docker run -itd -v "${TRAVIS_BUILD_DIR}:/travis/workdir" --name sl-build ubuntu:xenial script: - export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi) From ac2c2f952db6c6e15bb35cce10e7c8ea4827db9c Mon Sep 17 00:00:00 2001 From: Faruk D Date: Fri, 24 Aug 2018 15:19:03 +0200 Subject: [PATCH 07/17] fix scientific linux version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b0a9db3..150cdd6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ before_install: - docker pull base/archlinux - docker run -itd -v "${TRAVIS_BUILD_DIR}:/travis/workdir" --name arch-build base/archlinux - docker pull docker pull scientificlinux/sl:7 - - docker run -itd -v "${TRAVIS_BUILD_DIR}:/travis/workdir" --name sl-build ubuntu:xenial + - docker run -itd -v "${TRAVIS_BUILD_DIR}:/travis/workdir" --name sl-build scientificlinux/sl:7 script: - export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi) From 20cbbd8f40d17a72176a67d6c7b409003a6d6160 Mon Sep 17 00:00:00 2001 From: Faruk D Date: Tue, 28 Aug 2018 14:33:53 +0200 Subject: [PATCH 08/17] fix docker command --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 150cdd6..4f7373b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_install: - docker run -itd -v "${TRAVIS_BUILD_DIR}:/travis/workdir" --name ubuntu-build ubuntu:xenial - docker pull base/archlinux - docker run -itd -v "${TRAVIS_BUILD_DIR}:/travis/workdir" --name arch-build base/archlinux - - docker pull docker pull scientificlinux/sl:7 + - docker pull scientificlinux/sl:7 - docker run -itd -v "${TRAVIS_BUILD_DIR}:/travis/workdir" --name sl-build scientificlinux/sl:7 script: From 52adaee7f0710bd2318f4e0196587fd4eaf3180e Mon Sep 17 00:00:00 2001 From: Faruk D Date: Tue, 28 Aug 2018 14:54:33 +0200 Subject: [PATCH 09/17] add sl compile instructions --- .travis.yml | 2 ++ build-tests/sl/compile-sl.sh | 32 ++++++++++++++++++++++++++++++++ build-tests/sl/prepare-sl.sh | 11 +++++++++++ 3 files changed, 45 insertions(+) create mode 100755 build-tests/sl/compile-sl.sh create mode 100755 build-tests/sl/prepare-sl.sh diff --git a/.travis.yml b/.travis.yml index 4f7373b..621d711 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,4 +20,6 @@ script: - docker exec --env BRANCH=$BRANCH ubuntu-build /bin/bash -c "/travis/workdir/build-tests/ubuntu/compile-ubuntu.sh" - docker exec --env BRANCH=$BRANCH arch-build /bin/bash -c "/travis/workdir/build-tests/arch/prepare-arch.sh" - docker exec --env BRANCH=$BRANCH arch-build /bin/bash -c "/travis/workdir/build-tests/arch/compile-arch.sh" + - docker exec --env BRANCH=$BRANCH sl-build /bin/bash -c "/travis/workdir/build-tests/sl/prepare-sl.sh" + - docker exec --env BRANCH=$BRANCH sl-build /bin/bash -c "/travis/workdir/build-tests/sl/compile-sl.sh" diff --git a/build-tests/sl/compile-sl.sh b/build-tests/sl/compile-sl.sh new file mode 100755 index 0000000..ff6027c --- /dev/null +++ b/build-tests/sl/compile-sl.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +echo "Building SageCal for Scientific Linux" && \ +echo "Branch --> $BRANCH" && \ +cd /travis/workdir + +# compile casacore first +mkdir -p /opt/soft/casacore/data +cd /opt/soft/casacore/data +wget -c ftp://ftp.astron.nl/outgoing/Measures/WSRT_Measures.ztar +tar zxfv WSRT_Measures.ztar && rm -f WSRT_Measures.ztar + +cd /tmp +git clone --progress --verbose https://github.com/casacore/casacore.git casacore_install +cd casacore_install + +mkdir casacore/build +cd casacore/build +cmake -DUSE_FFTW3=ON -DCMAKE_INSTALL_PREFIX=/opt/soft/casacore -DDATA_DIR=/opt/soft/casacore/data -DUSE_OPENMP=ON \ + -DUSE_HDF5=ON -DBUILD_PYTHON=ON -DUSE_THREADS=ON .. +make -j4 +make install + +# compile sagecal +cd /travis/workdir && \ +mkdir build-sl && cd build-sl + +cmake .. -DENABLE_CUDA=OFF && \ +make -j4 && \ +ls -alsrt ./dist/bin && \ +./dist/bin/sagecal + diff --git a/build-tests/sl/prepare-sl.sh b/build-tests/sl/prepare-sl.sh new file mode 100755 index 0000000..e0e645c --- /dev/null +++ b/build-tests/sl/prepare-sl.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +# add EPEL repository for openblas +yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm + +# install dependencies +yum -y install git pkgconfig cmake cmake-gui gcc-gfortran gcc-c++ flex bison \ + openblas openblas-devel glib2-devel lapack lapack-devel cfitsio cfitsio-devel \ + wcslib wcslib-devel ncurses ncurses-devel readline readline-devel\ + python-devel boost boost-devel fftw fftw-devel hdf5 hdf5-devel\ + numpy boost-python \ No newline at end of file From 267141d3848bf9e9ce707b57e178a3041e99253c Mon Sep 17 00:00:00 2001 From: Faruk D Date: Tue, 28 Aug 2018 15:06:40 +0200 Subject: [PATCH 10/17] add wget to download measurement set --- build-tests/sl/prepare-sl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tests/sl/prepare-sl.sh b/build-tests/sl/prepare-sl.sh index e0e645c..c018c7e 100755 --- a/build-tests/sl/prepare-sl.sh +++ b/build-tests/sl/prepare-sl.sh @@ -4,7 +4,7 @@ yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm # install dependencies -yum -y install git pkgconfig cmake cmake-gui gcc-gfortran gcc-c++ flex bison \ +yum -y install wget git pkgconfig cmake cmake-gui gcc-gfortran gcc-c++ flex bison \ openblas openblas-devel glib2-devel lapack lapack-devel cfitsio cfitsio-devel \ wcslib wcslib-devel ncurses ncurses-devel readline readline-devel\ python-devel boost boost-devel fftw fftw-devel hdf5 hdf5-devel\ From 67f1bc8385597762560b557d5acbf0d88bcca88d Mon Sep 17 00:00:00 2001 From: Faruk D Date: Tue, 28 Aug 2018 15:07:45 +0200 Subject: [PATCH 11/17] dsable arch linux --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 621d711..9a8155b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,8 @@ language: cpp before_install: - docker pull ubuntu:xenial - docker run -itd -v "${TRAVIS_BUILD_DIR}:/travis/workdir" --name ubuntu-build ubuntu:xenial - - docker pull base/archlinux - - docker run -itd -v "${TRAVIS_BUILD_DIR}:/travis/workdir" --name arch-build base/archlinux +# - docker pull base/archlinux +# - docker run -itd -v "${TRAVIS_BUILD_DIR}:/travis/workdir" --name arch-build base/archlinux - docker pull scientificlinux/sl:7 - docker run -itd -v "${TRAVIS_BUILD_DIR}:/travis/workdir" --name sl-build scientificlinux/sl:7 @@ -18,8 +18,8 @@ script: - echo "TRAVIS_BRANCH=$TRAVIS_BRANCH, PR=$PR, BRANCH=$BRANCH" - docker exec --env BRANCH=$BRANCH ubuntu-build /bin/bash -c "/travis/workdir/build-tests/ubuntu/prepare-ubuntu.sh" - docker exec --env BRANCH=$BRANCH ubuntu-build /bin/bash -c "/travis/workdir/build-tests/ubuntu/compile-ubuntu.sh" - - docker exec --env BRANCH=$BRANCH arch-build /bin/bash -c "/travis/workdir/build-tests/arch/prepare-arch.sh" - - docker exec --env BRANCH=$BRANCH arch-build /bin/bash -c "/travis/workdir/build-tests/arch/compile-arch.sh" +# - docker exec --env BRANCH=$BRANCH arch-build /bin/bash -c "/travis/workdir/build-tests/arch/prepare-arch.sh" +# - docker exec --env BRANCH=$BRANCH arch-build /bin/bash -c "/travis/workdir/build-tests/arch/compile-arch.sh" - docker exec --env BRANCH=$BRANCH sl-build /bin/bash -c "/travis/workdir/build-tests/sl/prepare-sl.sh" - docker exec --env BRANCH=$BRANCH sl-build /bin/bash -c "/travis/workdir/build-tests/sl/compile-sl.sh" From 2c87ae539302d0cd88695aa3e0d68a4362082b18 Mon Sep 17 00:00:00 2001 From: Faruk D Date: Tue, 28 Aug 2018 15:15:13 +0200 Subject: [PATCH 12/17] disable measurement data and fix path --- build-tests/sl/compile-sl.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/build-tests/sl/compile-sl.sh b/build-tests/sl/compile-sl.sh index ff6027c..6e60c41 100755 --- a/build-tests/sl/compile-sl.sh +++ b/build-tests/sl/compile-sl.sh @@ -5,15 +5,17 @@ echo "Branch --> $BRANCH" && \ cd /travis/workdir # compile casacore first -mkdir -p /opt/soft/casacore/data -cd /opt/soft/casacore/data -wget -c ftp://ftp.astron.nl/outgoing/Measures/WSRT_Measures.ztar -tar zxfv WSRT_Measures.ztar && rm -f WSRT_Measures.ztar + +# mkdir -p /opt/soft/casacore/data +# cd /opt/soft/casacore/data +# wget -c ftp://ftp.astron.nl/outgoing/Measures/WSRT_Measures.ztar +# tar zxfv WSRT_Measures.ztar && rm -f WSRT_Measures.ztar cd /tmp git clone --progress --verbose https://github.com/casacore/casacore.git casacore_install cd casacore_install +cd /travis/workdir mkdir casacore/build cd casacore/build cmake -DUSE_FFTW3=ON -DCMAKE_INSTALL_PREFIX=/opt/soft/casacore -DDATA_DIR=/opt/soft/casacore/data -DUSE_OPENMP=ON \ From 8b8cd50f7a79bad3e89ce51ba59d5cb493d93f30 Mon Sep 17 00:00:00 2001 From: Faruk D Date: Tue, 28 Aug 2018 15:27:15 +0200 Subject: [PATCH 13/17] change cmake version and update instructions --- build-tests/sl/compile-sl.sh | 2 +- build-tests/sl/prepare-sl.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-tests/sl/compile-sl.sh b/build-tests/sl/compile-sl.sh index 6e60c41..000d3cd 100755 --- a/build-tests/sl/compile-sl.sh +++ b/build-tests/sl/compile-sl.sh @@ -16,7 +16,7 @@ git clone --progress --verbose https://github.com/casacore/casacore.git casacore cd casacore_install cd /travis/workdir -mkdir casacore/build +mkdir -p casacore/build cd casacore/build cmake -DUSE_FFTW3=ON -DCMAKE_INSTALL_PREFIX=/opt/soft/casacore -DDATA_DIR=/opt/soft/casacore/data -DUSE_OPENMP=ON \ -DUSE_HDF5=ON -DBUILD_PYTHON=ON -DUSE_THREADS=ON .. diff --git a/build-tests/sl/prepare-sl.sh b/build-tests/sl/prepare-sl.sh index c018c7e..7b26817 100755 --- a/build-tests/sl/prepare-sl.sh +++ b/build-tests/sl/prepare-sl.sh @@ -4,7 +4,7 @@ yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm # install dependencies -yum -y install wget git pkgconfig cmake cmake-gui gcc-gfortran gcc-c++ flex bison \ +yum -y install wget git pkgconfig make cmake3 cmake3-gui gcc-gfortran gcc-c++ flex bison \ openblas openblas-devel glib2-devel lapack lapack-devel cfitsio cfitsio-devel \ wcslib wcslib-devel ncurses ncurses-devel readline readline-devel\ python-devel boost boost-devel fftw fftw-devel hdf5 hdf5-devel\ From 69ec55d8e2f121732774f1bf9dfaa20eb6f41d6c Mon Sep 17 00:00:00 2001 From: Faruk D Date: Tue, 28 Aug 2018 15:37:47 +0200 Subject: [PATCH 14/17] cmake is called cmake3 on SL --- CMakeLists.txt | 1 + build-tests/sl/compile-sl.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a1da7b3..3267af5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,7 @@ set(PROJECT_VERSION_REVISION 1) set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") +message(STATUS "\n############################\n# HOST SYSTEM v${CMAKE_HOST_SYSTEM_NAME}\n############################") message(STATUS "\n############################\n# Building SageCal v${PROJECT_VERSION}\n############################") include(CheckCXXCompilerFlag) diff --git a/build-tests/sl/compile-sl.sh b/build-tests/sl/compile-sl.sh index 000d3cd..974bf95 100755 --- a/build-tests/sl/compile-sl.sh +++ b/build-tests/sl/compile-sl.sh @@ -18,7 +18,7 @@ cd casacore_install cd /travis/workdir mkdir -p casacore/build cd casacore/build -cmake -DUSE_FFTW3=ON -DCMAKE_INSTALL_PREFIX=/opt/soft/casacore -DDATA_DIR=/opt/soft/casacore/data -DUSE_OPENMP=ON \ +cmake3 -DUSE_FFTW3=ON -DCMAKE_INSTALL_PREFIX=/opt/soft/casacore -DDATA_DIR=/opt/soft/casacore/data -DUSE_OPENMP=ON \ -DUSE_HDF5=ON -DBUILD_PYTHON=ON -DUSE_THREADS=ON .. make -j4 make install @@ -27,7 +27,7 @@ make install cd /travis/workdir && \ mkdir build-sl && cd build-sl -cmake .. -DENABLE_CUDA=OFF && \ +cmake3 .. -DENABLE_CUDA=OFF && \ make -j4 && \ ls -alsrt ./dist/bin && \ ./dist/bin/sagecal From 4b2c475f9f2db94910143cb1456a81307d918426 Mon Sep 17 00:00:00 2001 From: Faruk D Date: Tue, 28 Aug 2018 15:45:47 +0200 Subject: [PATCH 15/17] fix casacore build path --- build-tests/sl/compile-sl.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/build-tests/sl/compile-sl.sh b/build-tests/sl/compile-sl.sh index 974bf95..55ec923 100755 --- a/build-tests/sl/compile-sl.sh +++ b/build-tests/sl/compile-sl.sh @@ -11,13 +11,10 @@ cd /travis/workdir # wget -c ftp://ftp.astron.nl/outgoing/Measures/WSRT_Measures.ztar # tar zxfv WSRT_Measures.ztar && rm -f WSRT_Measures.ztar -cd /tmp -git clone --progress --verbose https://github.com/casacore/casacore.git casacore_install -cd casacore_install - cd /travis/workdir -mkdir -p casacore/build -cd casacore/build +git clone --progress --verbose https://github.com/casacore/casacore.git casacore_src && cd casacore_src + +mkdir build && cd build cmake3 -DUSE_FFTW3=ON -DCMAKE_INSTALL_PREFIX=/opt/soft/casacore -DDATA_DIR=/opt/soft/casacore/data -DUSE_OPENMP=ON \ -DUSE_HDF5=ON -DBUILD_PYTHON=ON -DUSE_THREADS=ON .. make -j4 From ed40c6f6c9163aeb55c60eaf1912c13bd144faab Mon Sep 17 00:00:00 2001 From: Faruk D Date: Tue, 28 Aug 2018 16:27:32 +0200 Subject: [PATCH 16/17] add casacore paths for cmake build on SL --- build-tests/sl/compile-sl.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build-tests/sl/compile-sl.sh b/build-tests/sl/compile-sl.sh index 55ec923..448c0fe 100755 --- a/build-tests/sl/compile-sl.sh +++ b/build-tests/sl/compile-sl.sh @@ -25,6 +25,7 @@ cd /travis/workdir && \ mkdir build-sl && cd build-sl cmake3 .. -DENABLE_CUDA=OFF && \ + -DCASACORE_ROOT_DIR=/opt/soft/casacore -DCASACORE_INCLUDE=/opt/soft/casacore/include/casacore make -j4 && \ ls -alsrt ./dist/bin && \ ./dist/bin/sagecal From bd15937385f286937dc8d6bf9f316d8a33f0a73b Mon Sep 17 00:00:00 2001 From: Faruk D Date: Tue, 28 Aug 2018 16:36:26 +0200 Subject: [PATCH 17/17] disable SL test --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9a8155b..5cc25d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,8 +10,8 @@ before_install: - docker run -itd -v "${TRAVIS_BUILD_DIR}:/travis/workdir" --name ubuntu-build ubuntu:xenial # - docker pull base/archlinux # - docker run -itd -v "${TRAVIS_BUILD_DIR}:/travis/workdir" --name arch-build base/archlinux - - docker pull scientificlinux/sl:7 - - docker run -itd -v "${TRAVIS_BUILD_DIR}:/travis/workdir" --name sl-build scientificlinux/sl:7 +# - docker pull scientificlinux/sl:7 +# - docker run -itd -v "${TRAVIS_BUILD_DIR}:/travis/workdir" --name sl-build scientificlinux/sl:7 script: - export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi) @@ -20,6 +20,6 @@ script: - docker exec --env BRANCH=$BRANCH ubuntu-build /bin/bash -c "/travis/workdir/build-tests/ubuntu/compile-ubuntu.sh" # - docker exec --env BRANCH=$BRANCH arch-build /bin/bash -c "/travis/workdir/build-tests/arch/prepare-arch.sh" # - docker exec --env BRANCH=$BRANCH arch-build /bin/bash -c "/travis/workdir/build-tests/arch/compile-arch.sh" - - docker exec --env BRANCH=$BRANCH sl-build /bin/bash -c "/travis/workdir/build-tests/sl/prepare-sl.sh" - - docker exec --env BRANCH=$BRANCH sl-build /bin/bash -c "/travis/workdir/build-tests/sl/compile-sl.sh" +# - docker exec --env BRANCH=$BRANCH sl-build /bin/bash -c "/travis/workdir/build-tests/sl/prepare-sl.sh" +# - docker exec --env BRANCH=$BRANCH sl-build /bin/bash -c "/travis/workdir/build-tests/sl/compile-sl.sh"