Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@johguenther
johguenther committed Nov 28, 2024
1 parent bf0a6d7 commit 431fa13
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .github/deps/dpcpp-linux-icx.env
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
DPCPP_VERSION=intel/2024.1.0
DPCPP_VERSION=intel/2025.0
2 changes: 1 addition & 1 deletion .github/deps/dpcpp-windows-icx.env
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
DPCPP_VERSION=oneAPI/compiler/2024.1
DPCPP_VERSION=intel/2025.0
2 changes: 1 addition & 1 deletion .github/deps/gfx-windows-public.env
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
GFX_DRIVER_VERSION=windows-101.5445
GFX_DRIVER_VERSION=windows-101.6130
54 changes: 27 additions & 27 deletions superbuild/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,17 +95,17 @@ option(BUILD_OPENVKL_BENCHMARKS

option(BUILD_ISPC "Build the Intel SPMD Program Compiler or search in environment?" ON)
if (BUILD_ISPC)
set(ISPC_VERSION "1.23.0")
set(ISPC_VERSION "1.25.3")
set(ISPC_BASE_URL "https://github.com/ispc/ispc/releases/download/v${ISPC_VERSION}")
if (APPLE)
set(_ISPC_URL "${ISPC_BASE_URL}/ispc-v${ISPC_VERSION}-macOS.universal.tar.gz")
set(_ISPC_HASH "9c5893cbb5fd0b04cf5109a027bcbe8f8ca54bc8f7eaf468ce0bc13a9b0e06bd")
set(_ISPC_HASH "c6a83d1d0c37698f3bba7fd1a44835af0236248efdaf2b4a32b768e9cbd04163")
elseif(WIN32)
set(_ISPC_URL "${ISPC_BASE_URL}/ispc-v${ISPC_VERSION}-windows.zip")
set(_ISPC_HASH "709350902381968ee58fd67e9aed63df99b1313bc55a94195977bcc8d90bdced")
set(_ISPC_HASH "3a97e325f236c34a68013bf56fcb4e23c811b404207a60c010dc38fa24e60c55")
else()
set(_ISPC_URL "${ISPC_BASE_URL}/ispc-v${ISPC_VERSION}-linux.tar.gz")
set(_ISPC_HASH "fc31f53f77a67cb5b465727b70af7d6cde8f38012c4ca0f1678b174a955cb5a8")
set(_ISPC_URL "${ISPC_BASE_URL}/ispc-v${ISPC_VERSION}-linux-oneapi.tar.gz")
set(_ISPC_HASH "526fe36638e675b9e1bb0618ac30f5286339e7a7e7f5a8441cd7607177292804")
endif()
set(ISPC_URL "${_ISPC_URL}" CACHE STRING "URL of the ISPC archive.")
set(ISPC_HASH "${_ISPC_HASH}" CACHE STRING "SHA256 hash of the ISPC archive.")
Expand All @@ -115,15 +115,15 @@ endif()
option(BUILD_TBB "Build Intel Threading Building Blocks or search in environment?" ON)
option(BUILD_TBB_FROM_SOURCE "Build Intel Threading Building Blocks from source or use pre-built version?" OFF)
if (BUILD_TBB)
set(TBB_VERSION "2021.11.0" CACHE STRING "TBB version to download")
set(TBB_VERSION "2022.0.0" CACHE STRING "TBB version to download")
if (BUILD_TBB_FROM_SOURCE)
if (TBB_VERSION VERSION_LESS 2021)
message(FATAL_ERROR "Only TBB 2021 and later are supported when building TBB from source")
endif()

string(REGEX REPLACE "(^[0-9]+\.[0-9]+\.[0-9]+$)" "v\\1" TBB_ARCHIVE ${TBB_VERSION})
set(_TBB_URL "https://github.com/oneapi-src/oneTBB/archive/refs/tags/${TBB_ARCHIVE}.zip")
set(_TBB_HASH "2f0bfce641d238e80798fc48397d43821bd977d49c4e03bc785be363b7ab4742")
set(_TBB_URL "https://github.com/oneapi-src/oneTBB/archive/refs/tags/${TBB_ARCHIVE}.tar.gz")
set(_TBB_HASH "e8e89c9c345415b17b30a2db3095ba9d47647611662073f7fbf54ad48b7f3c2a")
else()
if (TBB_VERSION VERSION_LESS 2021)
set(TBB_BASE_URL "https://github.com/oneapi-src/oneTBB/releases/download/v${TBB_VERSION}/tbb-${TBB_VERSION}")
Expand All @@ -132,15 +132,15 @@ if (BUILD_TBB)
endif()
if (APPLE)
set(_TBB_URL "${TBB_BASE_URL}-mac.tgz")
set(_TBB_HASH "360bcb20bcdcd01e8492c32bba6d5d5baf4bc83f77fb9dbf1ff701ac816e3b44")
set(_TBB_HASH "9d0280d9c4ef71f0fe0985c298c20c105757e1bccedcf6676cba5d92877cfe0c")
set(TBB_LIB_SUBDIR "")
elseif(WIN32)
set(_TBB_URL "${TBB_BASE_URL}-win.zip")
set(_TBB_HASH "02f0e93600fba69bb1c00e5dd3f66ae58f56e5410342f6155455a95ba373b1b6")
set(_TBB_HASH "660f3555de26bee8cd4daef1105d5d9e93e695b2fcfa9c57db3aa38c6afe5675")
set(TBB_LIB_SUBDIR "intel64/vc14")
else()
set(_TBB_URL "${TBB_BASE_URL}-lin.tgz")
set(_TBB_HASH "95659f4d7b1711c41ffa190561d4e5b6841efc8091549661c7a2e6207e0fa79b")
set(_TBB_HASH "1b669eb357dd90f3135f27e3c9a78683c6ecc74edf2799f7cb7df92a5423cb76")
set(TBB_LIB_SUBDIR "intel64/gcc4.8")
endif()
endif()
Expand All @@ -152,10 +152,10 @@ endif()

option(BUILD_RKCOMMON "Build rkcommon or search in environment?" ON)
if (BUILD_RKCOMMON)
set(RKCOMMON_VERSION "v1.13.0" CACHE STRING "rkcommon version to download")
set(RKCOMMON_URL "https://github.com/ospray/rkcommon/archive/${RKCOMMON_VERSION}.zip"
set(RKCOMMON_VERSION "v1.14.2" CACHE STRING "rkcommon version to download")
set(RKCOMMON_URL "https://github.com/ospray/rkcommon/archive/${RKCOMMON_VERSION}.tar.gz"
CACHE STRING "URL of the rkcommon archive.")
set(RKCOMMON_HASH "9d360ce89de1842d4ae81b561ce150efd4fd812bd9e8b1d42d3934c528de637c" CACHE STRING "SHA256 hash of the rkcommon archive.")
set(RKCOMMON_HASH "79334ef3dadddb03ec0483fbf49bf690fb8902d5c2732d977b2c116651484cc6" CACHE STRING "SHA256 hash of the rkcommon archive.")
include(dep_rkcommon)
endif()

Expand All @@ -165,23 +165,23 @@ option(BUILD_EMBREE "Build Intel Embree or search in environment?" ON)
option(BUILD_EMBREE_FROM_SOURCE "Build Embree from source or use pre-built version? (Only used when BUILD_EMBREE=ON)" ON)
option(BUILD_EMBREE_SYCL "Build Intel Embree with SYCL support?" OFF)
if (BUILD_EMBREE)
set(EMBREE_VERSION "v4.3.1" CACHE STRING "Embree version to download")
set(EMBREE_VERSION "v4.3.3" CACHE STRING "Embree version to download")
if (BUILD_EMBREE_FROM_SOURCE)
set(_EMBREE_URL "https://github.com/embree/embree/archive/${EMBREE_VERSION}.zip")
set(_EMBREE_HASH "bdab87b285efa1a9f1f57fe74b2743c659c487fee7e32221db43a6b8f5e36e5f")
set(_EMBREE_URL "https://github.com/embree/embree/archive/${EMBREE_VERSION}.tar.gz")
set(_EMBREE_HASH "8a3bc3c3e21aa209d9861a28f8ba93b2f82ed0dc93341dddac09f1f03c36ef2d")
else()
# Embree binary package URLs do not use the "v" prefix
string(REPLACE "v" "" EMBREE_VERSION_NUMBER ${EMBREE_VERSION})
set(EMBREE_BASE_URL "https://github.com/embree/embree/releases/download/${EMBREE_VERSION}")
if (APPLE)
set(_EMBREE_URL "${EMBREE_BASE_URL}/embree-${EMBREE_VERSION_NUMBER}.x86_64.macosx.zip")
set(_EMBREE_HASH "ffb446c5a688d961f4219f42446147632f5704374c5b2b148a1e2a20b7c99975")
set(_EMBREE_HASH "98997523dfff8efd8120075f7feba00cfc765c992d758d9be12d56bfe6bec233")
elseif (WIN32)
set(_EMBREE_URL "${EMBREE_BASE_URL}/embree-${EMBREE_VERSION_NUMBER}.x64.windows.zip")
set(_EMBREE_HASH "6e2b968d45c0895cda98fb44c42e214e8d382bcd08b0a548fe086b0864563c6a")
set(_EMBREE_HASH "d4c07f88df9f009dd84e4e9b9dcec32ad7d96f927bd88de00b721b0923d481a9")
else()
set(_EMBREE_URL "${EMBREE_BASE_URL}/embree-${EMBREE_VERSION_NUMBER}.x86_64.linux.tar.gz")
set(_EMBREE_HASH "375e829dc31ac5c6c579de34e0b1527e088a3b296fb9d3f90ed892d29592f845")
set(_EMBREE_HASH "757e6e8b987d13ac34aa7c4c3657120fd54a78c2a1034e30dda5cd5df06f3cdd")
endif()
endif()
set(EMBREE_URL "${_EMBREE_URL}" CACHE STRING "URL of the Embree source archive.")
Expand All @@ -192,10 +192,10 @@ endif()

option(BUILD_GLFW "Build glfw or search in environment?" ON)
if (BUILD_GLFW)
set(GLFW_VERSION "3.3.9")
set(GLFW_VERSION "3.3.10")
set(GLFW_URL "https://github.com/glfw/glfw/archive/${GLFW_VERSION}.zip"
CACHE STRING "URL of the GLFW source archive.")
set(GLFW_HASH "c49d895b1f32fa3e072626f6dc928887fc814f445d3ba1fbb97598fea8e48933"
set(GLFW_HASH "5e4ae02dc7c9b084232824c2511679a7e0b0b09f2bae70191ad9703691368b58"
CACHE STRING "SHA256 hash of the GLFW source archive.")
include(dep_glfw)
endif()
Expand Down Expand Up @@ -235,20 +235,20 @@ if (BUILD_OPENVDB)
CACHE STRING "SHA256 hash of the zlib archive.")
include(dep_zlib)

set(BOOST_VERSION "1.84.0")
set(BOOST_VERSION "1.86.0")
string(REPLACE "." "_" BOOST_FILE_BASE "${BOOST_VERSION}")
set(BOOST_BASE_URL "https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/boost")
set(_BOOST_URL "${BOOST_BASE_URL}_${BOOST_FILE_BASE}.tar.gz")
set(_BOOST_HASH "a5800f405508f5df8114558ca9855d2640a2de8f0445f051fa1c7c3383045724")
set(_BOOST_HASH "2575e74ffc3ef1cd0babac2c1ee8bdb5782a0ee672b1912da40e5b4b591ca01f")
set(BOOST_URL "${_BOOST_URL}" CACHE STRING "URL of the boost archive.")
set(BOOST_HASH "${_BOOST_HASH}" CACHE STRING "SHA256 hash of the boost archive.")
include(dep_boost)

if (BUILD_BLOSC)
set(BLOSC_VERSION "1.21.5")
set(BLOSC_URL "https://github.com/Blosc/c-blosc/archive/v${BLOSC_VERSION}.zip"
set(BLOSC_VERSION "1.21.6")
set(BLOSC_URL "https://github.com/Blosc/c-blosc/archive/v${BLOSC_VERSION}.tar.gz"
CACHE STRING "URL of the c-BLOSC archive.")
set(BLOSC_HASH "bc022fd194e40421531d2ef69831f2793d405d98f60e759c697ccc02dad765ec"
set(BLOSC_HASH "9fcd60301aae28f97f1301b735f966cc19e7c49b6b4321b839b4579a0c156f38"
CACHE STRING "SHA256 hash of the c-BLOSC archive.")
include(dep_blosc)
endif()
Expand Down

0 comments on commit 431fa13

Please sign in to comment.