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

Jump to bottom

ci: Deal with OIIO renaming its master -> main #1867

Merged
merged 1 commit into from
Sep 18, 2024
Merged

ci: Deal with OIIO renaming its master -> main #1867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 13 additions & 13 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@ jobs:
pybind11_ver: v2.9.0
simd: avx2,f16c
batched: b8_AVX2
- desc: clang12/C++17 llvm12 oiio-master py3.9 avx2 batch-avx512
- desc: clang12/C++17 llvm12 oiio-main py3.9 avx2 batch-avx512
nametag: linux-clang12-llvm12-batch
runner: ubuntu-latest
container: aswftesting/ci-osl:2022-clang12
vfxyear: 2022
cxx_std: 17
openimageio_ver: master
openimageio_ver: main
python_ver: 3.9
pybind11_ver: v2.7.0
simd: avx2,f16c
Expand All @@ -85,7 +85,7 @@ jobs:
pybind11_ver: v2.9.0
simd: sse2
batched: b4_SSE2
- desc: icc/C++17 llvm14 py3.9 oiio-master avx2
- desc: icc/C++17 llvm14 py3.9 oiio-main avx2
nametag: linux-icc
runner: ubuntu-latest
container: aswftesting/ci-osl:2022-clang14
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
cxx_compiler: icpx
cxx_std: 17
fmt_ver: 7.1.3
openimageio_ver: master
openimageio_ver: main
python_ver: 3.9
pybind11_ver: v2.9.0
simd: avx2,f16c
Expand All @@ -136,13 +136,13 @@ jobs:
pybind11_ver: v2.9.0
simd: avx2,f16c
batched: b8_AVX2
- desc: GPU Cuda11 gcc11/C++17 llvm15 py3.10 OIIO-master avx2
- desc: GPU Cuda11 gcc11/C++17 llvm15 py3.10 OIIO-main avx2
nametag: linux-optix7-2023
runner: ubuntu-latest
container: aswftesting/ci-osl:2023-clang15
vfxyear: 2023
cxx_std: 17
openimageio_ver: master
openimageio_ver: main
python_ver: "3.10"
pybind11_ver: v2.10.0
simd: avx2,f16c
Expand Down Expand Up @@ -185,7 +185,7 @@ jobs:
cc_compiler: clang
cxx_compiler: clang++
cxx_std: 17
openimageio_ver: master
openimageio_ver: main
python_ver: 3.9
pybind11_ver: v2.9.0
simd: avx2,f16c
Expand Down Expand Up @@ -377,7 +377,7 @@ jobs:
cxx_std: 17
fmt_ver: 10.1.0
openexr_ver: v3.2.1
openimageio_ver: master
openimageio_ver: main
pybind11_ver: v2.11.1
python_ver: "3.10"
simd: avx2,f16c
Expand All @@ -386,14 +386,14 @@ jobs:
LLVM_DISTRO_NAME=ubuntu-22.04
OPENCOLORIO_VERSION=v2.2.0
PUGIXML_VERSION=v1.13
- desc: bleeding edge gcc12/C++17 llvm17 oiio/ocio/exr/pybind-master py3.10 avx2 batch-b16avx512
- desc: bleeding edge gcc12/C++17 llvm17 oiio/ocio/exr/pybind-main py3.10 avx2 batch-b16avx512
nametag: linux-bleeding-edge
runner: ubuntu-22.04
cxx_compiler: g++-12
cxx_std: 17
fmt_ver: master
openexr_ver: main
openimageio_ver: master
openimageio_ver: main
pybind11_ver: master
python_ver: "3.10"
simd: avx2,f16c
Expand All @@ -410,7 +410,7 @@ jobs:
cxx_std: 17
fmt_ver: 8.1.1
openexr_ver: v3.1.11
openimageio_ver: master
openimageio_ver: main
pybind11_ver: v2.9.2
python_ver: 3.8
simd: avx2,f16c
Expand Down Expand Up @@ -509,7 +509,7 @@ jobs:
cc_compiler: /usr/local/opt/llvm/bin/clang
cxx_compiler: /usr/local/opt/llvm/bin/clang++
cxx_std: 17
openimageio_ver: master
openimageio_ver: main
python_ver: "3.11"
aclang: 14
setenvs: export DO_BREW_UPDATE=1 CTEST_TEST_TIMEOUT=120
Expand All @@ -521,7 +521,7 @@ jobs:
Xcc_compiler: /usr/local/opt/llvm/bin/clang
Xcxx_compiler: /usr/local/opt/llvm/bin/clang++
cxx_std: 17
openimageio_ver: master
openimageio_ver: main
python_ver: "3.11"
aclang: 15
setenvs: export DO_BREW_UPDATE=1
Expand Down
2 changes: 1 addition & 1 deletion INSTALL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ NEW or CHANGED dependencies since the last major release are **bold**.
- Intel C++ compiler **icc version 19** or newer or LLVM-based icx compiler
version 2022 or newer.

* **[OpenImageIO](http://openimageio.org) 2.4 or newer** (tested through 2.5 and master)
* **[OpenImageIO](http://openimageio.org) 2.4 or newer** (tested through 2.5 and main)

OSL uses OIIO both for its texture mapping functionality as well as
numerous utility classes. If you are integrating OSL into an existing
Expand Down
Loading