Skip to content
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

VFX CY2025 compliance #1832

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

VFX CY2025 compliance #1832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7804e58
VFX CY2025 compliance
Meakk Dec 23, 2024
4db9359
openvdb
Meakk Dec 23, 2024
70beb52
remove patch
Meakk Dec 23, 2024
2a3f018
vtk
Meakk Dec 23, 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
7 changes: 4 additions & 3 deletions .github/actions/alembic-install-dep/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,21 @@ runs:
using: "composite"
steps:

# Alembic is part of VFX reference platform (CY2025: 1.8.x)
- name: Cache Alembic
id: cache-alembic
uses: actions/cache@v4
with:
path: dependencies/alembic_install
key: alembic-v1.8.5-${{runner.os}}-${{inputs.cpu}}-4
key: alembic-v1.8.8-${{runner.os}}-${{inputs.cpu}}-0

- name: Checkout Alembic
if: steps.cache-alembic.outputs.cache-hit != 'true'
uses: actions/checkout@v4
with:
repository: alembic/alembic
path: './dependencies/alembic'
ref: 1.8.5
ref: 1.8.8

- name: Setup Alembic
if: steps.cache-alembic.outputs.cache-hit != 'true'
Expand All @@ -46,7 +47,7 @@ runs:
-DCMAKE_PREFIX_PATH:PATH=../install/
-DUSE_BINARIES=OFF
-DUSE_TESTS=OFF
${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_MACOSX_RPATH=ON' || null }}
${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0 -DCMAKE_MACOSX_RPATH=ON' || null }}
${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || null }}

- name: Build Alembic
Expand Down
6 changes: 3 additions & 3 deletions .github/actions/assimp-install-dep/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ runs:
uses: actions/cache@v4
with:
path: dependencies/assimp_install
key: assimp-v5.4.2-${{runner.os}}-${{inputs.cpu}}-0
key: assimp-v5.4.3-${{runner.os}}-${{inputs.cpu}}-0

- name: Checkout ASSIMP
if: steps.cache-assimp.outputs.cache-hit != 'true'
uses: actions/checkout@v4
with:
repository: assimp/assimp
path: './dependencies/assimp'
ref: v5.4.2
ref: v5.4.3

# Revert https://github.com/assimp/assimp/pull/5349
- name: Patch ASSIMP
Expand Down Expand Up @@ -61,7 +61,7 @@ runs:
-DBUILD_SHARED_LIBS=ON
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_INSTALL_PREFIX:PATH=../assimp_install
${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15' || null }}
${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0' || null }}
${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || null }}

- name: Build ASSIMP
Expand Down
6 changes: 3 additions & 3 deletions .github/actions/blosc-install-dep/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ runs:
uses: actions/cache@v4
with:
path: dependencies/blosc_install
key: blosc-1.21.5-${{runner.os}}-${{inputs.cpu}}-5
key: blosc-1.21.6-${{runner.os}}-${{inputs.cpu}}-0

# Dependents: openvdb vtk
- name: Checkout blosc
Expand All @@ -24,7 +24,7 @@ runs:
with:
repository: Blosc/c-blosc
path: './dependencies/blosc'
ref: v1.21.5
ref: v1.21.6

- name: Setup blosc
if: steps.cache-blosc.outputs.cache-hit != 'true'
Expand All @@ -49,7 +49,7 @@ runs:
-DCMAKE_INSTALL_PREFIX=../blosc_install
-DCMAKE_PREFIX_PATH:PATH=$(pwd)/../install/
-DPREFER_EXTERNAL_ZLIB=ON
${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15' || null }}
${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0' || null }}
${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || null }}

- name: Build blosc
Expand Down
8 changes: 4 additions & 4 deletions .github/actions/boost-install-dep/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ runs:
using: "composite"
steps:

# Boost is part of VFX reference platform (CY2025: 1.85)
- name: Cache Boost
id: cache-boost
uses: actions/cache@v4
with:
path: dependencies/boost_install
key: boost-1.83.0-${{runner.os}}-${{inputs.cpu}}-4
key: boost-1.85.0-${{runner.os}}-${{inputs.cpu}}-0

# Dependents: usd openvdb vtk
# Note: usd v23.05 not compatible with boost 1.84.0
# Dependents: openvdb vtk
- name: Checkout Boost
if: steps.cache-boost.outputs.cache-hit != 'true'
uses: actions/checkout@v4
Expand All @@ -27,7 +27,7 @@ runs:
submodules: true
fetch-depth: 0
path: './dependencies/boost'
ref: boost-1.83.0
ref: boost-1.85.0

- name: Setup Boost
if: steps.cache-boost.outputs.cache-hit != 'true'
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/draco-install-dep/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ runs:
uses: actions/cache@v4
with:
path: dependencies/draco_install
key: draco-1.5.7-${{runner.os}}-${{inputs.cpu}}-2
key: draco-1.5.7-${{runner.os}}-${{inputs.cpu}}-3

- name: Checkout Draco
if: steps.cache-draco.outputs.cache-hit != 'true'
Expand Down Expand Up @@ -45,7 +45,7 @@ runs:
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-DDRACO_BACKWARDS_COMPATIBILITY=OFF
-DDRACO_JS_GLUE=OFF
${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15' || null }}
${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0' || null }}
${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || null }}
- name: Build Draco
Expand Down
5 changes: 3 additions & 2 deletions .github/actions/generic-ci/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,12 @@ runs:
with:
cpu: ${{inputs.cpu}}

# Python is part of VFX reference platform (CY2025: 3.11)
- name: Set up Python
if: inputs.optional_deps_label == 'optional-deps'
uses: actions/setup-python@v5
with:
python-version: '3.x'
python-version: '3.11'

- name: Install Python dependencies
if: inputs.optional_deps_label == 'optional-deps'
Expand Down Expand Up @@ -178,7 +179,7 @@ runs:
-DF3D_TESTING_FORCE_RENDERING_BACKEND=${{ inputs.rendering_backend }}
-DF3D_WINDOWS_GUI=ON
${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || null }}
${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15' || null }}
${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0' || null }}

- name: Build
shell: bash
Expand Down
6 changes: 3 additions & 3 deletions .github/actions/imath-install-dep/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ runs:
uses: actions/cache@v4
with:
path: dependencies/imath_install
key: imath-v3.1.11-${{runner.os}}-${{inputs.cpu}}-1
key: imath-v3.1.12-${{runner.os}}-${{inputs.cpu}}-0

# Dependents: alembic
- name: Checkout Imath
Expand All @@ -24,7 +24,7 @@ runs:
with:
repository: AcademySoftwareFoundation/Imath
path: './dependencies/imath'
ref: v3.1.11
ref: v3.1.12

- name: Setup Imath
if: steps.cache-imath.outputs.cache-hit != 'true'
Expand All @@ -44,7 +44,7 @@ runs:
-DBUILD_TESTING=OFF
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_INSTALL_PREFIX:PATH=../imath_install
${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15' || null }}
${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0' || null }}
${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || null }}

- name: Build Imath
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/occt-install-dep/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ runs:
uses: actions/cache@v4
with:
path: dependencies/occt_install
key: occt-V7_8_1-${{runner.os}}-${{inputs.cpu}}-2
key: occt-V7_8_1-${{runner.os}}-${{inputs.cpu}}-3

- name: Checkout OCCT
if: steps.cache-occt.outputs.cache-hit != 'true'
Expand Down Expand Up @@ -65,7 +65,7 @@ runs:
-DCMAKE_INSTALL_NAME_DIR:PATH=${{github.workspace}}/dependencies/install/lib
-DINSTALL_DIR_BIN:PATH=bin
-DUSE_FREETYPE=OFF
${{ runner.os == 'macOS' && '-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15' || null }}
${{ runner.os == 'macOS' && '-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -DCMAKE_OSX_DEPLOYMENT_TARGET=12.0' || null }}
${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || null }}

- name: Build OCCT
Expand Down
7 changes: 4 additions & 3 deletions .github/actions/openexr-install-dep/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ runs:
using: "composite"
steps:

# OpenEXR is part of VFX reference platform (CY2025: 3.3.x)
- name: Cache OpenEXR
id: cache-openexr
uses: actions/cache@v4
with:
path: dependencies/openexr_install
key: openexr-v3.2.4-${{runner.os}}-${{inputs.cpu}}-1
key: openexr-v3.3.2-${{runner.os}}-${{inputs.cpu}}-0

# Dependents: usd
- name: Checkout OpenEXR
Expand All @@ -24,7 +25,7 @@ runs:
with:
repository: AcademySoftwareFoundation/openexr
path: './dependencies/openexr'
ref: v3.2.4
ref: v3.3.2

- name: Setup OpenEXR
if: steps.cache-openexr.outputs.cache-hit != 'true'
Expand All @@ -46,7 +47,7 @@ runs:
-DCMAKE_PREFIX_PATH:PATH=../install/
-DOPENEXR_INSTALL_TOOLS=OFF
-DOPENEXR_INSTALL_EXAMPLES=OFF
${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_MACOSX_RPATH=ON' || null }}
${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0 -DCMAKE_MACOSX_RPATH=ON' || null }}
${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || null }}

- name: Build OpenEXR
Expand Down
15 changes: 5 additions & 10 deletions .github/actions/openvdb-install-dep/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ runs:
using: "composite"
steps:

# OpenVDB is part of VFX reference platform (CY2025: 12.x)
- name: Cache OpenVDB
id: cache-openvdb
uses: actions/cache@v4
with:
path: dependencies/openvdb_install
key: openvdb-11.0.0-${{runner.os}}-${{inputs.cpu}}-8
key: openvdb-12.0.0-${{runner.os}}-${{inputs.cpu}}-0

# Dependents: vtk
- name: Checkout OpenVDB
Expand All @@ -24,14 +25,7 @@ runs:
with:
repository: AcademySoftwareFoundation/openvdb
path: './dependencies/openvdb'
ref: v11.0.0

# https://github.com/AcademySoftwareFoundation/openvdb/pull/1860
- name: Patch OpenVDB
if: steps.cache-openvdb.outputs.cache-hit != 'true'
working-directory: ${{github.workspace}}/dependencies/openvdb
shell: bash
run: patch -p1 < $GITHUB_ACTION_PATH/openvdb-cmake-CMP0167.patch
ref: v12.0.0

- name: Setup OpenVDB
if: steps.cache-openvdb.outputs.cache-hit != 'true'
Expand All @@ -56,11 +50,12 @@ runs:
-DOPENVDB_BUILD_BINARIES=OFF
-DOPENVDB_BUILD_VDB_PRINT:BOOL=OFF
-DOPENVDB_CORE_STATIC=OFF
-DOPENVDB_USE_DELAYED_LOADING=OFF
-DUSE_BLOSC:BOOL=ON
-DUSE_CCACHE:BOOL=OFF
-DUSE_EXPLICIT_INSTANTIATION:BOOL=OFF
-DUSE_ZLIB:BOOL=ON
${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15' || null }}
${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0' || null }}
${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || null }}

- name: Build OpenVDB
Expand Down
15 changes: 0 additions & 15 deletions .github/actions/openvdb-install-dep/openvdb-cmake-CMP0167.patch
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions .github/actions/ospray-sb-install-dep/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ runs:
uses: actions/cache@v4
with:
path: dependencies/ospray_install
key: ospray-sb-v2.7.1-${{runner.os}}-${{inputs.cpu}}-2
key: ospray-sb-v2.7.1-${{runner.os}}-${{inputs.cpu}}-3

# Dependents: vtk
- name: Checkout ospray
Expand Down Expand Up @@ -63,7 +63,7 @@ runs:
-DDOWNLOAD_TBB=OFF
-DINSTALL_DEPENDENCIES=ON
-DINSTALL_IN_SEPARATE_DIRECTORIES=OFF
${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15' || null }}
${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0' || null }}
${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || null }}

- name: Build ospray
Expand Down
6 changes: 3 additions & 3 deletions .github/actions/pybind11-install-dep/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ runs:
uses: actions/cache@v4
with:
path: dependencies/pybind11_install
key: pybind11-v2.12.0-${{runner.os}}-0
key: pybind11-v2.13.6-${{runner.os}}-0

# v2.13 doesn't support python36 which is needed in common-superbuild for now
- name: Checkout pybind11
Expand All @@ -19,7 +19,7 @@ runs:
repository: pybind/pybind11
submodules: true
path: './dependencies/pybind11'
ref: v2.12.0
ref: v2.13.6

- name: Setup pybind11
if: steps.cache-pybind11.outputs.cache-hit != 'true'
Expand All @@ -37,7 +37,7 @@ runs:
cmake ../pybind11
-DCMAKE_INSTALL_PREFIX:PATH=../pybind11_install
-DPYBIND11_TEST=OFF
${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15' || null }}
${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0' || null }}
${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || null }}

- name: Install pybind11
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/tbb-install-dep/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ runs:
uses: actions/cache@v4
with:
path: dependencies/tbb_install
key: tbb-v2021.12.0-${{runner.os}}-${{inputs.cpu}}-1
key: tbb-v2021.12.0-${{runner.os}}-${{inputs.cpu}}-2

# Dependents: usd openvdb vtk
# v2021.13.0 somehow cause memory issue in draco and alembic
Expand Down Expand Up @@ -47,7 +47,7 @@ runs:
-DTBB_STRICT=OFF
-DTBB_TEST=OFF
-DTBB4PY_BUILD=OFF
${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_MACOSX_RPATH=ON' || null }}
${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0 -DCMAKE_MACOSX_RPATH=ON' || null }}
${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || null }}

- name: Build TBB
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/vtk-install-dep/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ runs:
uses: actions/cache@v4
with:
path: dependencies/vtk_install
key: vtk-${{env.VTK_SHA_OR_TAG}}-${{runner.os}}-${{inputs.raytracing_label}}-${{inputs.cpu}}-5
key: vtk-${{env.VTK_SHA_OR_TAG}}-${{runner.os}}-${{inputs.raytracing_label}}-${{inputs.cpu}}-6

- name: Setup VTK
if: steps.cache-vtk.outputs.cache-hit != 'true'
Expand Down Expand Up @@ -123,7 +123,7 @@ runs:
-DVTK_OPENGL_HAS_EGL=${{ inputs.vtk_version != 'v9.2.6' && inputs.vtk_version != 'v9.3.1' && 'ON' || 'OFF' }}
-DVTK_SMP_IMPLEMENTATION_TYPE=TBB
-DVTK_VERSIONED_INSTALL=OFF
${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15' || null }}
${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0' || null }}
${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || null }}

- name: Build VTK
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/zlib-install-dep/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ runs:
uses: actions/cache@v4
with:
path: dependencies/zlib_install
key: zlib-1.3.1-${{runner.os}}-${{inputs.cpu}}-3
key: zlib-1.3.1-${{runner.os}}-${{inputs.cpu}}-4

# Dependents: blosc openvdb vtk
- name: Checkout zlib
Expand Down Expand Up @@ -43,7 +43,7 @@ runs:
-DBUILD_SHARED_LIBS=ON
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_INSTALL_PREFIX=../zlib_install
${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15' || null }}
${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0' || null }}
${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || null }}

- name: Build zlib
Expand Down
Loading