Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 20 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -253,12 +253,12 @@ jobs:
- desc: VFX2023 gcc11/C++17 py3.10 exr3.1 ocio2.2
nametag: linux-vfx2023
runner: ubuntu-latest
container: aswftesting/ci-osl:2023-clang15
container: aswf/ci-osl:2023-clang15
python_ver: "3.10"
simd: "avx2,f16c"
fmt_ver: 10.1.1
pybind11_ver: v2.10.0
setenvs: PUGIXML_VERSION=v1.13
setenvs: export PUGIXML_VERSION=v1.13
- desc: VFX2023 icc/C++17 py3.10 exr3.1 ocio2.1 qt5.15
nametag: linux-vfx2023.icc
runner: ubuntu-latest
Expand Down Expand Up @@ -294,39 +294,50 @@ jobs:
- desc: VFX2024 gcc11/C++17 py3.11 exr3.2 ocio2.3
nametag: linux-vfx2024
runner: ubuntu-latest
container: aswftesting/ci-osl:2024-clang17
container: aswf/ci-oiio:2024
python_ver: "3.11"
simd: "avx2,f16c"
fmt_ver: 10.1.1
pybind11_ver: v2.12.0
benchmark: 1
setenvs: PUGIXML_VERSION=v1.14
setenvs: export PUGIXML_VERSION=v1.14
- desc: VFX2024 clang/C++17 py3.11 exr3.2 ocio2.3
nametag: linux-vfx2024.clang
runner: ubuntu-latest
container: aswftesting/ci-osl:2024-clang17
container: aswf/ci-oiio:2024
cc_compiler: clang
cxx_compiler: clang++
python_ver: "3.11"
simd: "avx2,f16c"
fmt_ver: 10.1.1
pybind11_ver: v2.12.0
benchmark: 1
setenvs: PUGIXML_VERSION=v1.14
setenvs: export PUGIXML_VERSION=v1.14
- desc: VFX2025 gcc11/C++17 py3.11 exr3.3 ocio2.4
nametag: linux-vfx2025
runner: ubuntu-latest
container: aswftesting/ci-oiio:2025
container: aswf/ci-oiio:2025
cxx_std: 17
python_ver: "3.11"
simd: "avx2,f16c"
fmt_ver: 11.1.4
pybind11_ver: v2.13.6
benchmark: 1
setenvs: PUGIXML_VERSION=v1.15
setenvs: export PUGIXML_VERSION=v1.15
- desc: VFX2026 gcc14/C++20 py3.13 exr3.4 ocio2.4
nametag: linux-vfx2026
runner: ubuntu-latest
container: aswf/ci-oiio:2026
cxx_std: 20
python_ver: "3.13"
simd: "avx2,f16c"
pybind11_ver: v3.0.0
benchmark: 1
# setenvs: export
- desc: Sanitizers
nametag: sanitizer
runner: ubuntu-latest
container: aswf/ci-osl:2024-clang17
container: aswf/ci-oiio:2024
cc_compiler: clang
cxx_compiler: clang++
build_type: Debug
Expand Down
2 changes: 1 addition & 1 deletion src/build-scripts/build_pybind11.bash
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ set -ex

# Repo and branch/tag/commit of pybind11 to download if we don't have it yet
PYBIND11_REPO=${PYBIND11_REPO:=https://github.com/pybind/pybind11.git}
PYBIND11_VERSION=${PYBIND11_VERSION:=v2.12.0}
PYBIND11_VERSION=${PYBIND11_VERSION:=v3.0.0}

# Where to put pybind11 repo source (default to the ext area)
PYBIND11_SRC_DIR=${PYBIND11_SRC_DIR:=${PWD}/ext/pybind11}
Expand Down
2 changes: 1 addition & 1 deletion src/cmake/build_pybind11.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# pybind11 by hand!
######################################################################

set_cache (pybind11_BUILD_VERSION 2.12.0 "pybind11 version for local builds")
set_cache (pybind11_BUILD_VERSION 3.0.0 "pybind11 version for local builds")
set (pybind11_GIT_REPOSITORY "https://github.com/pybind/pybind11")
set (pybind11_GIT_TAG "v${pybind11_BUILD_VERSION}")
set_cache (pybind11_BUILD_SHARED_LIBS ${LOCAL_BUILD_SHARED_LIBS_DEFAULT}
Expand Down
Loading