Skip to content

Commit f5cfcc2

Browse files
lgritzlgritz
authored
ci: Add VFX Platform 2024 to CI (#1854)
Signed-off-by: Larry Gritz <[email protected]>
1 parent 2c7fbf3 commit f5cfcc2

File tree

4 files changed

+116
-1
lines changed

4 files changed

+116
-1
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,18 @@ jobs:
138138
skip_tests: 1
139139
setenvs: export OSL_CMAKE_FLAGS="-DOSL_USE_OPTIX=1" OPTIX_VERSION=7.0
140140
OPENIMAGEIO_CMAKE_FLAGS=-DBUILD_FMT_VERSION=9.1.0
141+
- desc: gcc11/C++17 llvm17 py3.11 boost1.82 oiio-rel avx2
142+
nametag: linux-vfx2024
143+
runner: ubuntu-latest
144+
container: aswftesting/ci-osl:2024-clang17
145+
vfxyear: 2024
146+
cxx_std: 17
147+
openimageio_ver: release
148+
python_ver: "3.11"
149+
pybind11_ver: v2.11.1
150+
simd: avx2,f16c
151+
batched: b8_AVX2
152+
# setenvs: export CONAN_PACKAGES="ptex/2.4.2@aswf/vfx2024"
141153
- desc: oldest everything gcc9/C++17 llvm9 py3.7 oiio2.3 no-simd
142154
nametag: linux-oldest
143155
runner: ubuntu-latest
@@ -355,7 +367,7 @@ jobs:
355367
fmt_ver: 10.1.0
356368
openexr_ver: v3.2.1
357369
openimageio_ver: master
358-
pybind11_ver: v2.10.0
370+
pybind11_ver: v2.11.1
359371
python_ver: "3.10"
360372
simd: avx2,f16c
361373
batched: b8_AVX2,b8_AVX512,b16_AVX512

‎src/build-scripts/gh-installdeps.bash‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,19 @@ if [[ "$ASWF_ORG" != "" ]] ; then
4747
popd
4848
fi
4949

50+
if [[ "${CONAN_PACKAGES}" != "" ]] ; then
51+
export PATH=$PWD/conan/bin:$PATH
52+
export LD_LIBRARY_PATH=$PWD/conan/lib:$LD_LIBRARY_PATH
53+
mkdir -p conan
54+
pushd conan
55+
for pkg in ${CONAN_PACKAGES} ; do
56+
echo "Installing $pkg via Conan..."
57+
time conan install $pkg
58+
done
59+
popd
60+
ls -R conan
61+
fi
62+
5063
if [[ "$CXX" == "icpc" || "$CC" == "icc" || "$USE_ICC" != "" ]] ; then
5164
# Lock down icc to 2022.1 because newer versions hosted on the Intel
5265
# repo require a glibc too new for the ASWF CentOS7-based containers

‎testsuite/geomath/ref/out-alt2.txt‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
Compiled test.osl -> test.oso
2+
hypot (3, 4) = 5
3+
hypot (3, 4, 5) = 7.07107
4+
reflect (0.447214 -0.894427 0, 0 1 0) = 0.447214 0.894427 0
5+
reflect (0.447214 -0.894427 0, -1 0 0) = -0.447214 -0.894427 0
6+
faceforward (0 0 1, 0 -0.707107 -0.707107) = 0 0 1
7+
faceforward (0 0 1, 0 -0.707107 -0.707107, 0 0 -1) = 0 0 -1
8+
testing total-internal reflection:
9+
refract (0.707107 -0.707107 0, 0 1 0, 1.42) = 0 0 0
10+
frensel: Kr= 1 Kt = 0 R = 0.707107 0.707107 0 T = 0 0 0
11+
testing regular refraction:
12+
refract (-0.436436 -0.218218 -0.872872, 0.267261 0.534522 0.801784, 0.862069) = -0.415346 -0.266336 -0.869801
13+
--> verify refract(): 1/1.16 = sin(18.0571)/sin(21.0731) => 0.862069 ?= 0.862068
14+
fresnel: Kr= 0.00557254 Kt = 0.739022 R = 0.0623479 0.77935 0.623479 T = -0.415346 -0.266336 -0.869801
15+
--> verify fresnel(): 1/1.16 = sin(18.0571)/sin(21.0731) => 0.862069 ?= 0.862068
16+
Varying:
17+
hypot (0, 0) = 0
18+
hypot (0, 0, 0) = 0
19+
reflect (0 -1 0, 0 1 0) = 0 1 0
20+
refract (0.408248 -0.408248 -0.816497, 0 0 1, 0.75188) = 0.306954 -0.306954 -0.900866
21+
--> verify refract(): 1/1.33 = sin(25.73)/sin(35.2637) => 0.75188 ?= 0.75188
22+
fresnel() -> Kr= 0.0222824 Kt = 0.552726 R = 0.408248 -0.408248 0.816497 T = 0.306954 -0.306954 -0.900866
23+
--> verify fresnel(): 1/1.33 = sin(25.73)/sin(35.2637) => 0.75188 ?= 0.75188
24+
hypot (3, 4) = 5
25+
hypot (3, 4, 5) = 7.07107
26+
reflect (0.447214 -0.894427 0, 0 1 0) = 0.447214 0.894427 0
27+
reflect (0.447214 -0.894427 0, -1 0 0) = -0.447214 -0.894427 0
28+
faceforward (0 0 1, 0 -0.707107 -0.707107) = 0 0 1
29+
faceforward (0 0 1, 0 -0.707107 -0.707107, 0 0 -1) = 0 0 -1
30+
testing total-internal reflection:
31+
refract (0.707107 -0.707107 0, 0 1 0, 1.42) = 0 0 0
32+
frensel: Kr= 1 Kt = 0 R = 0.707107 0.707107 0 T = 0 0 0
33+
testing regular refraction:
34+
refract (-0.436436 -0.218218 -0.872872, 0.267261 0.534522 0.801784, 0.862069) = -0.415346 -0.266336 -0.869801
35+
--> verify refract(): 1/1.16 = sin(18.0571)/sin(21.0731) => 0.862069 ?= 0.862068
36+
fresnel: Kr= 0.00557254 Kt = 0.739022 R = 0.0623479 0.77935 0.623479 T = -0.415346 -0.266336 -0.869801
37+
--> verify fresnel(): 1/1.16 = sin(18.0571)/sin(21.0731) => 0.862069 ?= 0.862068
38+
Varying:
39+
hypot (1, 0) = 1
40+
hypot (1, 0, 1) = 1.41421
41+
reflect (0.447214 -0.894427 0, 0 1 0) = 0.447214 0.894427 0
42+
refract (0.801784 -0.267261 -0.534522, 0 0 1, 0.75188) = 0.602845 -0.200948 -0.772138
43+
--> verify refract(): 1/1.33 = sin(39.4519)/sin(57.6878) => 0.75188 ?= 0.75188
44+
fresnel() -> Kr= 0.0505776 Kt = 0.53673 R = 0.801784 -0.267261 0.534522 T = 0.602845 -0.200948 -0.772138
45+
--> verify fresnel(): 1/1.33 = sin(39.4519)/sin(57.6878) => 0.75188 ?= 0.75188
46+
hypot (3, 4) = 5
47+
hypot (3, 4, 5) = 7.07107
48+
reflect (0.447214 -0.894427 0, 0 1 0) = 0.447214 0.894427 0
49+
reflect (0.447214 -0.894427 0, -1 0 0) = -0.447214 -0.894427 0
50+
faceforward (0 0 1, 0 -0.707107 -0.707107) = 0 0 1
51+
faceforward (0 0 1, 0 -0.707107 -0.707107, 0 0 -1) = 0 0 -1
52+
testing total-internal reflection:
53+
refract (0.707107 -0.707107 0, 0 1 0, 1.42) = 0 0 0
54+
frensel: Kr= 1 Kt = 0 R = 0.707107 0.707107 0 T = 0 0 0
55+
testing regular refraction:
56+
refract (-0.436436 -0.218218 -0.872872, 0.267261 0.534522 0.801784, 0.862069) = -0.415346 -0.266336 -0.869801
57+
--> verify refract(): 1/1.16 = sin(18.0571)/sin(21.0731) => 0.862069 ?= 0.862068
58+
fresnel: Kr= 0.00557254 Kt = 0.739022 R = 0.0623479 0.77935 0.623479 T = -0.415346 -0.266336 -0.869801
59+
--> verify fresnel(): 1/1.16 = sin(18.0571)/sin(21.0731) => 0.862069 ?= 0.862068
60+
Varying:
61+
hypot (0, 1) = 1
62+
hypot (0, 1, 1) = 1.41421
63+
reflect (0 -1 0, 0.707107 0.707107 0) = 1 0 0
64+
refract (0.408248 0.408248 -0.816497, 0 0 1, 0.75188) = 0.306954 0.306954 -0.900866
65+
--> verify refract(): 1/1.33 = sin(25.73)/sin(35.2637) => 0.75188 ?= 0.75188
66+
fresnel() -> Kr= 0.0222824 Kt = 0.552726 R = 0.408248 0.408248 0.816497 T = 0.306954 0.306954 -0.900866
67+
--> verify fresnel(): 1/1.33 = sin(25.73)/sin(35.2637) => 0.75188 ?= 0.75188
68+
hypot (3, 4) = 5
69+
hypot (3, 4, 5) = 7.07107
70+
reflect (0.447214 -0.894427 0, 0 1 0) = 0.447214 0.894427 0
71+
reflect (0.447214 -0.894427 0, -1 0 0) = -0.447214 -0.894427 0
72+
faceforward (0 0 1, 0 -0.707107 -0.707107) = 0 0 1
73+
faceforward (0 0 1, 0 -0.707107 -0.707107, 0 0 -1) = 0 0 -1
74+
testing total-internal reflection:
75+
refract (0.707107 -0.707107 0, 0 1 0, 1.42) = 0 0 0
76+
frensel: Kr= 1 Kt = 0 R = 0.707107 0.707107 0 T = 0 0 0
77+
testing regular refraction:
78+
refract (-0.436436 -0.218218 -0.872872, 0.267261 0.534522 0.801784, 0.862069) = -0.415346 -0.266336 -0.869801
79+
--> verify refract(): 1/1.16 = sin(18.0571)/sin(21.0731) => 0.862069 ?= 0.862068
80+
fresnel: Kr= 0.00557254 Kt = 0.739022 R = 0.0623479 0.77935 0.623479 T = -0.415346 -0.266336 -0.869801
81+
--> verify fresnel(): 1/1.16 = sin(18.0571)/sin(21.0731) => 0.862069 ?= 0.862068
82+
Varying:
83+
hypot (1, 1) = 1.41421
84+
hypot (1, 1, 2) = 2.44949
85+
reflect (0.447214 -0.894427 0, 0.707107 0.707107 0) = 0.894427 -0.447214 0
86+
refract (0.801784 0.267261 -0.534522, 0 0 1, 0.75188) = 0.602845 0.200948 -0.772138
87+
--> verify refract(): 1/1.33 = sin(39.4519)/sin(57.6878) => 0.75188 ?= 0.75188
88+
fresnel() -> Kr= 0.0505776 Kt = 0.53673 R = 0.801784 0.267261 0.534522 T = 0.602845 0.200948 -0.772138
89+
--> verify fresnel(): 1/1.33 = sin(39.4519)/sin(57.6878) => 0.75188 ?= 0.75188
90+

‎testsuite/hashnoise/ref/out-alt-batch.tif‎

36.2 KB
Binary file not shown.

0 commit comments

Comments
 (0)