Skip to content

Fixes for icx 2025; Cleanup #31

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

Open
wants to merge 6 commits into
base: devel
Choose a base branch
from
+92 −94
Open

Fixes for icx 2025; Cleanup #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5a3dcc7
ci: change scripts location
kraszkow Jun 10, 2024
bc3b327
Cleanup
johguenther Nov 5, 2024
6d4c539
Fix compilation with icx 2025
johguenther Nov 28, 2024
bf0a6d7
Revert "Fix compilation with icx 2025"
johguenther Nov 28, 2024
431fa13
Update dependencies
johguenther Nov 28, 2024
d2d31e4
revert
johguenther Nov 28, 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
4 changes: 2 additions & 2 deletions .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/deps/dpcpp-linux-icx.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
DPCPP_VERSION=intel/2024.1.0
DPCPP_VERSION=intel/2024.2
2 changes: 1 addition & 1 deletion .github/deps/dpcpp-windows-icx.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
DPCPP_VERSION=oneAPI/compiler/2024.1
DPCPP_VERSION=intel/2024.2
2 changes: 1 addition & 1 deletion .github/deps/gfx-windows-public.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
GFX_DRIVER_VERSION=windows-101.5445
GFX_DRIVER_VERSION=windows-101.6130
0 gitlab/build-from-install.sh → .github/scripts/build-from-install.sh
View file
Open in desktop
File renamed without changes.
0 gitlab/build.bat → .github/scripts/build.bat
View file
Open in desktop
File renamed without changes.
0 gitlab/build.sh → .github/scripts/build.sh
View file
Open in desktop
File renamed without changes.
0 gitlab/release/linux-test.sh → .github/scripts/release/linux-test.sh
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion gitlab/release/linux.sh → .github/scripts/release/linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
0 gitlab/release/linux_sycl-test.sh → .github/scripts/release/linux_sycl-test.sh
View file
Open in desktop
File renamed without changes.
0 gitlab/release/linux_sycl-test_run_only.sh → ...ripts/release/linux_sycl-test_run_only.sh
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion gitlab/release/linux_sycl.sh → .github/scripts/release/linux_sycl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
0 gitlab/release/macos-test.sh → .github/scripts/release/macos-test.sh
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion gitlab/release/macos.sh → .github/scripts/release/macos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
0 gitlab/release/sign.sh → .github/scripts/release/sign.sh
View file
Open in desktop
File renamed without changes.
0 gitlab/release/windows-test.ps1 → .github/scripts/release/windows-test.ps1
View file
Open in desktop
File renamed without changes.
0 gitlab/release/windows.ps1 → .github/scripts/release/windows.ps1
View file
Open in desktop
File renamed without changes.
0 gitlab/release/windows_sycl-test.ps1 → ...hub/scripts/release/windows_sycl-test.ps1
View file
Open in desktop
File renamed without changes.
0 ...ab/release/windows_sycl-test_run_only.ps1 → ...ts/release/windows_sycl-test_run_only.ps1
View file
Open in desktop
File renamed without changes.
0 gitlab/release/windows_sycl.ps1 → .github/scripts/release/windows_sycl.ps1
View file
Open in desktop
File renamed without changes.
0 gitlab/run_tests.bat → .github/scripts/run_tests.bat
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions .github/workflows/external.ci.linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/internal.benchmark.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/internal.ci.linux.gpu.icx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 \
Expand All @@ -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 \
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/internal.ci.linux.gpu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 \
Expand All @@ -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 \
Expand All @@ -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
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/internal.ci.linux.single_volume.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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

Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/internal.ci.linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
Loading