Skip to content

update to TileDB-2.18.0 #317

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.

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
merged 10 commits into from
Nov 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
src/main/c/generated/* linguist-generated=true
src/main/java/io/tiledb/libtiledb/* linguist-generated=true
7 changes: 1 addition & 6 deletions .github/workflows/github_actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ jobs:
- name: checkout
uses: actions/checkout@v3

- name: checkFormat
uses: gradle/[email protected]
with:
arguments: checkFormat

- name: assemble
uses: gradle/[email protected]
with:
Expand All @@ -40,7 +35,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ ubuntu-latest, macos-11, macos-13-xlarge ]
os: [ ubuntu-latest, macos-13, macos-13-xlarge ]
steps:
- name: checkout
uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ endif()
# Default builds the superbuild.
option(TILEDB_JNI_SUPERBUILD "If true, perform a superbuild (builds all missing dependencies)." ON)

# Set C++11 as required standard for all C++ targets.
set(CMAKE_CXX_STANDARD 11)
# Set C++20 as required standard for all C++ targets.
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF) # Don't use GNU extensions

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ plugins {
}

group 'io.tiledb'
version '0.19.6-SNAPSHOT'
version '0.20.0-SNAPSHOT'

repositories {
jcenter()
Expand Down
20 changes: 10 additions & 10 deletions cmake/Modules/FindTileDB_EP.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -48,29 +48,29 @@ 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.17.4/tiledb-windows-x86_64-2.17.4-a1f648e.zip")
SET(DOWNLOAD_SHA1 "d82a090d231e5cebd10205af8b80884e934b9e9f")
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.18.0/tiledb-windows-x86_64-2.18.0-71ca8b4.zip")
SET(DOWNLOAD_SHA1 "9aa8c0483a66fe1102a450c4d32e4418a3757a66")
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.17.4/tiledb-macos-x86_64-2.17.4-a1f648e.tar.gz")
SET(DOWNLOAD_SHA1 "9e3807e1b63b21849a374c6d9c9f161b46a9cc5a")
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.18.0/tiledb-macos-x86_64-2.18.0-71ca8b4.tar.gz")
SET(DOWNLOAD_SHA1 "320c34e9fba38b69ce69d53b7e21641ff91a3d25")

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.17.4/tiledb-macos-arm64-2.17.4-a1f648e.tar.gz")
SET(DOWNLOAD_SHA1 "e6ec0634f665943ff9879041ab122bdaa96349df")
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.18.0/tiledb-macos-arm64-2.18.0-71ca8b4.tar.gz")
SET(DOWNLOAD_SHA1 "fc086a7b0a2aa1fa2b6d59546b1745f90cd6f823")
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.17.4/tiledb-linux-x86_64-2.17.4-a1f648e.tar.gz")
SET(DOWNLOAD_SHA1 "7849cbbf19f5f9252e4be5350328754b01938aaa")
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.18.0/tiledb-linux-x86_64-2.18.0-71ca8b4.tar.gz")
SET(DOWNLOAD_SHA1 "46fb2a29ed2a8058a3b190b0234227ed6096f7b4")
else()
message(STATUS "Using Linux binaries without AVX2")
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.17.4/tiledb-linux-x86_64-noavx2-2.17.4-a1f648e.tar.gz")
SET(DOWNLOAD_SHA1 "f7b959ec521fd0ebd82b266549c454bef20d0a40")
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.18.0/tiledb-linux-x86_64-noavx2-2.18.0-71ca8b4.tar.gz")
SET(DOWNLOAD_SHA1 "aa053a4b07b49d3b8c0f28989ad1ad70de9573a6")
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
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.17.4
TILEDB_GIT_TAG=2.18.0
TILEDB_VERBOSE=ON
TILEDB_S3=ON
TILEDB_AZURE=OFF
Expand Down
Loading