Skip to content

Commit

Permalink
Add TILEDB_REMOVE_DEPRECATIONS to cmake and use in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
jp-dark committed May 16, 2024
1 parent bcfa060 commit 845beb8
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/libtiledb-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Checkout TileDB-SOMA
uses: actions/checkout@v3
- name: Build libTileDB-SOMA
run: TILEDBSOMA_COVERAGE="--coverage" ./scripts/bld
run: TILEDBSOMA_COVERAGE="--coverage" ./scripts/bld --allow-tiledb-depr=false
- name: Run libTileDB-SOMA unittests
run: ctest --test-dir build/libtiledbsoma -C Release --verbose --rerun-failed --output-on-failur
- name: Upload coverage to Codecov
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/python-ci-packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ jobs:
-D CMAKE_INSTALL_PREFIX:PATH=$(pwd)/external/ \
-D OVERRIDE_INSTALL_PREFIX=OFF \
-D DOWNLOAD_TILEDB_PREBUILT=OFF \
-D TILEDB_REMOVE_DEPRECATIONS=ON \
-D FORCE_BUILD_TILEDB=OFF
cmake --build build-libtiledbsoma -j $(nproc)
cmake --build build-libtiledbsoma --target install-libtiledbsoma
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/r-python-interop-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
# run: cd apis/r && Rscript -e "options(bspm.version.check=TRUE); install.packages('tiledb', repos = c('https://eddelbuettel.r-universe.dev/bin/linux/jammy/4.3/', 'https://cloud.r-project.org'))"

- name: Build and install libtiledbsoma
run: sudo scripts/bld --prefix=/usr/local && sudo ldconfig
run: sudo scripts/bld --prefix=/usr/local --allow-tiledb-depr=false && sudo ldconfig

- name: Install R-tiledbsoma
run: |
Expand Down
1 change: 1 addition & 0 deletions libtiledbsoma/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ option(TILEDB_AZURE "Enables Azure Storage support using azure-storage-cpp" ON)
option(TILEDB_GCS "Enables GCS Storage support using google-cloud-cpp" OFF)
option(TILEDB_HDFS "Enables HDFS support using the official Hadoop JNI bindings" OFF)
option(TILEDB_WERROR "Enables the -Werror flag during compilation." OFF)
option(TILEDB_REMOVE_DEPRECATIONS "If true, do not build deprecated APIs." OFF)
option(TILEDB_SERIALIZATION "If true, enables building with support for query serialization" ON)
option(TILEDB_VERBOSE "If true, sets default logging to verbose for TileDB" OFF)
option(OVERRIDE_INSTALL_PREFIX "Ignores the setting of CMAKE_INSTALL_PREFIX and sets a default prefix" ON)
Expand Down
1 change: 1 addition & 0 deletions libtiledbsoma/cmake/Modules/FindTileDB_EP.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ else()
-DTILEDB_HDFS=${TILEDB_HDFS}
-DTILEDB_SERIALIZATION=${TILEDB_SERIALIZATION}
-DTILEDB_WERROR=${TILEDB_WERROR}
-DTILEDB_REMOVE_DEPRECATIONS=${TILEDB_REMOVE_DEPRECATIONS}
-DTILEDB_VERBOSE=${TILEDB_VERBOSE}
-DTILEDB_TESTS=OFF
-DCMAKE_BUILD_TYPE=$<CONFIG>
Expand Down
10 changes: 8 additions & 2 deletions scripts/bld
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@ build="Release"
prefix=""
tiledb=""
cmake_verbose="false"
allow_tiledb_depr="true"

while test $# != 0; do
case "$1" in
--build=*) build=$(arg "$1");;
--prefix=*) prefix=$(arg "$1");;
--tiledb=*) tiledb=$(arg "$1");;
--cmake-verbose=*) cmake_verbose=$(arg "$1");;
--allow-tiledb-depr=*) allow_tiledb_depr=$(arg "$1");;
esac
shift
done
Expand Down Expand Up @@ -53,16 +55,20 @@ if [ "$cmake_verbose" = "true" ]; then

# TILEDB_WERROR=OFF is necessary to build core with XCode 14; doesn't hurt for XCode 13.
extra_opts+=" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DTILEDB_WERROR=OFF -DTILEDBSOMA_ENABLE_WERROR=OFF"

# Debug cmake find commands
extra_opts+=" --debug-find"

# Also (pro-tip), set nproc=1 to get a more deterministic ordering of output lines.
nproc=1
fi

if [ "$allow_tiledb_depr" = "false" ]; then
extra_opts+=" -DTILEDB_REMOVE_DEPRECATIONS=ON"
fi

# set installation path
if [ -n "${prefix}" ]; then
if [ -n "${prefix}" ]; then
extra_opts+=" -DCMAKE_INSTALL_PREFIX=${prefix} -DOVERRIDE_INSTALL_PREFIX=OFF"
fi

Expand Down

0 comments on commit 845beb8

Please sign in to comment.