Skip to content

Commit 5f711f6

Browse files
committed
travis-ci: cloning/installing TELite
testing improvements for TELite features use a specific version via travis.yml require the library to be found output prints adding TELite installation removed the two executions with REQUIRE_NETCDF_MPI=FALSE updated TECA_DATA_REVISION updated TELite commit
1 parent ac3cfbd commit 5f711f6

File tree

9 files changed

+67
-5
lines changed

9 files changed

+67
-5
lines changed

.travis.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@ env:
1919
- BUILD_TYPE=Debug
2020
- TECA_DIR=/travis_teca_dir
2121
- TECA_PYTHON_VERSION=3
22-
- TECA_DATA_REVISION=163
22+
- TECA_DATA_REVISION=164
23+
- TECA_TELITE_REVISION=188dc11d
2324
jobs:
2425
- DOCKER_IMAGE=ubuntu IMAGE_VERSION=22.04 IMAGE_NAME=ubuntu_22_04 REQUIRE_NETCDF_MPI=TRUE
25-
- DOCKER_IMAGE=ubuntu IMAGE_VERSION=22.04 IMAGE_NAME=ubuntu_22_04 REQUIRE_NETCDF_MPI=FALSE
26+
#- DOCKER_IMAGE=ubuntu IMAGE_VERSION=22.04 IMAGE_NAME=ubuntu_22_04 REQUIRE_NETCDF_MPI=FALSE
2627
- DOCKER_IMAGE=fedora IMAGE_VERSION=37 IMAGE_NAME=fedora_37 REQUIRE_NETCDF_MPI=TRUE
27-
- DOCKER_IMAGE=fedora IMAGE_VERSION=37 IMAGE_NAME=fedora_37 REQUIRE_NETCDF_MPI=FALSE
28+
#- DOCKER_IMAGE=fedora IMAGE_VERSION=37 IMAGE_NAME=fedora_37 REQUIRE_NETCDF_MPI=FALSE
2829
- NO_DOCKER=TRUE
2930

3031
jobs:
@@ -66,6 +67,7 @@ install:
6667
"export TECA_PYTHON_VERSION=${TECA_PYTHON_VERSION} &&
6768
export TECA_DATA_REVISION=${TECA_DATA_REVISION} &&
6869
export REQUIRE_NETCDF_MPI=${REQUIRE_NETCDF_MPI} &&
70+
export TECA_TELITE_REVISION=${TECA_TELITE_REVISION} &&
6971
${TECA_DIR}/test/travis_ci/install_${IMAGE_NAME}.sh";
7072
fi
7173
@@ -83,5 +85,6 @@ script:
8385
export DOCKER_IMAGE=${DOCKER_IMAGE} &&
8486
export IMAGE_VERSION=${IMAGE_VERSION} &&
8587
export REQUIRE_NETCDF_MPI=${REQUIRE_NETCDF_MPI} &&
88+
export TECA_TELITE_REVISION=${TECA_TELITE_REVISION} &&
8689
${TECA_DIR}/test/travis_ci/ctest_linux.sh";
8790
fi

test/travis_ci/ctest_linux.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ REQUIRE_NETCDF_MPI=$ENV{REQUIRE_NETCDF_MPI}
2929
REQUIRE_UDUNITS=TRUE
3030
REQUIRE_MPI=TRUE
3131
REQUIRE_PYTHON=TRUE
32-
REQUIRE_TECA_DATA=TRUE")
32+
REQUIRE_TECA_DATA=TRUE
33+
REQUIRE_TELITE=TRUE
34+
TELite_DIR=/usr/local/lib")
3335
file(WRITE "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt" ${INITIAL_CACHE})
3436
ctest_start("${DASHBOARD_TRACK}")
3537
ctest_read_custom_files("${CTEST_BINARY_DIRECTORY}")

test/travis_ci/ctest_linux.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export LD_LIBRARY_PATH=${DASHROOT}/build/lib
2727
export MPLBACKEND=Agg
2828
mkdir build
2929

30-
ctest -S ${DASHROOT}/test/travis_ci/ctest_linux.cmake --output-on-failure --timeout 400 &
30+
ctest -S ${DASHROOT}/test/travis_ci/ctest_linux.cmake -V --timeout 400 &
3131
ctest_pid=$!
3232

3333
# this loop prevents travis from killing the job

test/travis_ci/install_fedora_31.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,12 @@ pip3 install "numpy<2.0" mpi4py matplotlib torch
3737

3838
# install data files.
3939
svn co svn://svn.code.sf.net/p/teca/TECA_data@${TECA_DATA_REVISION} TECA_data
40+
41+
# install TELite library
42+
git clone https://github.com/LBL-EESA/TELite.git
43+
cd TELite
44+
git checkout ${TECA_TELITE_REVISION}
45+
mkdir build
46+
cd build
47+
cmake ..
48+
make -j2 && make -j2 install

test/travis_ci/install_fedora_32.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ echo ${DOCKER_IMAGE}
2828
echo ${IMAGE_VERSION}
2929
echo ${TECA_PYTHON_VERSION}
3030
echo ${TECA_DATA_REVISION}
31+
echo ${TECA_TELITE_REVISION}
3132

3233
python3 -mvenv `pwd`/../tci
3334
set +x
@@ -37,3 +38,12 @@ pip3 install "numpy<2.0" mpi4py matplotlib torch
3738

3839
# install data files.
3940
svn co svn://svn.code.sf.net/p/teca/TECA_data@${TECA_DATA_REVISION} TECA_data
41+
42+
# install TELite library
43+
git clone https://github.com/LBL-EESA/TELite.git
44+
cd TELite
45+
git checkout ${TECA_TELITE_REVISION}
46+
mkdir build
47+
cd build
48+
cmake ..
49+
make -j2 && make -j2 install

test/travis_ci/install_fedora_33.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ echo ${DOCKER_IMAGE}
2828
echo ${IMAGE_VERSION}
2929
echo ${TECA_PYTHON_VERSION}
3030
echo ${TECA_DATA_REVISION}
31+
echo ${TECA_TELITE_REVISION}
3132

3233
python3 -mvenv `pwd`/../tci
3334
set +x
@@ -37,3 +38,12 @@ pip3 install "numpy<2.0" mpi4py matplotlib torch
3738

3839
# install data files.
3940
svn co svn://svn.code.sf.net/p/teca/TECA_data@${TECA_DATA_REVISION} TECA_data
41+
42+
# install TELite library
43+
git clone https://github.com/LBL-EESA/TELite.git
44+
cd TELite
45+
git checkout ${TECA_TELITE_REVISION}
46+
mkdir build
47+
cd build
48+
cmake ..
49+
make -j2 && make -j2 install

test/travis_ci/install_fedora_37.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,12 @@ pip3 install "numpy<2.0" mpi4py matplotlib torch
4040

4141
# install data files.
4242
svn co svn://svn.code.sf.net/p/teca/TECA_data@${TECA_DATA_REVISION} TECA_data
43+
44+
# install TELite library
45+
git clone https://github.com/LBL-EESA/TELite.git
46+
cd TELite
47+
git checkout ${TECA_TELITE_REVISION}
48+
mkdir build
49+
cd build
50+
cmake ..
51+
make -j2 && make -j2 install

test/travis_ci/install_ubuntu_20_04.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ echo ${DOCKER_IMAGE}
3636
echo ${IMAGE_VERSION}
3737
echo ${TECA_PYTHON_VERSION}
3838
echo ${TECA_DATA_REVISION}
39+
echo ${TECA_TELITE_REVISION}
3940

4041
python3 -mvenv `pwd`/../tci
4142
set +x
@@ -45,3 +46,12 @@ pip3 install "numpy<2.0" mpi4py matplotlib torch
4546

4647
# install data files.
4748
svn co svn://svn.code.sf.net/p/teca/TECA_data@${TECA_DATA_REVISION} TECA_data
49+
50+
# install TELite library
51+
git clone https://github.com/LBL-EESA/TELite.git
52+
cd TELite
53+
git checkout ${TECA_TELITE_REVISION}
54+
mkdir build
55+
cd build
56+
cmake ..
57+
make -j2 && make -j2 install

test/travis_ci/install_ubuntu_22_04.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,12 @@ pip3 install "numpy<2.0" mpi4py matplotlib torch
4545

4646
# install data files.
4747
svn co svn://svn.code.sf.net/p/teca/TECA_data@${TECA_DATA_REVISION} TECA_data
48+
49+
# install TELite library
50+
git clone https://github.com/LBL-EESA/TELite.git
51+
cd TELite
52+
git checkout ${TECA_TELITE_REVISION}
53+
mkdir build
54+
cd build
55+
cmake ..
56+
make -j2 && make -j2 install

0 commit comments

Comments
 (0)