Skip to content

Commit cd72772

Browse files
committed
Merge branch 'release-2.0.x'
2 parents 8c6ba52 + ffed167 commit cd72772

66 files changed

Lines changed: 895 additions & 669 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.clang-format

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Cpp11BracedListStyle: true
4545
DerivePointerAlignment: false
4646
DisableFormat: false
4747
ExperimentalAutoDetectBinPacking: false
48-
ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
48+
ForEachMacros: [ foreach, foreach_active, foreach_tiled, foreach_unique, cdo, cfor, cif, cwhile ]
4949
StatementMacros: [ __vkl_interop_univary,
5050
template_VdbSampler_sampleLeafZYX_constant,
5151
template_VdbSampler_sampleLeafZYX_structured,
@@ -78,7 +78,7 @@ StatementMacros: [ __vkl_interop_univary,
7878
__vkl_leaf_handler_temporalFormat,
7979
__vkl_leaf_handler ]
8080
IncludeCategories:
81-
- Regex: '^<.*\.h>'
81+
- Regex: '^<.*\.i?h>'
8282
Priority: 1
8383
- Regex: '^<.*'
8484
Priority: 2

.github/deps/dpcpp-icx.env

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/deps/dpcpp-linux-icx.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
DPCPP_VERSION=intel/2025.3
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
DPCPP_VERSION=intel-llvm/nightly-2023-10-26-rk
1+
DPCPP_VERSION=intel-llvm/v6.2.1

.github/deps/dpcpp-windows-icx.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
DPCPP_VERSION=intel/2025.3
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
GFX_DRIVER_VERSION=windows-101.5186
1+
#GFX_DRIVER_VERSION=windows-latest
2+
# the currently latest available v101.8509 leads to hangs on some DG2 CI machines
3+
GFX_DRIVER_VERSION=windows-101.8331

0 commit comments

Comments
 (0)