diff --git a/.clang-format b/.clang-format index 49874e68..0d5af670 100644 --- a/.clang-format +++ b/.clang-format @@ -45,7 +45,7 @@ Cpp11BracedListStyle: true DerivePointerAlignment: false DisableFormat: false ExperimentalAutoDetectBinPacking: false -ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ] +ForEachMacros: [ foreach, foreach_active, foreach_tiled, foreach_unique, cdo, cfor, cif, cwhile ] StatementMacros: [ __vkl_interop_univary, template_VdbSampler_sampleLeafZYX_constant, template_VdbSampler_sampleLeafZYX_structured, @@ -78,7 +78,7 @@ StatementMacros: [ __vkl_interop_univary, __vkl_leaf_handler_temporalFormat, __vkl_leaf_handler ] IncludeCategories: - - Regex: '^<.*\.h>' + - Regex: '^<.*\.i?h>' Priority: 1 - Regex: '^<.*' Priority: 2 diff --git a/.github/deps/dpcpp-linux-icx.env b/.github/deps/dpcpp-linux-icx.env index b075380d..f65d8813 100644 --- a/.github/deps/dpcpp-linux-icx.env +++ b/.github/deps/dpcpp-linux-icx.env @@ -1 +1 @@ -DPCPP_VERSION=intel/2024.1.0 \ No newline at end of file +DPCPP_VERSION=intel/2024.2 diff --git a/.github/deps/dpcpp-windows-icx.env b/.github/deps/dpcpp-windows-icx.env index ee56f753..f65d8813 100644 --- a/.github/deps/dpcpp-windows-icx.env +++ b/.github/deps/dpcpp-windows-icx.env @@ -1 +1 @@ -DPCPP_VERSION=oneAPI/compiler/2024.1 \ No newline at end of file +DPCPP_VERSION=intel/2024.2 diff --git a/.github/deps/gfx-windows-public.env b/.github/deps/gfx-windows-public.env index 3676fb2d..71e897e3 100644 --- a/.github/deps/gfx-windows-public.env +++ b/.github/deps/gfx-windows-public.env @@ -1 +1 @@ -GFX_DRIVER_VERSION=windows-101.5445 \ No newline at end of file +GFX_DRIVER_VERSION=windows-101.6130 diff --git a/gitlab/build-from-install.sh b/.github/scripts/build-from-install.sh similarity index 100% rename from gitlab/build-from-install.sh rename to .github/scripts/build-from-install.sh diff --git a/gitlab/build.bat b/.github/scripts/build.bat similarity index 100% rename from gitlab/build.bat rename to .github/scripts/build.bat diff --git a/gitlab/build.sh b/.github/scripts/build.sh similarity index 100% rename from gitlab/build.sh rename to .github/scripts/build.sh diff --git a/gitlab/release/linux-test.sh b/.github/scripts/release/linux-test.sh similarity index 100% rename from gitlab/release/linux-test.sh rename to .github/scripts/release/linux-test.sh diff --git a/gitlab/release/linux.sh b/.github/scripts/release/linux.sh similarity index 96% rename from gitlab/release/linux.sh rename to .github/scripts/release/linux.sh index 0449507f..bbd2eb83 100755 --- a/gitlab/release/linux.sh +++ b/.github/scripts/release/linux.sh @@ -81,6 +81,6 @@ cd $OPENVKL_INSTALL_DIR/.. tar -czf $OPENVKL_PKG_BASE.tar.gz $OPENVKL_PKG_BASE # sign -$ROOT_DIR/gitlab/release/sign.sh $OPENVKL_PKG_BASE.tar.gz +$ROOT_DIR/.github/scripts/release/sign.sh $OPENVKL_PKG_BASE.tar.gz mv *.tar.gz $ROOT_DIR diff --git a/gitlab/release/linux_sycl-test.sh b/.github/scripts/release/linux_sycl-test.sh similarity index 100% rename from gitlab/release/linux_sycl-test.sh rename to .github/scripts/release/linux_sycl-test.sh diff --git a/gitlab/release/linux_sycl-test_run_only.sh b/.github/scripts/release/linux_sycl-test_run_only.sh similarity index 100% rename from gitlab/release/linux_sycl-test_run_only.sh rename to .github/scripts/release/linux_sycl-test_run_only.sh diff --git a/gitlab/release/linux_sycl.sh b/.github/scripts/release/linux_sycl.sh similarity index 97% rename from gitlab/release/linux_sycl.sh rename to .github/scripts/release/linux_sycl.sh index b191e2be..4c39f7e1 100755 --- a/gitlab/release/linux_sycl.sh +++ b/.github/scripts/release/linux_sycl.sh @@ -94,6 +94,6 @@ cd $OPENVKL_INSTALL_DIR/.. tar -czf $OPENVKL_PKG_BASE.tar.gz $OPENVKL_PKG_BASE # sign -$ROOT_DIR/gitlab/release/sign.sh $OPENVKL_PKG_BASE.tar.gz +$ROOT_DIR/.github/scripts/release/sign.sh $OPENVKL_PKG_BASE.tar.gz mv *.tar.gz $ROOT_DIR diff --git a/gitlab/release/macos-test.sh b/.github/scripts/release/macos-test.sh similarity index 100% rename from gitlab/release/macos-test.sh rename to .github/scripts/release/macos-test.sh diff --git a/gitlab/release/macos.sh b/.github/scripts/release/macos.sh similarity index 97% rename from gitlab/release/macos.sh rename to .github/scripts/release/macos.sh index 6956c004..c4fc64e5 100755 --- a/gitlab/release/macos.sh +++ b/.github/scripts/release/macos.sh @@ -94,6 +94,6 @@ cd $OPENVKL_INSTALL_DIR/.. zip -ry $OPENVKL_PKG_BASE.zip $OPENVKL_PKG_BASE # sign -$ROOT_DIR/gitlab/release/sign.sh $OPENVKL_PKG_BASE.zip +$ROOT_DIR/.github/scripts/release/sign.sh $OPENVKL_PKG_BASE.zip mv *.zip $ROOT_DIR diff --git a/gitlab/release/sign.sh b/.github/scripts/release/sign.sh similarity index 100% rename from gitlab/release/sign.sh rename to .github/scripts/release/sign.sh diff --git a/gitlab/release/windows-test.ps1 b/.github/scripts/release/windows-test.ps1 similarity index 100% rename from gitlab/release/windows-test.ps1 rename to .github/scripts/release/windows-test.ps1 diff --git a/gitlab/release/windows.ps1 b/.github/scripts/release/windows.ps1 similarity index 100% rename from gitlab/release/windows.ps1 rename to .github/scripts/release/windows.ps1 diff --git a/gitlab/release/windows_sycl-test.ps1 b/.github/scripts/release/windows_sycl-test.ps1 similarity index 100% rename from gitlab/release/windows_sycl-test.ps1 rename to .github/scripts/release/windows_sycl-test.ps1 diff --git a/gitlab/release/windows_sycl-test_run_only.ps1 b/.github/scripts/release/windows_sycl-test_run_only.ps1 similarity index 100% rename from gitlab/release/windows_sycl-test_run_only.ps1 rename to .github/scripts/release/windows_sycl-test_run_only.ps1 diff --git a/gitlab/release/windows_sycl.ps1 b/.github/scripts/release/windows_sycl.ps1 similarity index 100% rename from gitlab/release/windows_sycl.ps1 rename to .github/scripts/release/windows_sycl.ps1 diff --git a/gitlab/run_tests.bat b/.github/scripts/run_tests.bat similarity index 100% rename from gitlab/run_tests.bat rename to .github/scripts/run_tests.bat diff --git a/.github/workflows/external.ci.linux.yml b/.github/workflows/external.ci.linux.yml index 3203489b..a036e857 100644 --- a/.github/workflows/external.ci.linux.yml +++ b/.github/workflows/external.ci.linux.yml @@ -33,7 +33,7 @@ jobs: submodules: true - name: Build OpenVKL - run: gitlab/build.sh + run: .github/scripts/build.sh - name: Upload Artifact uses: actions/upload-artifact@v4 @@ -88,7 +88,7 @@ jobs: submodules: true - name: Build OpenVKL - run: gitlab/build.sh -G Ninja -D BUILD_GLFW=OFF + run: .github/scripts/build.sh -G Ninja -D BUILD_GLFW=OFF - name: Upload Artifact uses: actions/upload-artifact@v4 diff --git a/.github/workflows/internal.benchmark.yml b/.github/workflows/internal.benchmark.yml index fcb033a5..42c52ecc 100644 --- a/.github/workflows/internal.benchmark.yml +++ b/.github/workflows/internal.benchmark.yml @@ -30,7 +30,7 @@ jobs: export CXX=icpx export CXXFLAGS="-fPIC -fp-model=precise" export LDFLAGS="-static-intel" - gitlab/build.sh + .github/scripts/build.sh benchmark-x8280-1: needs: build-rocky8-icx @@ -87,7 +87,7 @@ jobs: env-from-files: .github/deps/dpcpp-sycl-nightly.env cmd: | module load cmake/3.25.3 - gitlab/build.sh -D BUILD_OPENVDB=OFF \ + .github/scripts/build.sh -D BUILD_OPENVDB=OFF \ -D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_ENABLE_DEVICE_GPU=ON \ -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF \ -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=ON" diff --git a/.github/workflows/internal.ci.linux.gpu.icx.yml b/.github/workflows/internal.ci.linux.gpu.icx.yml index 7699f42c..4394f7a7 100644 --- a/.github/workflows/internal.ci.linux.gpu.icx.yml +++ b/.github/workflows/internal.ci.linux.gpu.icx.yml @@ -24,7 +24,7 @@ jobs: env-from-files: .github/deps/dpcpp-linux-icx.env cmd: | module load cmake/3.25.3 - gitlab/build.sh -D BUILD_OPENVDB=OFF \ + .github/scripts/build.sh -D BUILD_OPENVDB=OFF \ -D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_ENABLE_DEVICE_GPU=ON \ -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF \ -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=ON" @@ -38,7 +38,7 @@ jobs: env-from-files: .github/deps/dpcpp-linux-icx.env cmd: | module load cmake/3.25.3 - gitlab/build.sh -D BUILD_OPENVDB=OFF \ + .github/scripts/build.sh -D BUILD_OPENVDB=OFF \ -D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_ENABLE_DEVICE_GPU=ON \ -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF \ -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=ON \ @@ -53,7 +53,7 @@ jobs: env-from-files: .github/deps/dpcpp-linux-icx.env cmd: | module load cmake/3.25.3 - gitlab/build.sh -D BUILD_OPENVDB=OFF \ + .github/scripts/build.sh -D BUILD_OPENVDB=OFF \ -D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_ENABLE_DEVICE_GPU=ON \ -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF \ -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=ON \ @@ -72,7 +72,7 @@ jobs: cmd: | module load cmake/3.25.3 export PATH=`pwd`/build/install/bin:`pwd`/build/install:$PATH - gitlab/build-from-install.sh + .github/scripts/build-from-install.sh test-pvc: secrets: inherit diff --git a/.github/workflows/internal.ci.linux.gpu.yml b/.github/workflows/internal.ci.linux.gpu.yml index d216cc9f..3ffd7a27 100644 --- a/.github/workflows/internal.ci.linux.gpu.yml +++ b/.github/workflows/internal.ci.linux.gpu.yml @@ -24,7 +24,7 @@ jobs: env-from-files: .github/deps/dpcpp-sycl-nightly.env cmd: | module load cmake/3.25.3 - gitlab/build.sh -D BUILD_OPENVDB=OFF \ + .github/scripts/build.sh -D BUILD_OPENVDB=OFF \ -D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_ENABLE_DEVICE_GPU=ON \ -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF \ -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=ON" @@ -38,7 +38,7 @@ jobs: env-from-files: .github/deps/dpcpp-sycl-nightly.env cmd: | module load cmake/3.25.3 - gitlab/build.sh -D BUILD_OPENVDB=OFF \ + .github/scripts/build.sh -D BUILD_OPENVDB=OFF \ -D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_ENABLE_DEVICE_GPU=ON \ -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF \ -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=ON \ @@ -53,7 +53,7 @@ jobs: env-from-files: .github/deps/dpcpp-sycl-nightly.env cmd: | module load cmake/3.25.3 - gitlab/build.sh -D BUILD_OPENVDB=OFF \ + .github/scripts/build.sh -D BUILD_OPENVDB=OFF \ -D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_ENABLE_DEVICE_GPU=ON \ -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF \ -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=ON \ @@ -72,7 +72,7 @@ jobs: cmd: | module load cmake/3.25.3 export PATH=`pwd`/build/install/bin:`pwd`/build/install:$PATH - gitlab/build-from-install.sh + .github/scripts/build-from-install.sh test-pvc: secrets: inherit diff --git a/.github/workflows/internal.ci.linux.single_volume.yml b/.github/workflows/internal.ci.linux.single_volume.yml index c4844e39..fe12ee24 100644 --- a/.github/workflows/internal.ci.linux.single_volume.yml +++ b/.github/workflows/internal.ci.linux.single_volume.yml @@ -23,7 +23,7 @@ jobs: artifact-out: build-amr artifact-path: ./build/install ./build/openvkl/build cmd: | - gitlab/build.sh -D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_DEVICE_CPU_AMR=ON -DOPENVKL_DEVICE_CPU_PARTICLE=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_SPHERICAL=OFF -DOPENVKL_DEVICE_CPU_UNSTRUCTURED=OFF -DOPENVKL_DEVICE_CPU_VDB=OFF" + .github/scripts/build.sh -D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_DEVICE_CPU_AMR=ON -DOPENVKL_DEVICE_CPU_PARTICLE=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_SPHERICAL=OFF -DOPENVKL_DEVICE_CPU_UNSTRUCTURED=OFF -DOPENVKL_DEVICE_CPU_VDB=OFF" build-particle: secrets: inherit @@ -35,7 +35,7 @@ jobs: artifact-out: build-particle artifact-path: ./build/install ./build/openvkl/build cmd: | - gitlab/build.sh -D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_DEVICE_CPU_AMR=OFF -DOPENVKL_DEVICE_CPU_PARTICLE=ON -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_SPHERICAL=OFF -DOPENVKL_DEVICE_CPU_UNSTRUCTURED=OFF -DOPENVKL_DEVICE_CPU_VDB=OFF" + .github/scripts/build.sh -D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_DEVICE_CPU_AMR=OFF -DOPENVKL_DEVICE_CPU_PARTICLE=ON -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_SPHERICAL=OFF -DOPENVKL_DEVICE_CPU_UNSTRUCTURED=OFF -DOPENVKL_DEVICE_CPU_VDB=OFF" build-structuredRegular: secrets: inherit @@ -47,7 +47,7 @@ jobs: artifact-out: build-structuredRegular artifact-path: ./build/install ./build/openvkl/build cmd: | - gitlab/build.sh -D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_DEVICE_CPU_AMR=OFF -DOPENVKL_DEVICE_CPU_PARTICLE=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=ON -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_SPHERICAL=OFF -DOPENVKL_DEVICE_CPU_UNSTRUCTURED=OFF -DOPENVKL_DEVICE_CPU_VDB=OFF" + .github/scripts/build.sh -D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_DEVICE_CPU_AMR=OFF -DOPENVKL_DEVICE_CPU_PARTICLE=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=ON -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_SPHERICAL=OFF -DOPENVKL_DEVICE_CPU_UNSTRUCTURED=OFF -DOPENVKL_DEVICE_CPU_VDB=OFF" build-structuredRegularLegacy: secrets: inherit @@ -59,7 +59,7 @@ jobs: artifact-out: build-structuredRegularLegacy artifact-path: ./build/install ./build/openvkl/build cmd: | - gitlab/build.sh -D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_DEVICE_CPU_AMR=OFF -DOPENVKL_DEVICE_CPU_PARTICLE=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=ON -DOPENVKL_DEVICE_CPU_STRUCTURED_SPHERICAL=OFF -DOPENVKL_DEVICE_CPU_UNSTRUCTURED=OFF -DOPENVKL_DEVICE_CPU_VDB=OFF" + .github/scripts/build.sh -D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_DEVICE_CPU_AMR=OFF -DOPENVKL_DEVICE_CPU_PARTICLE=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=ON -DOPENVKL_DEVICE_CPU_STRUCTURED_SPHERICAL=OFF -DOPENVKL_DEVICE_CPU_UNSTRUCTURED=OFF -DOPENVKL_DEVICE_CPU_VDB=OFF" build-structuredSpherical: secrets: inherit @@ -71,7 +71,7 @@ jobs: artifact-out: build-structuredSpherical artifact-path: ./build/install ./build/openvkl/build cmd: | - gitlab/build.sh -D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_DEVICE_CPU_AMR=OFF -DOPENVKL_DEVICE_CPU_PARTICLE=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_SPHERICAL=ON -DOPENVKL_DEVICE_CPU_UNSTRUCTURED=OFF -DOPENVKL_DEVICE_CPU_VDB=OFF" + .github/scripts/build.sh -D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_DEVICE_CPU_AMR=OFF -DOPENVKL_DEVICE_CPU_PARTICLE=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_SPHERICAL=ON -DOPENVKL_DEVICE_CPU_UNSTRUCTURED=OFF -DOPENVKL_DEVICE_CPU_VDB=OFF" build-unstructured: secrets: inherit @@ -83,7 +83,7 @@ jobs: artifact-out: build-unstructured artifact-path: ./build/install ./build/openvkl/build cmd: | - gitlab/build.sh -D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_DEVICE_CPU_AMR=OFF -DOPENVKL_DEVICE_CPU_PARTICLE=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_SPHERICAL=OFF -DOPENVKL_DEVICE_CPU_UNSTRUCTURED=ON -DOPENVKL_DEVICE_CPU_VDB=OFF" + .github/scripts/build.sh -D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_DEVICE_CPU_AMR=OFF -DOPENVKL_DEVICE_CPU_PARTICLE=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_SPHERICAL=OFF -DOPENVKL_DEVICE_CPU_UNSTRUCTURED=ON -DOPENVKL_DEVICE_CPU_VDB=OFF" build-vdb: secrets: inherit @@ -95,7 +95,7 @@ jobs: artifact-out: build-vdb artifact-path: ./build/install ./build/openvkl/build cmd: | - gitlab/build.sh -D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_DEVICE_CPU_AMR=OFF -DOPENVKL_DEVICE_CPU_PARTICLE=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_SPHERICAL=OFF -DOPENVKL_DEVICE_CPU_UNSTRUCTURED=OFF -DOPENVKL_DEVICE_CPU_VDB=ON" + .github/scripts/build.sh -D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_DEVICE_CPU_AMR=OFF -DOPENVKL_DEVICE_CPU_PARTICLE=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_REGULAR_LEGACY=OFF -DOPENVKL_DEVICE_CPU_STRUCTURED_SPHERICAL=OFF -DOPENVKL_DEVICE_CPU_UNSTRUCTURED=OFF -DOPENVKL_DEVICE_CPU_VDB=ON" # test jobs - per volume type diff --git a/.github/workflows/internal.ci.linux.yml b/.github/workflows/internal.ci.linux.yml index abbf6973..6d6cc78a 100644 --- a/.github/workflows/internal.ci.linux.yml +++ b/.github/workflows/internal.ci.linux.yml @@ -23,7 +23,7 @@ jobs: artifact-out: build-rocky8 artifact-path: ./build/install ./build/openvkl/build cmd: | - gitlab/build.sh + .github/scripts/build.sh test-rocky8: needs: build-rocky8 @@ -54,7 +54,7 @@ jobs: export CXX=icpx export CXXFLAGS="-fPIC -fp-model=precise" export LDFLAGS="-static-intel" - gitlab/build.sh + .github/scripts/build.sh test-rocky8-icx: needs: build-rocky8-icx @@ -85,7 +85,7 @@ jobs: export CXX=icpx export CXXFLAGS="-fPIC -fp-model=precise" export LDFLAGS="-static-intel" - gitlab/build.sh -D TBB_VERSION=2020.3 -D TBB_HASH="" + .github/scripts/build.sh -D TBB_VERSION=2020.3 -D TBB_HASH="" test-rocky8-icx-tbb2020: needs: build-rocky8-icx-tbb2020 @@ -116,7 +116,7 @@ jobs: export CXX=icpx export CXXFLAGS="-fPIC -fp-model=precise" export LDFLAGS="-static-intel" - gitlab/build.sh -D TBB_VERSION=2020.3 -D TBB_HASH="" -D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_ISA_AVX512SKX_8_WIDE=ON -DOPENVKL_ISA_AVX512SKX=OFF" + .github/scripts/build.sh -D TBB_VERSION=2020.3 -D TBB_HASH="" -D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_ISA_AVX512SKX_8_WIDE=ON -DOPENVKL_ISA_AVX512SKX=OFF" test-rocky8-icx-tbb2020-avx512_8: needs: build-rocky8-icx-tbb2020-avx512_8 @@ -141,7 +141,7 @@ jobs: artifact-out: build-rocky9 artifact-path: ./build/install ./build/openvkl/build cmd: | - gitlab/build.sh + .github/scripts/build.sh test-rocky9: needs: build-rocky9 @@ -168,7 +168,7 @@ jobs: artifact-path: ./build/install ./build/openvkl/build cmd: | module load cmake - gitlab/build.sh -D TBB_VERSION=2020.3 -D TBB_HASH="" + .github/scripts/build.sh -D TBB_VERSION=2020.3 -D TBB_HASH="" test-rocky9-module-cmake: needs: build-rocky9-module-cmake @@ -193,7 +193,7 @@ jobs: artifact-out: build-ubuntu20_04 artifact-path: ./build/install ./build/openvkl/build cmd: | - gitlab/build.sh -G Ninja -D BUILD_GLFW=OFF + .github/scripts/build.sh -G Ninja -D BUILD_GLFW=OFF build-ubuntu22_04: secrets: inherit @@ -205,7 +205,7 @@ jobs: artifact-out: build-ubuntu22_04 artifact-path: ./build/install ./build/openvkl/build cmd: | - gitlab/build.sh -G Ninja -D BUILD_GLFW=OFF + .github/scripts/build.sh -G Ninja -D BUILD_GLFW=OFF build-ubuntu24_04: secrets: inherit @@ -217,7 +217,7 @@ jobs: artifact-out: build-ubuntu24_04 artifact-path: ./build/install ./build/openvkl/build cmd: | - gitlab/build.sh -G Ninja -D BUILD_GLFW=OFF + .github/scripts/build.sh -G Ninja -D BUILD_GLFW=OFF test-ubuntu20_04: needs: build-ubuntu20_04 @@ -271,7 +271,7 @@ jobs: artifact-out: build-arch artifact-path: ./build/install ./build/openvkl/build cmd: | - gitlab/build.sh + .github/scripts/build.sh test-arch: needs: build-arch @@ -298,7 +298,7 @@ jobs: cmd: | export CC=clang export CXX=clang++ - gitlab/build.sh + .github/scripts/build.sh test-arch-clang: needs: build-arch-clang @@ -328,7 +328,7 @@ jobs: export CFLAGS=-fsanitize=address export CXXFLAGS=-fsanitize=address export LDFLAGS=-fsanitize=address - gitlab/build.sh -D BUILD_OPENVDB=OFF + .github/scripts/build.sh -D BUILD_OPENVDB=OFF test-arch-address-sanitizer: needs: build-arch-address-sanitizer @@ -353,7 +353,7 @@ jobs: artifact-out: build-arch-debug artifact-path: ./build/install ./build/openvkl/build cmd: | - gitlab/build.sh -D CMAKE_BUILD_TYPE=Debug + .github/scripts/build.sh -D CMAKE_BUILD_TYPE=Debug test-arch-debug: needs: build-arch-debug @@ -378,7 +378,7 @@ jobs: artifact-out: build-arch-devel-rkdeps artifact-path: ./build/install ./build/openvkl/build cmd: | - gitlab/build.sh -D RKCOMMON_VERSION=devel -D RKCOMMON_HASH="" -D EMBREE_VERSION=devel -D EMBREE_HASH="" + .github/scripts/build.sh -D RKCOMMON_VERSION=devel -D RKCOMMON_HASH="" -D EMBREE_VERSION=devel -D EMBREE_HASH="" test-arch-devel-rkdeps: needs: build-arch-devel-rkdeps @@ -403,7 +403,7 @@ jobs: artifact-out: build-linux-arch artifact-path: ./build/install ./build/openvkl/build cmd: | - gitlab/build.sh -G Ninja + .github/scripts/build.sh -G Ninja test-linux-arch: needs: build-linux-arch @@ -427,7 +427,7 @@ jobs: artifact-in: build-rocky8 image: rockylinux:8 cmd: | - gitlab/build-from-install.sh + .github/scripts/build-from-install.sh static-analysis: secrets: inherit diff --git a/.github/workflows/internal.ci.mac.yml b/.github/workflows/internal.ci.mac.yml index 70ab9bf2..af3fd08d 100644 --- a/.github/workflows/internal.ci.mac.yml +++ b/.github/workflows/internal.ci.mac.yml @@ -23,7 +23,7 @@ jobs: artifact-out: build-macOS artifact-path: ./build/install ./build/openvkl/build cmd: | - gitlab/build.sh + .github/scripts/build.sh test-macOS: needs: build-macOS @@ -48,7 +48,7 @@ jobs: artifact-out: build-macOS-TBB2020 artifact-path: ./build/install ./build/openvkl/build cmd: | - gitlab/build.sh -D TBB_VERSION=2020.3 -D TBB_HASH="" + .github/scripts/build.sh -D TBB_VERSION=2020.3 -D TBB_HASH="" test-macOS-TBB2020: needs: build-macOS-TBB2020 @@ -73,7 +73,7 @@ jobs: artifact-out: build-macOS-arm-neon artifact-path: ./build/install ./build/openvkl/build cmd: | - gitlab/build.sh -DBUILD_TBB_FROM_SOURCE=ON -D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_ISA_NEON=ON -DOPENVKL_ISA_NEON2X=OFF" + .github/scripts/build.sh -DBUILD_TBB_FROM_SOURCE=ON -D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_ISA_NEON=ON -DOPENVKL_ISA_NEON2X=OFF" test-macOS-arm-neon: @@ -100,7 +100,7 @@ jobs: artifact-out: build-macOS-arm-neon2x artifact-path: ./build/install ./build/openvkl/build cmd: | - gitlab/build.sh -DBUILD_TBB_FROM_SOURCE=ON -D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_ISA_NEON=OFF -DOPENVKL_ISA_NEON2X=ON" + .github/scripts/build.sh -DBUILD_TBB_FROM_SOURCE=ON -D OPENVKL_EXTRA_OPTIONS="-DOPENVKL_ISA_NEON=OFF -DOPENVKL_ISA_NEON2X=ON" test-macOS-arm-neon2x: diff --git a/.github/workflows/internal.ci.windows.yml b/.github/workflows/internal.ci.windows.yml index dd291df5..abdcfa97 100644 --- a/.github/workflows/internal.ci.windows.yml +++ b/.github/workflows/internal.ci.windows.yml @@ -22,7 +22,7 @@ jobs: runs-on: '[ "Windows", "build" ]' artifact-out: build-windows-msvc15 artifact-path: ./build/install - cmd: gitlab\build.bat "Visual Studio 15 2017 Win64" "v141" "Release" + cmd: .github\scripts\build.bat "Visual Studio 15 2017 Win64" "v141" "Release" build-windows-msvc15-TBB2020: secrets: inherit @@ -33,7 +33,7 @@ jobs: runs-on: '[ "Windows", "build" ]' artifact-out: build-windows-msvc15-TBB2020 artifact-path: ./build/install - cmd: gitlab\build.bat "Visual Studio 15 2017 Win64" "v141" "Release" '"-DTBB_VERSION=2020.3"' '"-DTBB_HASH="""' + cmd: .github\scripts\build.bat "Visual Studio 15 2017 Win64" "v141" "Release" '"-DTBB_VERSION=2020.3"' '"-DTBB_HASH="""' test-windows-msvc15: needs: build-windows-msvc15 @@ -43,7 +43,7 @@ jobs: runs-on: '[ "Windows", "build" ]' artifact-in: build-windows-msvc15 cmd: | - gitlab\run_tests.bat + .github\scripts\run_tests.bat test-windows-msvc15-TBB2020: needs: build-windows-msvc15-TBB2020 @@ -53,4 +53,4 @@ jobs: runs-on: '[ "Windows", "build" ]' artifact-in: build-windows-msvc15-TBB2020 cmd: | - gitlab\run_tests.bat \ No newline at end of file + .github\scripts\run_tests.bat \ No newline at end of file diff --git a/.github/workflows/internal.nightly.windows.yml b/.github/workflows/internal.nightly.windows.yml index f964853e..8c9232a9 100644 --- a/.github/workflows/internal.nightly.windows.yml +++ b/.github/workflows/internal.nightly.windows.yml @@ -23,7 +23,7 @@ jobs: runs-on: '[ "Windows", "build" ]' artifact-out: build-windows-msvc15-debug artifact-path: ./build/install - cmd: gitlab\build.bat "Visual Studio 15 2017 Win64" "v141" "Debug" + cmd: .github\scripts\build.bat "Visual Studio 15 2017 Win64" "v141" "Debug" test-windows-msvc15-debug: needs: build-windows-msvc15-debug @@ -33,4 +33,4 @@ jobs: runs-on: '[ "Windows", "build" ]' artifact-in: build-windows-msvc15-debug cmd: | - gitlab\run_tests.bat \ No newline at end of file + .github\scripts\run_tests.bat \ No newline at end of file diff --git a/.github/workflows/internal.release.yml b/.github/workflows/internal.release.yml index bb4168f2..8c90a4ae 100644 --- a/.github/workflows/internal.release.yml +++ b/.github/workflows/internal.release.yml @@ -56,7 +56,7 @@ jobs: export CXX=icpx export CXXFLAGS="-fPIC -fp-model=precise" export LDFLAGS="-static-intel" - gitlab/release/linux.sh + .github/scripts/release/linux.sh linux_sycl: secrets: inherit @@ -73,7 +73,7 @@ jobs: module load cmake/3.25.3 export CC=clang export CXX=clang++ - gitlab/release/linux_sycl.sh + .github/scripts/release/linux_sycl.sh windows: secrets: inherit @@ -87,7 +87,7 @@ jobs: cmd: | $env:OPENVKL_RELEASE_PACKAGE_VERSION="2.0.1" $OPENVKL_RELEASE_PACKAGE_VERSION="2.0.1" - gitlab/release/windows.ps1 "Visual Studio 15 2017 Win64" "v141" + .github/scripts/release/windows.ps1 "Visual Studio 15 2017 Win64" "v141" windows_sycl: secrets: inherit @@ -106,7 +106,7 @@ jobs: $env:OPENVKL_RELEASE_PACKAGE_VERSION="2.0.1" $OPENVKL_RELEASE_PACKAGE_VERSION="2.0.1" - gitlab/release/windows_sycl.ps1 + .github/scripts/release/windows_sycl.ps1 macos: secrets: inherit @@ -119,7 +119,7 @@ jobs: artifact-path: ./*.zip cmd: | export OPENVKL_RELEASE_PACKAGE_VERSION="2.0.1" - gitlab/release/macos.sh + .github/scripts/release/macos.sh linux-test: needs: linux @@ -131,7 +131,7 @@ jobs: artifact-in: linux cmd: | export OPENVKL_RELEASE_PACKAGE_VERSION="2.0.1" - gitlab/release/linux-test.sh + .github/scripts/release/linux-test.sh linux_sycl-test: needs: linux_sycl @@ -146,7 +146,7 @@ jobs: cmd: | export OPENVKL_RELEASE_PACKAGE_VERSION="2.0.1" module load cmake/3.25.3 - gitlab/release/linux_sycl-test.sh + .github/scripts/release/linux_sycl-test.sh linux_sycl-test_run_only: needs: linux_sycl @@ -161,7 +161,7 @@ jobs: cmd: | export OPENVKL_RELEASE_PACKAGE_VERSION="2.0.1" module load cmake/3.25.3 - gitlab/release/linux_sycl-test_run_only.sh + .github/scripts/release/linux_sycl-test_run_only.sh windows-test: needs: windows @@ -173,7 +173,7 @@ jobs: cmd: | $env:OPENVKL_RELEASE_PACKAGE_VERSION="2.0.1" $OPENVKL_RELEASE_PACKAGE_VERSION="2.0.1" - gitlab/release/windows-test.ps1 "Visual Studio 15 2017 Win64" "v141" + .github/scripts/release/windows-test.ps1 "Visual Studio 15 2017 Win64" "v141" windows_sycl-test: needs: windows_sycl @@ -188,7 +188,7 @@ jobs: cmd: | $env:OPENVKL_RELEASE_PACKAGE_VERSION="2.0.1" $OPENVKL_RELEASE_PACKAGE_VERSION="2.0.1" - gitlab/release/windows_sycl-test.ps1 + .github/scripts/release/windows_sycl-test.ps1 windows_sycl-test_run_only: needs: windows_sycl @@ -203,7 +203,7 @@ jobs: cmd: | $env:OPENVKL_RELEASE_PACKAGE_VERSION="2.0.1" $OPENVKL_RELEASE_PACKAGE_VERSION="2.0.1" - gitlab/release/windows_sycl-test_run_only.ps1 + .github/scripts/release/windows_sycl-test_run_only.ps1 macos-test: needs: macos @@ -214,7 +214,7 @@ jobs: artifact-in: macos cmd: | export OPENVKL_RELEASE_PACKAGE_VERSION="2.0.1" - gitlab/release/macos-test.sh + .github/scripts/release/macos-test.sh binary-analysis: needs: diff --git a/openvkl/devices/cpu/CMakeLists.txt b/openvkl/devices/cpu/CMakeLists.txt index 62f22a21..a2b0adbd 100644 --- a/openvkl/devices/cpu/CMakeLists.txt +++ b/openvkl/devices/cpu/CMakeLists.txt @@ -8,8 +8,6 @@ include_directories_ispc( ${RKCOMMON_INCLUDE_DIRS} ) -option(VKL_BUILD_VDB_ITERATOR_SIZE_HELPER "Build helper program that computes sizeof(VdbIterator)" OFF) - # for toggling enablement of specific volume types option(OPENVKL_DEVICE_CPU_AMR "enable CPU device AMR volume type" ON) option(OPENVKL_DEVICE_CPU_PARTICLE "enable CPU device particle volume type" ON) diff --git a/superbuild/CMakeLists.txt b/superbuild/CMakeLists.txt index 540ec889..c954adf0 100644 --- a/superbuild/CMakeLists.txt +++ b/superbuild/CMakeLists.txt @@ -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.") @@ -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}") @@ -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() @@ -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() @@ -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.") @@ -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() @@ -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()