Skip to content

update to TileDB-2.20.0 #340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DimitrisStaratzis merged 8 commits into from
Feb 21, 2024
Merged

update to TileDB-2.20.0 #340

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
976b178
update to TileDB-2.20.0-rc0
DimitrisStaratzis Jan 25, 2024
3025468
update to TileDB-2.20.0-rc1
DimitrisStaratzis Feb 6, 2024
b54c542
Rename `TILEDB_CORE_EXPORTS` to `tiledb_EXPORTS`.
teo-tsirpanis Feb 6, 2024
859c070
update to TileDB-2.20.0-rc2
DimitrisStaratzis Feb 12, 2024
cb8a49d
update to TileDB-2.20.0 stable
DimitrisStaratzis Feb 19, 2024
4582041
update build.gradle
DimitrisStaratzis Feb 19, 2024
fe786c4
fix sha1sums
DimitrisStaratzis Feb 19, 2024
9606ee5
update to TileDB-2.20.1
DimitrisStaratzis Feb 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ add_library(tiledbjni SHARED
src/main/c/custom/tiledb_custom.cxx
)

target_compile_definitions(tiledbjni PRIVATE -DTILEDB_CORE_OBJECTS_EXPORTS)
target_compile_definitions(tiledbjni PRIVATE -Dtiledb_EXPORTS)
Copy link
Member

@ihnorton ihnorton Feb 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DimitrisStaratzis do we actually need this?

@teo-tsirpanis why did this name change?

Copy link
Member

@ihnorton ihnorton Feb 20, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AFAICT the reason for this -D is to enable TILEDB_EXPORT in the https://github.com/TileDB-Inc/TileDB-Java/blob/master/swig/tiledb_java_extensions.h file. That file is effectively borrowing/piggybacking on the core exports.h (we could generate our own for -Java with cmake). So probably this is the ~only usage.

Copy link
Member

@teo-tsirpanis teo-tsirpanis Feb 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The define was renamed in TileDB-Inc/TileDB#4528. I wouldn't consider it a breaking change; this is an undocumented implementation detail that no external repository should define. This is in fact the only use of this define.

target_include_directories(tiledbjni
PRIVATE
"${CMAKE_CURRENT_SOURCE_DIR}/swig"
Expand Down
20 changes: 10 additions & 10 deletions cmake/Modules/FindTileDB_EP.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,30 +48,30 @@ if (NOT TILEDB_FOUND)
# Try to download prebuilt artifacts unless the user specifies to build from source
if(DOWNLOAD_TILEDB_PREBUILT)
if (WIN32) # Windows
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.19.1/tiledb-windows-x86_64-2.19.1-29ceb3e7.zip")
SET(DOWNLOAD_SHA1 "b3c6002e8792501a8020aa71f2ea75019b6e3339")
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0-rc1/tiledb-windows-x86_64-2.20.0-rc1-9a3c2dc.zip")
SET(DOWNLOAD_SHA1 "9e5a67f75312e11c1bf3ebc9b0e142c30062585c")
elseif(APPLE) # macOS

if (CMAKE_OSX_ARCHITECTURES STREQUAL x86_64 OR CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(AMD64|amd64)|(^i.86$)")
message(STATUS "Building for intel mac")

SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.19.1/tiledb-macos-x86_64-2.19.1-29ceb3e7.tar.gz")
SET(DOWNLOAD_SHA1 "c9c667689e0a8c4e5a2989f179995b0a013ca047")
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0-rc1/tiledb-macos-x86_64-2.20.0-rc1-9a3c2dc.tar.gz")
SET(DOWNLOAD_SHA1 "94ec0974b59dcd8b7fd5fd3c073d1586d41510da")

elseif (CMAKE_OSX_ARCHITECTURES STREQUAL arm64 OR CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
message(STATUS "Building for apple silicon mac")
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.19.1/tiledb-macos-arm64-2.19.1-29ceb3e7.tar.gz")
SET(DOWNLOAD_SHA1 "eb15d2d6c2920011765e1c102a43c23b8d7b1b0f")
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0-rc1/tiledb-macos-arm64-2.20.0-rc1-9a3c2dc.tar.gz")
SET(DOWNLOAD_SHA1 "ae38050b92399f91032165af14d4211c8c1707ac")
endif()
else() # Linux
if (USE_AVX2)
message(STATUS "Using Linux binaries with AVX2")
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.19.1/tiledb-linux-x86_64-2.19.1-29ceb3e7.tar.gz")
SET(DOWNLOAD_SHA1 "84dda6d2faa3abaef9dae296f16de1979df0f9b0")
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0-rc1/tiledb-linux-x86_64-2.20.0-rc1-9a3c2dc.tar.gz")
SET(DOWNLOAD_SHA1 "5f5b8954b34ca7d4f46c342ebdb190aaac9bb50c")
else()
message(STATUS "Using Linux binaries without AVX2")
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.19.1/tiledb-linux-x86_64-noavx2-2.19.1-29ceb3e7.tar.gz")
SET(DOWNLOAD_SHA1 "8269537ffd962ee8b5b55d0284ffc5af9544f876")
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0-rc1/tiledb-linux-x86_64-noavx2-2.20.0-rc1-9a3c2dc.tar.gz")
SET(DOWNLOAD_SHA1 "a4ee66fc8484fa6340e757750b7e2a959117933c")
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
TILEDB_GIT_REPOSITORY=https://github.com/TileDB-Inc/TileDB
TILEDB_GIT_TAG=2.19.1
TILEDB_GIT_TAG=2.20.0-rc1
TILEDB_VERBOSE=ON
TILEDB_S3=ON
TILEDB_AZURE=OFF
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/io/tiledb/java/api/VersionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public void testVersion() {
Version version = new Version();
System.out.println(version);
Assert.assertTrue(version.getMajor() == 2);
Assert.assertTrue(version.getMinor() == 19);
Assert.assertTrue(version.getRevision() == 1);
Assert.assertTrue(version.getMinor() == 20);
Assert.assertTrue(version.getRevision() == 0);
}
}