update dependencies and CI, fixes

.github/deps/dpcpp-sycl-nightly.env

@@ -1 +1 @@
-DPCPP_VERSION=intel-llvm/v6.2.1
+DPCPP_VERSION=intel-llvm/v7.0.0

.github/deps/gfx-windows-public.env

@@ -1,3 +1 @@
-#GFX_DRIVER_VERSION=windows-latest
-# the currently latest available v101.8509 leads to hangs on some DG2 CI machines
-GFX_DRIVER_VERSION=windows-101.8331
+GFX_DRIVER_VERSION=windows-latest

.github/scripts/build.bat

@@ -11,14 +11,13 @@ cmake --version
 
 cmake -L ^
 -G "%~1" ^
--T "%~2" ^
 -D CMAKE_INSTALL_LIBDIR=lib ^
 -D BUILD_OPENVKL_BENCHMARKS=OFF ^
 -D BUILD_OPENVKL_TESTING=ON ^
-%~4 %~5 %~6 %~7 %~8 %~9 ^
+%~3 %~4 %~5 %~6 %~7 %~8 %~9 ^
 ../superbuild
 
-cmake --build . --verbose --config "%~3" --target ALL_BUILD -- /m /nologo
+cmake --build . --verbose --config "%~2" --target ALL_BUILD -- /m /nologo
 
 :abort
 endlocal

.github/scripts/build.sh

@@ -2,7 +2,8 @@
 ## Copyright 2019 Intel Corporation
 ## SPDX-License-Identifier: Apache-2.0
 
-MACOSX_DEPLOYMENT_TARGET="10.13"
+# raise the workflow's default, TBB needs aligned new/delete
+export MACOSX_DEPLOYMENT_TARGET="10.13"
 
 mkdir build
 cd build

.github/scripts/release/linux.sh

@@ -2,6 +2,9 @@
 ## Copyright 2020 Intel Corporation
 ## SPDX-License-Identifier: Apache-2.0
 
+# abort on any error
+set -e
+
 #### Set variables for script ####
 
 ROOT_DIR=$PWD
@@ -35,6 +38,7 @@ cmake --version
 cmake \
   "$@" \
   -D BUILD_DEPENDENCIES_ONLY=ON \
+  -D BUILD_OPENVKL_BENCHMARKS=ON \
   -D CMAKE_INSTALL_PREFIX=$DEP_INSTALL_DIR \
   -D CMAKE_INSTALL_LIBDIR=lib \
   ../superbuild
@@ -45,18 +49,12 @@ cd $ROOT_DIR
 
 #### Build Open VKL ####
 
-mkdir -p $OPENVKL_BUILD_DIR
+mkdir $OPENVKL_BUILD_DIR
 cd $OPENVKL_BUILD_DIR
 
-# Setup environment variables for dependencies
-export rkcommon_DIR=$DEP_INSTALL_DIR
-export embree_DIR=$DEP_INSTALL_DIR
-export glfw3_DIR=$DEP_INSTALL_DIR
-
-export OPENVKL_EXTRA_OPENVDB_OPTIONS="-DCMAKE_NO_SYSTEM_FROM_IMPORTED=ON"
-
 # set release settings
 cmake -L \
+  -D CMAKE_PREFIX_PATH=$DEP_INSTALL_DIR \
   -D CMAKE_INSTALL_PREFIX=$OPENVKL_INSTALL_DIR \
   -D CMAKE_INSTALL_INCLUDEDIR=include \
   -D CMAKE_INSTALL_LIBDIR=lib \
@@ -65,22 +63,23 @@ cmake -L \
   -D RKCOMMON_TBB_ROOT=$DEP_INSTALL_DIR \
   -D ISPC_EXECUTABLE=$DEP_INSTALL_DIR/bin/ispc \
   -D BUILD_BENCHMARKS=ON \
-  -D OpenVDB_ROOT=$DEP_INSTALL_DIR $OPENVKL_EXTRA_OPENVDB_OPTIONS \
+  -D OpenVDB_ROOT=$DEP_INSTALL_DIR \
+  -D CMAKE_NO_SYSTEM_FROM_IMPORTED=ON \
   ..
 
-# build
-make -j $THREADS install
+# build and install
+cmake --build . --parallel $THREADS --target install
 
 # copy dependent libs into the install
 INSTALL_LIB_DIR=$OPENVKL_INSTALL_DIR/lib
 
 cp -P $DEP_INSTALL_DIR/lib/lib*.so* $INSTALL_LIB_DIR
 
+# the debug variants of TBB are not needed
+rm -f $INSTALL_LIB_DIR/*_debug.so*
+
 # tar up the results
 cd $OPENVKL_INSTALL_DIR/..
 tar -czf $OPENVKL_PKG_BASE.tar.gz $OPENVKL_PKG_BASE
 
-# sign
-$ROOT_DIR/.github/scripts/release/sign.sh $OPENVKL_PKG_BASE.tar.gz
-
 mv *.tar.gz $ROOT_DIR

.github/scripts/release/linux_sycl.sh

@@ -2,6 +2,9 @@
 ## Copyright 2023 Intel Corporation
 ## SPDX-License-Identifier: Apache-2.0
 
+# abort on any error
+set -e
+
 #### Set variables for script ####
 
 ROOT_DIR=$PWD
@@ -35,6 +38,7 @@ cmake --version
 cmake \
   "$@" \
   -D BUILD_DEPENDENCIES_ONLY=ON \
+  -D BUILD_OPENVKL_BENCHMARKS=ON \
   -D CMAKE_INSTALL_PREFIX=$DEP_INSTALL_DIR \
   -D CMAKE_INSTALL_LIBDIR=lib \
   ../superbuild
@@ -45,18 +49,12 @@ cd $ROOT_DIR
 
 #### Build Open VKL ####
 
-mkdir -p $OPENVKL_BUILD_DIR
+mkdir $OPENVKL_BUILD_DIR
 cd $OPENVKL_BUILD_DIR
 
-# Setup environment variables for dependencies
-export rkcommon_DIR=$DEP_INSTALL_DIR
-export embree_DIR=$DEP_INSTALL_DIR
-export glfw3_DIR=$DEP_INSTALL_DIR
-
-export OPENVKL_EXTRA_OPENVDB_OPTIONS="-DCMAKE_NO_SYSTEM_FROM_IMPORTED=ON"
-
 # set release settings
 cmake -L \
+  -D CMAKE_PREFIX_PATH=$DEP_INSTALL_DIR \
   -D CMAKE_INSTALL_PREFIX=$OPENVKL_INSTALL_DIR \
   -D CMAKE_INSTALL_INCLUDEDIR=include \
   -D CMAKE_INSTALL_LIBDIR=lib \
@@ -65,21 +63,21 @@ cmake -L \
   -D RKCOMMON_TBB_ROOT=$DEP_INSTALL_DIR \
   -D ISPC_EXECUTABLE=$DEP_INSTALL_DIR/bin/ispc \
   -D BUILD_BENCHMARKS=ON \
-  -D OpenVDB_ROOT=$DEP_INSTALL_DIR $OPENVKL_EXTRA_OPENVDB_OPTIONS \
+  -D OpenVDB_ROOT=$DEP_INSTALL_DIR \
+  -D CMAKE_NO_SYSTEM_FROM_IMPORTED=ON \
   -D OPENVKL_ENABLE_DEVICE_GPU=ON \
   ..
 
-# build
-make -j $THREADS install
+# build and install
+cmake --build . --parallel $THREADS --target install
 
 # copy dependent libs into the install
 INSTALL_LIB_DIR=$OPENVKL_INSTALL_DIR/lib
 
 cp -P $DEP_INSTALL_DIR/lib/lib*.so* $INSTALL_LIB_DIR
-cp -P $DEP_INSTALL_DIR/lib/lib*.a* $INSTALL_LIB_DIR
 
-# OpenVDB static library is large and not needed
-rm $INSTALL_LIB_DIR/libopenvdb*.a
+# the debug variants of TBB are not needed
+rm -f $INSTALL_LIB_DIR/*_debug.so*
 
 # copy SYCL runtime dependencies
 SYCL_BIN_FILE=`command -v clang`
@@ -89,13 +87,11 @@ SYCL_LIB_DIR="${SYCL_BIN_DIR}/../lib"
 cp ${SYCL_LIB_DIR}/libsycl.so.? $INSTALL_LIB_DIR
 cp ${SYCL_LIB_DIR}/libur_loader.so.? $INSTALL_LIB_DIR
 cp ${SYCL_LIB_DIR}/libur_adapter_level_zero.so.? $INSTALL_LIB_DIR
+cp ${SYCL_LIB_DIR}/libur_adapter_level_zero_v?.so.? $INSTALL_LIB_DIR
 cp ${SYCL_LIB_DIR}/libumf.so.? $INSTALL_LIB_DIR
 
 # tar up the results
 cd $OPENVKL_INSTALL_DIR/..
 tar -czf $OPENVKL_PKG_BASE.tar.gz $OPENVKL_PKG_BASE
 
-# sign
-$ROOT_DIR/.github/scripts/release/sign.sh $OPENVKL_PKG_BASE.tar.gz
-
 mv *.tar.gz $ROOT_DIR

.github/scripts/release/macos.sh

@@ -2,6 +2,9 @@
 ## Copyright 2020 Intel Corporation
 ## SPDX-License-Identifier: Apache-2.0
 
+# abort on any error
+set -e
+
 #### Helper functions ####
 
 umask=`umask`
@@ -22,7 +25,8 @@ OPENVKL_PKG_BASE=openvkl-${OPENVKL_RELEASE_PACKAGE_VERSION}.x86_64.macos
 OPENVKL_BUILD_DIR=$ROOT_DIR/build_release
 OPENVKL_INSTALL_DIR=$ROOT_DIR/install_release/$OPENVKL_PKG_BASE
 
-MACOSX_DEPLOYMENT_TARGET="10.13"
+# raise the workflow's default, TBB needs aligned new/delete
+export MACOSX_DEPLOYMENT_TARGET="10.13"
 
 THREADS=`sysctl -n hw.logicalcpu`
 
@@ -48,6 +52,7 @@ cmake --version
 cmake \
   "$@" \
   -D BUILD_DEPENDENCIES_ONLY=ON \
+  -D BUILD_OPENVKL_BENCHMARKS=ON \
   -D CMAKE_INSTALL_PREFIX=$DEP_INSTALL_DIR \
   -D CMAKE_INSTALL_LIBDIR=lib \
   ../superbuild
@@ -58,18 +63,12 @@ cd $ROOT_DIR
 
 #### Build Open VKL ####
 
-mkdir -p $OPENVKL_BUILD_DIR
+mkdir $OPENVKL_BUILD_DIR
 cd $OPENVKL_BUILD_DIR
 
-# Setup environment variables for dependencies
-export rkcommon_DIR=$DEP_INSTALL_DIR
-export embree_DIR=$DEP_INSTALL_DIR
-export glfw3_DIR=$DEP_INSTALL_DIR
-
-export OPENVKL_EXTRA_OPENVDB_OPTIONS="-DCMAKE_NO_SYSTEM_FROM_IMPORTED=ON"
-
 # set release settings
 cmake -L \
+  -D CMAKE_PREFIX_PATH=$DEP_INSTALL_DIR \
   -D CMAKE_INSTALL_PREFIX=$OPENVKL_INSTALL_DIR \
   -D CMAKE_INSTALL_INCLUDEDIR=include \
   -D CMAKE_INSTALL_LIBDIR=lib \
@@ -78,22 +77,26 @@ cmake -L \
   -D RKCOMMON_TBB_ROOT=$DEP_INSTALL_DIR \
   -D ISPC_EXECUTABLE=$DEP_INSTALL_DIR/bin/ispc \
   -D BUILD_BENCHMARKS=ON \
-  -D OpenVDB_ROOT=$DEP_INSTALL_DIR $OPENVKL_EXTRA_OPENVDB_OPTIONS \
+  -D OpenVDB_ROOT=$DEP_INSTALL_DIR \
+  -D CMAKE_NO_SYSTEM_FROM_IMPORTED=ON \
   ..
 
-# build
-make -j $THREADS install
+# build and install
+cmake --build . --parallel $THREADS --target install
 
 # copy dependent libs into the install
 INSTALL_LIB_DIR=$OPENVKL_INSTALL_DIR/lib
 
 cp -P $DEP_INSTALL_DIR/lib/lib*.dylib* $INSTALL_LIB_DIR
 
+# the debug variants of TBB are not needed
+rm -f $INSTALL_LIB_DIR/*_debug*.dylib
+
+# sign
+$SIGN_MACOS $OPENVKL_INSTALL_DIR
+
 # zip up the results
 cd $OPENVKL_INSTALL_DIR/..
 zip -ry $OPENVKL_PKG_BASE.zip $OPENVKL_PKG_BASE
 
-# sign
-$ROOT_DIR/.github/scripts/release/sign.sh $OPENVKL_PKG_BASE.zip
-
 mv *.zip $ROOT_DIR

.github/scripts/release/windows-test.ps1

@@ -19,7 +19,6 @@ cmake --version
 
 cmake -L `
   -G $args[0] `
-  -T $args[1] `
   ../examples/from_openvkl_install
 
 cmake --build . --config Release --target ALL_BUILD -- /m /nologo