.clang-format

 # Note: if you change any of the settings here, please reformat the entire
-# codebase as part of the same commit, that will prevent subsequent commits
-# from being flagged as being improperly formatted.
+# codebase as part of the same merge request, that will prevent subsequent
+# commits from being flagged as being improperly formatted.
 
 ---
-# This configuration requires clang-format 8.0 or higher.
+# This configuration requires clang-format 16 or higher.
 BasedOnStyle: Mozilla
 AlignAfterOpenBracket: DontAlign
 AlignOperands: false
@@ -14,7 +14,7 @@ BinPackArguments: true
 BinPackParameters: true
 ColumnLimit: 100
 SpaceAfterTemplateKeyword: true
-Standard: Cpp11
+Standard: c++17
 StatementMacros:
 - DefineScopedHandle
 - DefineToNumeric
@@ -162,5 +162,6 @@ StatementMacros:
 - VTKKWRCHelper_MIPSpaceLeapPopulateMulti
 - VTKKWRCHelper_MIPSpaceLeapCheckMulti
 - VTKKWRCHelper_InterpolateShading
-
+- vtkDGDispatchRange
+- vtkSetStringMacroBody
 ...

.gitattributes

@@ -7,7 +7,9 @@ newversion       crlf=input
 pre-commit       crlf=input
 
 # Custom attribute to mark sources as using our C code style.
-[attr]our-c-style  whitespace=tab-in-indent,-blank-at-eol  format.clang-format=8
+# The value 16 is used in the Utilities/Scripts/clang-format.bash script to filter
+# all source files that follow our-c-style
+[attr]our-c-style  whitespace=tab-in-indent,-blank-at-eol  format.clang-format=16
 
 *.c              our-c-style
 *.h              our-c-style

.gitignore

@@ -2,6 +2,9 @@
 .ExternalData_*
 .ExternalData/config
 
+# Do not commit baseline image files.
+**/Testing/Data/Baseline/*.png
+
 # Exclude compiled Python objects.
 *.pyc
 *.pyo
@@ -9,14 +12,3 @@ __pycache__/
 
 # Exclude macOS .DS_Store files.
 .DS_Store
-
-# Exclude some Xcode stuff.
-xcuserdata
-*.xcuserdatad
-
-# Exclude VSCode settings and configuration folder
-*.vscode*
-
-# Exclude Visual Studio stuff
-.vs*
-CMakeSettings.json

.gitlab/.gitignore

+# Exclude downloads generated by running the CI scripts locally.
+# ci/download_adios2.cmake
+/adios*
+# ci/buildcache.ps1
+/buildcache*
+# ci/download_chrome.cmake
+/chrome*
+# ci/cmake.{sh, ps1}
+/cmake*
+# ci/download_dawn.cmake
+/dawn*
+# ci/emsdk.{sh, ps1}
+/emsdk*
+# ci/download_java.cmake
+/jdk*
+# ci/download_maven.cmake
+/maven*
+# ci/ninja.{sh, ps1}
+/ninja*
+# ci/download_node.cmake
+/node*
+# ci/download_openxr.cmake
+/openxr*
+# ci/download_openxrremoting.cmake
+/openxrremoting*
+# ci/download_osmesa_windows.cmake
+/osmesa*
+# ci/download_python.cmake
+/python*
+# ci/download_qt.cmake
+/*d3dcompiler*
+/*opengl32sw*
+/*qt*
+# ci/sccache.sh
+/sccache*
+# ci/download_tbb.cmake
+/*tbb*
+# ci/download_mesa_egl.cmake
+/vtk-mesa-egl*
+# ci/download_osmesa.cmake
+/vtk-osmesa*

.gitlab/artifacts.yml

@@ -31,8 +31,6 @@
             - build/lib/
             - build/Utilities/KWIML/vtkkwiml/test/kwiml_test
             - build/Utilities/KWIML/vtkkwiml/test/kwiml_test.exe
-            - build/Utilities/KWIML/vtkkwiml/test/kwiml_test.js
-            - build/Utilities/KWIML/vtkkwiml/test/kwiml_test.wasm
 
             # Python packages go here
             - build/lib64/
@@ -73,6 +71,36 @@
             # SPDX files
             - build/**/*.spdx
 
+            # Java files
+            - build/Wrapping/Java/
+
+.cmake_wasm_build_artifacts:
+    artifacts:
+        expire_in: 1d
+        # Tests failing should still upload the artifact for further testing.
+        when: always
+        reports:
+            annotations:
+                - build/annotations.json
+        paths:
+            # Install tree
+            - build/install/
+
+            # Logs of the build
+            - compile_output.log
+
+            # Virtual environment
+            - build/ci-venv/
+
+            # Debugging logs
+            - build/Testing/Temporary/Last*.log
+            - build/cdash-build-id
+
+            # CMake logs
+            - build/CMakeFiles/CMakeError.log
+            - build/CMakeFiles/CMakeOutput.log
+            - build/CMakeFiles/rules.ninja
+
 .cmake_junit_artifacts:
     artifacts:
         expire_in: 1d
@@ -153,8 +181,8 @@
         expire_in: 1d
         when: always
         paths:
-            - build/bin/vtkWasmSceneManager.*
-            - build/bin/vtk-wasm*.tar.gz
+            - build/install/bin/vtkWasmSceneManager.*
+            - build/install/bin/vtk-*-wasm*.tar.gz
 
 .cmake_release_artifacts:
     artifacts:
@@ -167,6 +195,21 @@
             - release/
             - build/cdash-build-id
 
+.cmake_maven_artifacts:
+    artifacts:
+        expire_in: 2d
+        when: always
+        reports:
+            annotations:
+                - build/annotations.json
+        paths:
+            - build/CMakeCache.txt
+            - build/CMakeFiles/CMakeError.log
+            - build/CMakeFiles/CMakeOutput.log
+            - build/CMakeFiles/rules.ninja
+            - build/install
+            - compile_output.log
+
 .sphinx_artifacts:
     artifacts:
         expire_in: 1d

.gitlab/ci/cmake.sh

@@ -7,15 +7,22 @@ readonly mindeps_prefix="cmake-mindeps"
 readonly latest_version="3.26.3"
 readonly latest_prefix="cmake"
 
-case "$( uname -s )" in
-    Linux)
+case "$( uname -s )-$( uname -m )" in
+    Linux-x86_64)
         shatool="sha256sum"
         mindeps_sha256sum="486edd6710b5250946b4b199406ccbf8f567ef0e23cfe38f7938b8c78a2ffa5f"
         mindeps_platform="Linux-x86_64"
         latest_sha256sum="28d4d1d0db94b47d8dfd4f7dec969a3c747304f4a28ddd6fd340f553f2384dc2"
         latest_platform="linux-x86_64"
         ;;
-    Darwin)
+    Linux-aarch64)
+        shatool="sha256sum"
+        mindeps_sha256sum="UNSUPPORTED"
+        mindeps_platform="UNSUPPORTED"
+        latest_sha256sum="7a4fbe374475db1a098b632b54e3c9180973e8a791c700deabe5408ae23ea3ce"
+        latest_platform="linux-aarch64"
+        ;;
+    Darwin-*)
         shatool="shasum -a 256"
         mindeps_sha256sum="95d76c00ccb9ecb5cb51de137de00965c5e8d34b2cf71556cf8ba40577d1cff3"
         mindeps_platform="Darwin-x86_64"
@@ -23,7 +30,7 @@ case "$( uname -s )" in
         latest_platform="macos-universal"
         ;;
     *)
-        echo "Unrecognized platform $( uname -s )"
+        echo "Unrecognized platform $( uname -s )-$( uname -m )"
         exit 1
         ;;
 esac

.gitlab/ci/configure_common.cmake

@@ -2,7 +2,7 @@
 # needed).
 set(VTK_BUILD_ALL_MODULES ON CACHE BOOL "")
 
-set(VTK_BUILD_LEGACY_REMOVE ON CACHE BOOL "")
+set(VTK_LEGACY_REMOVE ON CACHE BOOL "")
 set(VTK_BUILD_TESTING WANT CACHE STRING "")
 set(VTK_BUILD_EXAMPLES ON CACHE BOOL "")
 
@@ -16,9 +16,6 @@ set(VTK_LINKER_FATAL_WARNINGS ON CACHE BOOL "")
 set(VTK_ENABLE_CATALYST ON CACHE BOOL "")
 set(VTK_WRAP_SERIALIZATION ON CACHE BOOL "")
 
-# Disable ANARI
-set(VTK_MODULE_ENABLE_VTK_RenderingAnari NO CACHE STRING "")
-
 # The install trees on CI machines need help since dependencies are not in a
 # default location.
 set(VTK_RELOCATABLE_INSTALL ON CACHE BOOL "")
@@ -37,6 +34,9 @@ set(CMAKE_INSTALL_LIBDIR "lib" CACHE STRING "")
 set(VTK_ENABLE_EXTRA_BUILD_WARNINGS ON CACHE BOOL "")
 set(VTK_ENABLE_EXTRA_BUILD_WARNINGS_EVERYTHING ON CACHE BOOL "")
 
+# Remove this after Utilities/OpenGL is deleted.
+set(VTK_MODULE_ENABLE_VTK_opengl NO CACHE STRING "")
+
 include("${CMAKE_CURRENT_LIST_DIR}/configure_options.cmake")
 
 # Default to Release builds.

.gitlab/ci/configure_el8_icc_python.cmake → .gitlab/ci/configure_el8_x86_64_icc_python.cmake

@@ -10,7 +10,7 @@ set(VTK_MODULE_ENABLE_VTK_IOMySQL NO CACHE STRING "") # mysql
 set(VTK_MODULE_ENABLE_VTK_IOODBC NO CACHE STRING "") # odbc
 set(VTK_MODULE_ENABLE_VTK_IOPDAL NO CACHE STRING "") # pdal
 set(VTK_MODULE_ENABLE_VTK_IOPostgreSQL NO CACHE STRING "") # postgresql
-set(VTK_MODULE_ENABLE_VTK_RenderingExternal NO CACHE STRING "") # glew
+set(VTK_MODULE_ENABLE_VTK_RenderingExternal NO CACHE STRING "") # glut
 set(VTK_MODULE_ENABLE_VTK_RenderingFreeTypeFontConfig NO CACHE STRING "") # fontconfig
 set(VTK_MODULE_ENABLE_VTK_RenderingOpenVR NO CACHE STRING "") # openvr
 set(VTK_MODULE_ENABLE_VTK_fides NO CACHE STRING "") # adios2

.gitlab/ci/configure_fedora39.cmake

-# Fedora 34 ships with Java 11. Setting this as our version avoids warnings
-# about not specifying a "bootstrap classpath".
-set(VTK_JAVA_SOURCE_VERSION 11 CACHE STRING "")
-set(VTK_JAVA_TARGET_VERSION 11 CACHE STRING "")
-
 # Enable SPDX generation
 set(VTK_GENERATE_SPDX ON CACHE BOOL "")
 

.gitlab/ci/configure_fedora39_cuda.cmake → .gitlab/ci/configure_fedora39_x86_64_cuda.cmake

@@ -23,7 +23,6 @@ set(VTK_MODULE_ENABLE_VTK_RenderingOpenXR NO CACHE STRING "") # OpenXR
 set(VTK_MODULE_ENABLE_VTK_RenderingRayTracing NO CACHE STRING "") # ospray
 set(VTK_MODULE_ENABLE_VTK_fides NO CACHE STRING "") # adios
 set(VTK_MODULE_ENABLE_VTK_xdmf3 NO CACHE STRING "") # boost
-set(VTK_ENABLE_CATALYST OFF CACHE BOOL "") # catalyst
 
 # These are all tested in the non-CUDA CI job instead. This focuses on the CUDA
 # bits.

.gitlab/ci/configure_fedora39_cuda_mpi_offscreen_osmesa.cmake → .gitlab/ci/configure_fedora39_x86_64_cuda_mpi_offscreen_osmesa.cmake

 # Lowest-common denominator. Pascal = 60
 set(CMAKE_CUDA_ARCHITECTURES 60 CACHE STRING "")
 
-# catalyst is not installed on cuda image
-set(VTK_ENABLE_CATALYST OFF CACHE BOOL "")
-
 # OpenXR do not support OSMesa
 set(VTK_MODULE_ENABLE_VTK_RenderingOpenXR NO CACHE STRING "")
 
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39_cuda.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39_x86_64_cuda.cmake")

.gitlab/ci/configure_fedora39_x86_64_helide_mpi_python_qt_tbb.cmake

+set(VTK_USE_EXTERNAL ON CACHE STRING "")
+
+# These libraries are not supported right now.
+set(VTK_MODULE_USE_EXTERNAL_VTK_libharu OFF CACHE BOOL "")
+set(VTK_MODULE_USE_EXTERNAL_VTK_exprtk OFF CACHE BOOL "")
+set(VTK_MODULE_USE_EXTERNAL_VTK_ioss OFF CACHE BOOL "")
+set(VTK_MODULE_USE_EXTERNAL_VTK_fmt OFF CACHE BOOL "")
+set(VTK_MODULE_USE_EXTERNAL_VTK_fast_float OFF CACHE BOOL "")
+set(VTK_MODULE_USE_EXTERNAL_VTK_verdict OFF CACHE BOOL "")
+set(VTK_MODULE_USE_EXTERNAL_VTK_token OFF CACHE BOOL "")
+
+set(CMAKE_PREFIX_PATH "/opt/anari" CACHE STRING "")
+
+include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39.cmake")