commit: c920bc0801087518ea87d472f7a78bfa25cb04c8 Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Thu Mar 28 14:02:45 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Apr 2 11:26:50 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c920bc08
media-libs/osl: add 1.12.14.0-r1, 1.13.7.0 switch to llvm-r1 osl-1.13.7.0 has llvm-17 support Closes: https://bugs.gentoo.org/920539 Closes: https://bugs.gentoo.org/874279 Closes: https://bugs.gentoo.org/917484 Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/35965 Signed-off-by: Sam James <sam <AT> gentoo.org> media-gfx/blender/blender-3.3.15.ebuild | 2 +- media-gfx/blender/blender-3.3.6-r1.ebuild | 2 +- media-gfx/blender/blender-3.3.8.ebuild | 2 +- media-gfx/blender/blender-3.6.0.ebuild | 2 +- media-gfx/blender/blender-3.6.5.ebuild | 2 +- media-gfx/blender/blender-3.6.8.ebuild | 2 +- media-gfx/blender/blender-4.0.1-r1.ebuild | 2 +- media-gfx/blender/blender-4.0.2.ebuild | 2 +- media-gfx/blender/blender-9999.ebuild | 2 +- media-libs/osl/Manifest | 1 + media-libs/osl/metadata.xml | 5 +- media-libs/osl/osl-1.12.14.0-r1.ebuild | 384 +++++++++++++++++++++++++ media-libs/osl/osl-1.13.7.0.ebuild | 453 ++++++++++++++++++++++++++++++ media-libs/osl/osl-9999.ebuild | 443 +++++++++++++++++++++++++++++ profiles/arch/amd64/use.mask | 4 + profiles/arch/arm64/use.mask | 4 + profiles/arch/base/use.mask | 4 + 17 files changed, 1306 insertions(+), 10 deletions(-) diff --git a/media-gfx/blender/blender-3.3.15.ebuild b/media-gfx/blender/blender-3.3.15.ebuild index de6e734737f0..30eb3d17cd54 100644 --- a/media-gfx/blender/blender-3.3.15.ebuild +++ b/media-gfx/blender/blender-3.3.15.ebuild @@ -98,7 +98,7 @@ RDEPEND="${PYTHON_DEPS} dev-libs/c-blosc:= ) optix? ( <dev-libs/optix-7.5.0 ) - osl? ( >=media-libs/osl-1.11.16.0-r3:= ) + osl? ( <media-libs/osl-1.13:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) diff --git a/media-gfx/blender/blender-3.3.6-r1.ebuild b/media-gfx/blender/blender-3.3.6-r1.ebuild index e09d6c4b17ac..aa9fecc21155 100644 --- a/media-gfx/blender/blender-3.3.6-r1.ebuild +++ b/media-gfx/blender/blender-3.3.6-r1.ebuild @@ -98,7 +98,7 @@ RDEPEND="${PYTHON_DEPS} dev-libs/c-blosc:= ) optix? ( <dev-libs/optix-7.5.0 ) - osl? ( >=media-libs/osl-1.11.16.0-r3:= ) + osl? ( <media-libs/osl-1.13:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) diff --git a/media-gfx/blender/blender-3.3.8.ebuild b/media-gfx/blender/blender-3.3.8.ebuild index 1e762b11e628..c8e316c77c10 100644 --- a/media-gfx/blender/blender-3.3.8.ebuild +++ b/media-gfx/blender/blender-3.3.8.ebuild @@ -98,7 +98,7 @@ RDEPEND="${PYTHON_DEPS} dev-libs/c-blosc:= ) optix? ( <dev-libs/optix-7.5.0 ) - osl? ( >=media-libs/osl-1.11.16.0-r3:= ) + osl? ( <media-libs/osl-1.13:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) diff --git a/media-gfx/blender/blender-3.6.0.ebuild b/media-gfx/blender/blender-3.6.0.ebuild index e2f45202cf11..f9473c4b808a 100644 --- a/media-gfx/blender/blender-3.6.0.ebuild +++ b/media-gfx/blender/blender-3.6.0.ebuild @@ -95,7 +95,7 @@ RDEPEND="${PYTHON_DEPS} dev-libs/c-blosc:= ) optix? ( <dev-libs/optix-7.5.0 ) - osl? ( >=media-libs/osl-1.11.16.0-r3:= ) + osl? ( <media-libs/osl-1.13:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) diff --git a/media-gfx/blender/blender-3.6.5.ebuild b/media-gfx/blender/blender-3.6.5.ebuild index bc7d8f123206..5e22e3d048ee 100644 --- a/media-gfx/blender/blender-3.6.5.ebuild +++ b/media-gfx/blender/blender-3.6.5.ebuild @@ -93,7 +93,7 @@ RDEPEND="${PYTHON_DEPS} dev-libs/c-blosc:= ) optix? ( <dev-libs/optix-7.5.0 ) - osl? ( >=media-libs/osl-1.11.16.0-r3:= ) + osl? ( <media-libs/osl-1.13:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) diff --git a/media-gfx/blender/blender-3.6.8.ebuild b/media-gfx/blender/blender-3.6.8.ebuild index bc7d8f123206..5e22e3d048ee 100644 --- a/media-gfx/blender/blender-3.6.8.ebuild +++ b/media-gfx/blender/blender-3.6.8.ebuild @@ -93,7 +93,7 @@ RDEPEND="${PYTHON_DEPS} dev-libs/c-blosc:= ) optix? ( <dev-libs/optix-7.5.0 ) - osl? ( >=media-libs/osl-1.11.16.0-r3:= ) + osl? ( <media-libs/osl-1.13:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) diff --git a/media-gfx/blender/blender-4.0.1-r1.ebuild b/media-gfx/blender/blender-4.0.1-r1.ebuild index a6f05f4a1015..00be180d9573 100644 --- a/media-gfx/blender/blender-4.0.1-r1.ebuild +++ b/media-gfx/blender/blender-4.0.1-r1.ebuild @@ -97,7 +97,7 @@ RDEPEND="${PYTHON_DEPS} dev-libs/c-blosc:= ) optix? ( <dev-libs/optix-7.5.0 ) - osl? ( >=media-libs/osl-1.11.16.0-r3:= ) + osl? ( <media-libs/osl-1.13:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) diff --git a/media-gfx/blender/blender-4.0.2.ebuild b/media-gfx/blender/blender-4.0.2.ebuild index 28ec3c64f723..a1cc16edc1ed 100644 --- a/media-gfx/blender/blender-4.0.2.ebuild +++ b/media-gfx/blender/blender-4.0.2.ebuild @@ -95,7 +95,7 @@ RDEPEND="${PYTHON_DEPS} dev-libs/c-blosc:= ) optix? ( <dev-libs/optix-7.5.0 ) - osl? ( >=media-libs/osl-1.11.16.0-r3:= ) + osl? ( <media-libs/osl-1.13:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild index 8beccfa7ce4f..29230caa962b 100644 --- a/media-gfx/blender/blender-9999.ebuild +++ b/media-gfx/blender/blender-9999.ebuild @@ -97,7 +97,7 @@ RDEPEND="${PYTHON_DEPS} dev-libs/c-blosc:= ) optix? ( <dev-libs/optix-7.5.0 ) - osl? ( >=media-libs/osl-1.11.16.0-r3:= ) + osl? ( media-libs/osl:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest index 878645684cfb..5fb6518260ba 100644 --- a/media-libs/osl/Manifest +++ b/media-libs/osl/Manifest @@ -2,3 +2,4 @@ DIST osl-1.12.11.0.tar.gz 20287156 BLAKE2B 178db816980929cc61a0deea63f715a9f10ad DIST osl-1.12.13.0.tar.gz 20286745 BLAKE2B 75a2a5d10000ba26cd11463dde710d5be3b8b2d227de45263d8bd39fd87ca064f7c6d2b2f9cea2fdb8f29ccaa94d3ef60e2ff2e0e6d867385e2298dd10ef61b6 SHA512 d7e6ab79f77f2854cbb4fa2fbe5fc92659bb015b1bbffcee2ef86185cf20235990fa3b20308601aa298fedc85d3fcd4451b7b7ff0df7def97027efe4fb8a02bc DIST osl-1.12.14.0.tar.gz 20555853 BLAKE2B 4f6bc2084e4c1b25e707a37830961f20926e6ab5cb915c763cbd8126127e70f6368832077729ab5e044f573e8c38c4afb413eff8adccee5ea1ae96cb9be43b6e SHA512 51641e58fb0bba042853e3976c104decc788f1b1d3ec2e33a3f5504b11b05950dc38766ffb066b0f76edc4e0a8829d6b7dd408d9288b74d69380395b1d991bd5 DIST osl-1.12.7.0.tar.gz 20250356 BLAKE2B a9398243546b1bfc1e3f9602f6112a72a8e7cb6ace54e93d0e5f30d943474e82c3317596597d6a09e0f2cf04b1b21f05c31a2357e3d667d710cd2aa340f5fd63 SHA512 ec0391dfc95140fee4fa8332991cdcb0978dafc436f3e07d0293e2baa2014b8765e6b60631ae5a8bbd6e16dbcf37f04c076d7d6b2d8bfa58b78471f0d92c433f +DIST osl-1.13.7.0.tar.gz 21774349 BLAKE2B 1fd731f14b8dce948d7995efadb63eec8ce028ed6b095db391d2dfedcbbd62ca3aad9cd5d7d40f94c9e358f952d841899103467a2f81b12a605ae8c8436a16ff SHA512 15ffc6a5eed44141672af3d7ddab5d97abacad2062cddb35ef2a8484538a9a9a86cbd7e7170deafcefd3b69df764bfd207685603ca17a2fbff4299ccd1afe569 diff --git a/media-libs/osl/metadata.xml b/media-libs/osl/metadata.xml index 4e777e0e9393..4c2f57c8a0ed 100644 --- a/media-libs/osl/metadata.xml +++ b/media-libs/osl/metadata.xml @@ -15,8 +15,11 @@ lights, displacement, and pattern generation. </longdescription> <use> - <flag name="partio">Use <pkg>media-libs/partio</pkg></flag> <flag name="gui">Build the osltoy binary (with Qt5)</flag> + <flag name="libcxx">Build against <pkg>sys-libs/libcxx</pkg> when using clang</flag> + <flag name="nofma">Do not use Fuse-Multiply-Add operations</flag> + <flag name="optix">Add support for NVIDIA's OptiX Raytracing Engine</flag> + <flag name="partio">Use <pkg>media-libs/partio</pkg></flag> <flag name="qt6">Build the osltoy binary (with Qt6)</flag> </use> <upstream> diff --git a/media-libs/osl/osl-1.12.14.0-r1.ebuild b/media-libs/osl/osl-1.12.14.0-r1.ebuild new file mode 100644 index 000000000000..66765c891954 --- /dev/null +++ b/media-libs/osl/osl-1.12.14.0-r1.ebuild @@ -0,0 +1,384 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +# Check this on updates +LLVM_COMPAT=( {15..15} ) + +inherit cmake flag-o-matic llvm-r1 toolchain-funcs python-single-r1 + +DESCRIPTION="Advanced shading language for production GI renderers" +HOMEPAGE="https://www.imageworks.com/technology/opensource https://github.com/AcademySoftwareFoundation/OpenShadingLanguage"; + +if [[ ${PV} = *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage.git"; +else + # If a development release, please don't keyword! + SRC_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" +fi + +S="${WORKDIR}/OpenShadingLanguage-${PV}" + +LICENSE="BSD" +SLOT="0/$(ver_cut 1-3)" + +X86_CPU_FEATURES=( + sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 + avx:avx avx2:avx2 avx512f:avx512f f16c:f16c +) +CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" ) + +IUSE="doc gui libcxx nofma partio qt6 test ${CPU_FEATURES[*]%:*} python" +RESTRICT="!test? ( test )" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + dev-libs/boost:= + dev-libs/pugixml + >=media-libs/openexr-3:0= + >=media-libs/openimageio-2.4:= + $(llvm_gen_dep ' + sys-devel/clang:${LLVM_SLOT} + sys-devel/llvm:${LLVM_SLOT} + ') + sys-libs/zlib:= + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pybind11[${PYTHON_USEDEP}] + media-libs/openimageio[python,${PYTHON_SINGLE_USEDEP}] + ') + ) + partio? ( media-libs/partio ) + gui? ( + !qt6? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtopengl:5 + ) + qt6? ( + dev-qt/qtbase:6[gui,widgets,opengl] + ) + ) +" + +DEPEND="${RDEPEND}" +BDEPEND=" + sys-devel/bison + sys-devel/flex + virtual/pkgconfig +" + +pkg_setup() { + llvm-r1_pkg_setup + + use python && python-single-r1_pkg_setup +} + +src_prepare() { + sed -e "/^install.*llvm_macros.cmake.*cmake/d" -i CMakeLists.txt || die + + cmake_src_prepare +} + +src_configure() { + # pick the highest we support + local mysimd=() + if use cpu_flags_x86_avx512f; then + mysimd+=( avx512f ) + elif use cpu_flags_x86_avx2 ; then + mysimd+=( avx2 ) + if use cpu_flags_x86_f16c ; then + mysimd+=( f16c ) + fi + elif use cpu_flags_x86_avx ; then + mysimd+=( avx ) + elif use cpu_flags_x86_sse4_2 ; then + mysimd+=( sse4.2 ) + elif use cpu_flags_x86_sse4_1 ; then + mysimd+=( sse4.1 ) + elif use cpu_flags_x86_ssse3 ; then + mysimd+=( ssse3 ) + elif use cpu_flags_x86_sse3 ; then + mysimd+=( sse3 ) + elif use cpu_flags_x86_sse2 ; then + mysimd+=( sse2 ) + fi + + local mybatched=() + if use cpu_flags_x86_avx512f || use cpu_flags_x86_avx2 ; then + if use cpu_flags_x86_avx512f ; then + if use nofma; then + mybatched+=( + "b8_AVX512_noFMA" + "b16_AVX512_noFMA" + ) + else + mybatched+=( + "b8_AVX512" + "b16_AVX512" + ) + fi + fi + if use cpu_flags_x86_avx2 ; then + if use nofma; then + mybatched+=( + "b8_AVX2_noFMA" + ) + else + mybatched+=( + "b8_AVX2" + ) + fi + fi + elif use cpu_flags_x86_avx ; then + mybatched+=( + "b8_AVX" + ) + fi + + # If no CPU SIMDs were used, completely disable them + [[ -z "${mysimd[*]}" ]] && mysimd=("0") + [[ -z "${mybatched[*]}" ]] && mybatched=("0") + + # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully + # Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available. + use arm64 && append-flags -flax-vector-conversions + + local gcc + gcc="$(tc-getCC)" + + local mycmakeargs=( + -DCMAKE_POLICY_DEFAULT_CMP0146="OLD" # BUG FindCUDA + -DCMAKE_POLICY_DEFAULT_CMP0148="OLD" # BUG FindPythonInterp + + # std::tuple_size_v is c++17 + -DCMAKE_CXX_STANDARD="17" + + -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" + -DINSTALL_DOCS="$(usex doc)" + -DUSE_CCACHE="no" + -DLLVM_STATIC="no" + -DOSL_BUILD_TESTS="$(usex test)" + -DSTOP_ON_WARNING="no" + -DUSE_PARTIO="$(usex partio)" + -DUSE_PYTHON="$(usex python)" + -DPYTHON_VERSION="${EPYTHON/python}" + -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")" + -DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")" + -DUSE_LIBCPLUSPLUS="$(usex libcxx)" + -DUSE_OPTIX="no" + -DVEC_REPORT="yes" + + -DOpenImageIO_ROOT="${EPREFIX}/usr" + ) + + if use gui; then + mycmakeargs+=( -DUSE_QT="yes" ) + if ! use qt6; then + mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6="yes" ) + fi + else + mycmakeargs+=( -DUSE_QT="no" ) + fi + + if use partio; then + mycmakeargs+=( + -Dpartio_ROOT="${EPREFIX}/usr" + ) + fi + + cmake_src_configure +} + +src_test() { + # A bunch of tests only work when installed. + # So install them into the temp directory now. + DESTDIR="${T}" cmake_build install + + ln -s "${CMAKE_USE_DIR}/src/cmake/" "${BUILD_DIR}/src/cmake" || die + + CMAKE_SKIP_TESTS=( + "broken" + "^render" + + # outright fail + "^color$" + "^color.opt$" + "^color.batched$" + "^color.batched.opt$" + "^matrix.batched.opt$" + "^spline-reg.regress.batched.opt$" + "^transform-reg.regress.batched.opt$" + ) + + # These only fail inside sandbox + if [[ "${OSL_OPTIONAL_TESTS}" != "true" ]]; then + CMAKE_SKIP_TESTS+=( + # TODO: investigate failures + # SIGABRT similar to https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1363 + "^andor-reg.regress.batched.opt$" + "^arithmetic-reg.regress.batched.opt$" + "^array-assign-reg.regress.batched.opt$" + "^array-length-reg.regress.batched$" + "^closure.batched$" + "^closure.batched.opt$" + "^closure-parameters.batched$" + "^closure-parameters.batched.opt$" + "^debug-uninit$" + "^debug-uninit.opt$" + "^debug-uninit.batched$" + "^debug-uninit.batched.opt$" + "^derivs$" + "^derivs.opt$" + "^derivs.batched$" + "^derivs.batched.opt$" + "^filterwidth-reg.regress.batched.opt$" + "^geomath.opt$" + "^geomath.batched$" + "^geomath.batched.opt$" + "^getattribute-camera.batched$" + "^getattribute-camera.batched.opt$" + "^getattribute-shader.batched.opt$" + "^gettextureinfo.batched$" + "^gettextureinfo-reg.regress.batched.opt$" + "^hyperb.opt$" + "^hyperb.batched.opt$" + "^ieee_fp-reg.regress.batched.opt$" + "^initlist.batched$" + "^initlist.batched.opt$" + "^isconnected.batched$" + "^linearstep.batched$" + "^linearstep.batched.opt$" + "^loop.batched$" + "^loop.batched.opt$" + "^matrix$" + "^matrix.opt$" + "^matrix.batched$" + "^matrix-compref-reg.regress.batched.opt$" + "^message-no-closure.batched$" + "^message-no-closure.batched.opt$" + "^message-reg.regress.batched.opt$" + "^miscmath$" + "^miscmath.opt$" + "^miscmath.batched$" + "^miscmath.batched.opt$" + "^noise.batched$" + "^noise-cell.batched$" + "^noise-gabor.batched$" + "^noise-gabor.batched.opt$" + "^noise-gabor-reg.regress.batched.opt$" + "^noise-generic.batched$" + "^noise-generic.batched.opt$" + "^noise-perlin.batched$" + "^noise-perlin.batched.opt$" + "^noise-simplex.batched$" + "^noise-simplex.batched.opt$" + "^noise-reg.regress.batched.opt$" + "^pnoise.batched$" + "^pnoise-cell.batched$" + "^pnoise-gabor.batched$" + "^pnoise-gabor.batched.opt$" + "^pnoise-generic.batched$" + "^pnoise-generic.batched.opt$" + "^pnoise-perlin.batched$" + "^pnoise-perlin.batched.opt$" + "^pnoise-reg.regress.batched.opt$" + "^opt-warnings.batched$" + "^opt-warnings.batched.opt$" + "^regex-reg.regress.batched.opt$" + "^select.batched$" + "^select.batched.opt$" + "^shaderglobals.batched$" + "^shaderglobals.batched.opt$" + "^smoothstep-reg.regress.batched.opt$" + "^spline.batched$" + "^spline.batched.opt$" + "^splineinverse-ident.batched$" + "^splineinverse-ident.batched.opt$" + "^spline-derivbug.batched$" + "^spline-derivbug.batched.opt$" + "^split-reg.regress.batched.opt$" + "^string.batched$" + "^string.batched.opt$" + "^string-reg.regress.batched.opt$" + "^struct.batched$" + "^struct-array-mixture.batched$" + "^struct-array-mixture.batched.opt$" + "^texture-environment-opts-reg.regress.batched.opt$" + "^texture-opts-reg.regress.batched.opt$" + "^texture-wrap.batched$" + "^texture-wrap.batched.opt$" + "^transcendental-reg.regress.batched.opt$" + "^transform$" + "^transform.opt$" + "^transform.batched$" + "^transform.batched.opt$" + "^transformc$" + "^transformc.opt$" + "^transformc.batched$" + "^transformc.batched.opt$" + "^trig$" + "^trig.opt$" + "^trig.batched$" + "^trig.batched.opt$" + "^trig-reg.regress.batched.opt$" + "^vecctr.batched$" + "^vecctr.batched.opt$" + "^vector-reg.regress.batched.opt$" + "^xml-reg.regress.batched.opt$" + "^gettextureinfo-udim.batched$" + "^gettextureinfo-udim.batched.opt$" + "^gettextureinfo-udim-reg.regress.batched.opt$" + "^pointcloud.batched$" + "^pointcloud.batched.opt$" + ) + fi + + myctestargs=( + # src/build-scripts/ci-test.bash + '--force-new-ctest-process' + ) + + local -x DEBUG CXXFLAGS LD_LIBRARY_PATH DIR OSL_DIR OSL_SOURCE_DIR PYTHONPATH + DEBUG=1 # doubles the floating point tolerance + CXXFLAGS="-I${T}/usr/include" + LD_LIBRARY_PATH="${T}/usr/$(get_libdir)" + OSL_DIR="${T}/usr/$(get_libdir)/cmake/OSL" + OSL_SOURCE_DIR="${S}" + + if use python; then + PYTHONPATH="${BUILD_DIR}/lib/python/site-packages" + fi + + cmake_src_test + + CMAKE_SKIP_TESTS=( + "^render-background$" + "^render-bumptest$" + "^render-mx-furnace-sheen$" + "^render-mx-burley-diffuse$" + "^render-mx-conductor$" + "^render-mx-generalized-schlick-glass$" + "^render-microfacet$" + "^render-oren-nayar$" + "^render-veachmis$" + "^render-ward$" + "^render-raytypes.opt$" + ) + + myctestargs=( + # src/build-scripts/ci-test.bash + '--force-new-ctest-process' + --repeat until-pass:10 + -R "^render" + ) + + cmake_src_test +} diff --git a/media-libs/osl/osl-1.13.7.0.ebuild b/media-libs/osl/osl-1.13.7.0.ebuild new file mode 100644 index 000000000000..673742be896a --- /dev/null +++ b/media-libs/osl/osl-1.13.7.0.ebuild @@ -0,0 +1,453 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +# Check this on updates +LLVM_COMPAT=( {15..17} ) + +inherit cmake cuda flag-o-matic llvm-r1 toolchain-funcs python-single-r1 + +DESCRIPTION="Advanced shading language for production GI renderers" +HOMEPAGE="https://www.imageworks.com/technology/opensource https://github.com/AcademySoftwareFoundation/OpenShadingLanguage"; + +if [[ ${PV} = *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage.git"; +else + # If a development release, please don't keyword! + SRC_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" +fi + +S="${WORKDIR}/OpenShadingLanguage-${PV}" + +LICENSE="BSD" +SLOT="0/$(ver_cut 1-3)" + +X86_CPU_FEATURES=( + sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 + avx:avx avx2:avx2 avx512f:avx512f f16c:f16c +) +CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" ) + +IUSE="doc gui libcxx nofma optix partio qt6 test ${CPU_FEATURES[*]%:*} python" +RESTRICT="!test? ( test )" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# TODO optix +RDEPEND=" + dev-libs/boost:= + dev-libs/pugixml + >=media-libs/openexr-3:0= + >=media-libs/openimageio-2.4:= + $(llvm_gen_dep ' + sys-devel/clang:${LLVM_SLOT} + sys-devel/llvm:${LLVM_SLOT} + ') + sys-libs/zlib:= + optix? ( dev-libs/optix[-headers-only] ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pybind11[${PYTHON_USEDEP}] + media-libs/openimageio[python,${PYTHON_SINGLE_USEDEP}] + ') + ) + partio? ( media-libs/partio ) + gui? ( + !qt6? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtopengl:5 + ) + qt6? ( + dev-qt/qtbase:6[gui,widgets,opengl] + ) + ) +" + +DEPEND="${RDEPEND}" +BDEPEND=" + sys-devel/bison + sys-devel/flex + virtual/pkgconfig +" + +pkg_setup() { + llvm-r1_pkg_setup + + use python && python-single-r1_pkg_setup +} + +src_prepare() { + if use optix; then + cuda_src_prepare + cuda_add_sandbox -w + fi + + sed -e "/^install.*llvm_macros.cmake.*cmake/d" -i CMakeLists.txt || die + + cmake_src_prepare +} + +src_configure() { + # pick the highest we support + local mysimd=() + if use cpu_flags_x86_avx512f; then + mysimd+=( avx512f ) + elif use cpu_flags_x86_avx2 ; then + mysimd+=( avx2 ) + if use cpu_flags_x86_f16c ; then + mysimd+=( f16c ) + fi + elif use cpu_flags_x86_avx ; then + mysimd+=( avx ) + elif use cpu_flags_x86_sse4_2 ; then + mysimd+=( sse4.2 ) + elif use cpu_flags_x86_sse4_1 ; then + mysimd+=( sse4.1 ) + elif use cpu_flags_x86_ssse3 ; then + mysimd+=( ssse3 ) + elif use cpu_flags_x86_sse3 ; then + mysimd+=( sse3 ) + elif use cpu_flags_x86_sse2 ; then + mysimd+=( sse2 ) + fi + + local mybatched=() + if use cpu_flags_x86_avx512f || use cpu_flags_x86_avx2 ; then + if use cpu_flags_x86_avx512f ; then + if use nofma; then + mybatched+=( + "b8_AVX512_noFMA" + "b16_AVX512_noFMA" + ) + else + mybatched+=( + "b8_AVX512" + "b16_AVX512" + ) + fi + fi + if use cpu_flags_x86_avx2 ; then + if use nofma; then + mybatched+=( + "b8_AVX2_noFMA" + ) + else + mybatched+=( + "b8_AVX2" + ) + fi + fi + elif use cpu_flags_x86_avx ; then + mybatched+=( + "b8_AVX" + ) + fi + + # If no CPU SIMDs were used, completely disable them + [[ -z "${mysimd[*]}" ]] && mysimd=("0") + [[ -z "${mybatched[*]}" ]] && mybatched=("0") + + # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully + # Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available. + use arm64 && append-flags -flax-vector-conversions + + local gcc + gcc="$(tc-getCC)" + + local mycmakeargs=( + -DCMAKE_POLICY_DEFAULT_CMP0146="OLD" # BUG FindCUDA + -DCMAKE_POLICY_DEFAULT_CMP0148="OLD" # BUG FindPythonInterp + + # std::tuple_size_v is c++17 + -DCMAKE_CXX_STANDARD="17" + + -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" + -DINSTALL_DOCS="$(usex doc)" + -DUSE_CCACHE="no" + -DLLVM_STATIC="no" + -DOSL_BUILD_TESTS="$(usex test)" + -DSTOP_ON_WARNING="no" + -DUSE_PARTIO="$(usex partio)" + -DUSE_PYTHON="$(usex python)" + -DPYTHON_VERSION="${EPYTHON/python}" + -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")" + -DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")" + -DUSE_LIBCPLUSPLUS="$(usex libcxx)" + -DOSL_USE_OPTIX="$(usex optix)" + -DVEC_REPORT="yes" + + -DOpenImageIO_ROOT="${EPREFIX}/usr" + ) + + if use gui; then + mycmakeargs+=( -DUSE_QT="yes" ) + if ! use qt6; then + mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6="yes" ) + fi + else + mycmakeargs+=( -DUSE_QT="no" ) + fi + + if use optix; then + mycmakeargs+=( + -DOptiX_FIND_QUIETLY="no" + -DCUDA_FIND_QUIETLY="no" + + -DOPTIXHOME="${EPREFIX}/opt/optix" + -DCUDA_TOOLKIT_ROOT_DIR="${EPREFIX}/opt/cuda" + + -DCUDA_NVCC_FLAGS="--compiler-bindir;$(cuda_gccdir)" + -DOSL_EXTRA_NVCC_ARGS="--compiler-bindir;$(cuda_gccdir)" + -DCUDA_VERBOSE_BUILD="yes" + ) + fi + + if use partio; then + mycmakeargs+=( + -Dpartio_DIR="${EPREFIX}/usr" + ) + fi + + cmake_src_configure +} + +src_test() { + # A bunch of tests only work when installed. + # So install them into the temp directory now. + DESTDIR="${T}" cmake_build install + + ln -s "${CMAKE_USE_DIR}/src/cmake/" "${BUILD_DIR}/src/cmake" || die + + if use optix; then + cp \ + "${BUILD_DIR}/src/liboslexec/shadeops_cuda.ptx" \ + "${BUILD_DIR}/src/testrender/"{optix_raytracer,quad,rend_lib_testrender,sphere,wrapper}".ptx" \ + "${BUILD_DIR}/src/testshade/"{optix_grid_renderer,rend_lib_testshade}".ptx" \ + "${BUILD_DIR}/bin/" || die + + # NOTE this should go to cuda eclass + addwrite /dev/nvidiactl + addwrite /dev/nvidia0 + addwrite /dev/nvidia-uvm + addwrite /dev/nvidia-caps + addwrite "/dev/char/" + fi + + CMAKE_SKIP_TESTS=( + "broken" + "^render" + + # broken with in-tree <=dev-libs/optix-7.5.0 and out of date + "^example-cuda$" + + # outright fail + "^transform-reg.regress.batched.opt$" + + # SIGABRT similar to https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1363 + "^derivs.opt.rs_bitcode$" + "^geomath.batched$" + "^matrix.batched$" + "^matrix.batched.opt$" + "^spline-reg.regress.batched.opt$" + "^transformc.batched$" + ) + + # These only fail inside sandbox + if [[ "${OSL_OPTIONAL_TESTS}" != "true" ]]; then + CMAKE_SKIP_TESTS+=( + # TODO: investigate failures + # SIGABRT similar to https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1363 + "^andor-reg.regress.batched.opt$" + "^arithmetic-reg.regress.batched.opt$" + "^array-assign-reg.regress.batched.opt$" + "^array-copy-reg.regress.batched.opt$" + "^array-length-reg.regress.batched$" + "^bug-outputinit.optix$" + "^bug-outputinit.optix.fused$" + "^bug-outputinit.optix.opt$" + "^bug-return.optix$" + "^bug-return.optix.fused$" + "^bug-return.optix.opt$" + "^closure-parameters.batched$" + "^closure-parameters.batched.opt$" + "^closure.batched$" + "^closure.batched.opt$" + "^debug-uninit$" + "^debug-uninit.batched$" + "^debug-uninit.batched.opt$" + "^debug-uninit.opt$" + "^debug-uninit.opt.rs_bitcode$" + "^derivs$" + "^derivs.batched$" + "^derivs.batched.opt$" + "^derivs.opt$" + "^exponential$" + "^exponential.opt$" + "^exponential.opt.rs_bitcode$" + "^filterwidth-reg.regress.batched.opt$" + "^geomath$" + "^geomath.batched.opt$" + "^geomath.opt$" + "^geomath.opt.rs_bitcode$" + "^getattribute-camera.batched$" + "^getattribute-camera.batched.opt$" + "^getattribute-shader.batched.opt$" + "^gettextureinfo-reg.regress.batched.opt$" + "^gettextureinfo-udim-reg.regress.batched.opt$" + "^gettextureinfo.batched$" + "^hyperb.batched.opt$" + "^hyperb.opt$" + "^hyperb.opt.rs_bitcode$" + "^initlist.batched$" + "^initlist.batched.opt$" + "^linearstep.batched$" + "^linearstep.batched.opt$" + "^loop.batched$" + "^loop.batched.opt$" + "^matrix$" + "^matrix-compref-reg.regress.batched.opt$" + "^matrix-reg.regress.rsbitcode.opt$" + "^matrix.opt$" + "^matrix.opt.rs_bitcode$" + "^matrix.rsbitcode.opt$" + "^message-no-closure.batched$" + "^message-no-closure.batched.opt$" + "^message-reg.regress.batched.opt$" + "^miscmath$" + "^miscmath.batched$" + "^miscmath.batched.opt$" + "^miscmath.opt$" + "^miscmath.opt.rs_bitcode$" + "^noise-cell.batched$" + "^noise-gabor-reg.regress.batched.opt$" + "^noise-gabor.batched$" + "^noise-gabor.batched.opt$" + "^noise-generic.batched$" + "^noise-generic.batched.opt$" + "^noise-perlin.batched$" + "^noise-perlin.batched.opt$" + "^noise-reg.regress.batched.opt$" + "^noise-simplex.batched$" + "^noise-simplex.batched.opt$" + "^noise.batched$" + "^opt-warnings.batched$" + "^opt-warnings.batched.opt$" + "^pnoise-cell.batched$" + "^pnoise-gabor.batched$" + "^pnoise-gabor.batched.opt$" + "^pnoise-generic.batched$" + "^pnoise-generic.batched.opt$" + "^pnoise-perlin.batched$" + "^pnoise-perlin.batched.opt$" + "^pnoise-reg.regress.batched.opt$" + "^pnoise.batched$" + "^pointcloud.batched$" + "^pointcloud.batched.opt$" + "^regex-reg.regress.batched.opt$" + "^select.batched$" + "^select.batched.opt$" + "^shaderglobals.batched$" + "^shaderglobals.batched.opt$" + "^smoothstep-reg.regress.batched.opt$" + "^spline-derivbug.batched$" + "^spline-derivbug.batched.opt$" + "^spline.batched$" + "^spline.batched.opt$" + "^splineinverse-ident.batched$" + "^splineinverse-ident.batched.opt$" + "^split-reg.regress.batched.opt$" + "^string$" + "^string-reg.regress.batched.opt$" + "^string.batched$" + "^string.batched.opt$" + "^string.opt$" + "^string.opt.rs_bitcode$" + "^struct-array-mixture.batched$" + "^struct-array-mixture.batched.opt$" + "^struct.batched$" + "^test-fmt-matrixcolor.opt.rs_bitcode$" + "^testoptix-noise.optix.opt$" + "^testoptix-reparam.optix.opt$" + "^texture-environment-opts-reg.regress.batched.opt$" + "^texture-opts-reg.regress.batched.opt$" + "^texture-wrap.batched$" + "^texture-wrap.batched.opt$" + "^transcendental-reg.regress.batched.opt$" + "^transform$" + "^transform.batched$" + "^transform.batched.opt$" + "^transform.opt$" + "^transform.opt.rs_bitcode$" + "^transformc$" + "^transformc.batched.opt$" + "^transformc.opt$" + "^transformc.opt.rs_bitcode$" + "^transformc.rsbitcode.opt$" + "^trig$" + "^trig-reg.regress.batched.opt$" + "^trig.batched$" + "^trig.batched.opt$" + "^trig.opt$" + "^trig.opt.rs_bitcode$" + "^vecctr.batched$" + "^vecctr.batched.opt$" + "^vector$" + "^vector-reg.regress.batched.opt$" + "^vector.opt$" + "^vector.opt.rs_bitcode$" + "^wavelength_color.optix$" + "^wavelength_color.optix.fused$" + "^wavelength_color.optix.opt$" + "^xml-reg.regress.batched.opt$" + + # diff + "^testoptix.optix.opt$" + ) + fi + + myctestargs=( + # src/build-scripts/ci-test.bash + '--force-new-ctest-process' + ) + + local -x DEBUG CXXFLAGS LD_LIBRARY_PATH DIR OSL_DIR OSL_SOURCE_DIR PYTHONPATH + DEBUG=1 # doubles the floating point tolerance + CXXFLAGS="-I${T}/usr/include" + LD_LIBRARY_PATH="${T}/usr/$(get_libdir)" + OSL_DIR="${T}/usr/$(get_libdir)/cmake/OSL" + OSL_SOURCE_DIR="${S}" + + if use python; then + PYTHONPATH="${BUILD_DIR}/lib/python/site-packages" + fi + + cmake_src_test + + CMAKE_SKIP_TESTS=( + "^render-background$" + "^render-mx-furnace-sheen$" + "^render-mx-burley-diffuse$" + "^render-mx-conductor$" + "^render-microfacet$" + "^render-veachmis$" + "^render-ward$" + "^render-raytypes.opt$" + "^render-raytypes.opt.rs_bitcode$" + ) + + myctestargs=( + # src/build-scripts/ci-test.bash + '--force-new-ctest-process' + --repeat until-pass:10 + -R "^render" + ) + + cmake_src_test +} diff --git a/media-libs/osl/osl-9999.ebuild b/media-libs/osl/osl-9999.ebuild new file mode 100644 index 000000000000..9ae3ddb5a40d --- /dev/null +++ b/media-libs/osl/osl-9999.ebuild @@ -0,0 +1,443 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +# Check this on updates +LLVM_COMPAT=( {15..17} ) + +inherit cmake cuda flag-o-matic llvm-r1 toolchain-funcs python-single-r1 + +DESCRIPTION="Advanced shading language for production GI renderers" +HOMEPAGE="https://www.imageworks.com/technology/opensource https://github.com/AcademySoftwareFoundation/OpenShadingLanguage"; + +if [[ ${PV} = *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage.git"; +else + # If a development release, please don't keyword! + SRC_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" +fi + +S="${WORKDIR}/OpenShadingLanguage-${PV}" + +LICENSE="BSD" +SLOT="0/$(ver_cut 1-3)" + +X86_CPU_FEATURES=( + sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 + avx:avx avx2:avx2 avx512f:avx512f f16c:f16c +) +CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" ) + +IUSE="doc gui libcxx nofma optix partio qt6 test ${CPU_FEATURES[*]%:*} python" +RESTRICT="!test? ( test )" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# TODO optix +RDEPEND=" + dev-libs/boost:= + dev-libs/pugixml + >=media-libs/openexr-3:0= + >=media-libs/openimageio-2.4:= + $(llvm_gen_dep ' + sys-devel/clang:${LLVM_SLOT} + sys-devel/llvm:${LLVM_SLOT} + ') + sys-libs/zlib:= + optix? ( dev-libs/optix[-headers-only] ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pybind11[${PYTHON_USEDEP}] + media-libs/openimageio[python,${PYTHON_SINGLE_USEDEP}] + ') + ) + partio? ( media-libs/partio ) + gui? ( + !qt6? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtopengl:5 + ) + qt6? ( + dev-qt/qtbase:6[gui,widgets,opengl] + ) + ) +" + +DEPEND="${RDEPEND}" +BDEPEND=" + sys-devel/bison + sys-devel/flex + virtual/pkgconfig +" + +pkg_setup() { + llvm-r1_pkg_setup + + use python && python-single-r1_pkg_setup +} + +src_prepare() { + if use optix; then + cuda_src_prepare + cuda_add_sandbox -w + fi + + sed -e "/^install.*llvm_macros.cmake.*cmake/d" -i CMakeLists.txt || die + + cmake_src_prepare +} + +src_configure() { + # pick the highest we support + local mysimd=() + if use cpu_flags_x86_avx512f; then + mysimd+=( avx512f ) + elif use cpu_flags_x86_avx2 ; then + mysimd+=( avx2 ) + if use cpu_flags_x86_f16c ; then + mysimd+=( f16c ) + fi + elif use cpu_flags_x86_avx ; then + mysimd+=( avx ) + elif use cpu_flags_x86_sse4_2 ; then + mysimd+=( sse4.2 ) + elif use cpu_flags_x86_sse4_1 ; then + mysimd+=( sse4.1 ) + elif use cpu_flags_x86_ssse3 ; then + mysimd+=( ssse3 ) + elif use cpu_flags_x86_sse3 ; then + mysimd+=( sse3 ) + elif use cpu_flags_x86_sse2 ; then + mysimd+=( sse2 ) + fi + + local mybatched=() + if use cpu_flags_x86_avx512f || use cpu_flags_x86_avx2 ; then + if use cpu_flags_x86_avx512f ; then + if use nofma; then + mybatched+=( + "b8_AVX512_noFMA" + "b16_AVX512_noFMA" + ) + else + mybatched+=( + "b8_AVX512" + "b16_AVX512" + ) + fi + fi + if use cpu_flags_x86_avx2 ; then + if use nofma; then + mybatched+=( + "b8_AVX2_noFMA" + ) + else + mybatched+=( + "b8_AVX2" + ) + fi + fi + elif use cpu_flags_x86_avx ; then + mybatched+=( + "b8_AVX" + ) + fi + + # If no CPU SIMDs were used, completely disable them + [[ -z "${mysimd[*]}" ]] && mysimd=("0") + [[ -z "${mybatched[*]}" ]] && mybatched=("0") + + # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully + # Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available. + use arm64 && append-flags -flax-vector-conversions + + local gcc + gcc="$(tc-getCC)" + + local mycmakeargs=( + -DCMAKE_POLICY_DEFAULT_CMP0146="OLD" # BUG FindCUDA + -DCMAKE_POLICY_DEFAULT_CMP0148="OLD" # BUG FindPythonInterp + + # std::tuple_size_v is c++17 + -DCMAKE_CXX_STANDARD="17" + + -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" + -DINSTALL_DOCS="$(usex doc)" + -DUSE_CCACHE="no" + -DLLVM_STATIC="no" + -DOSL_BUILD_TESTS="$(usex test)" + -DSTOP_ON_WARNING="no" + -DUSE_PARTIO="$(usex partio)" + -DUSE_PYTHON="$(usex python)" + -DPYTHON_VERSION="${EPYTHON/python}" + -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")" + -DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")" + -DUSE_LIBCPLUSPLUS="$(usex libcxx)" + -DOSL_USE_OPTIX="$(usex optix)" + -DVEC_REPORT="yes" + + -DOpenImageIO_ROOT="${EPREFIX}/usr" + ) + + if use gui; then + mycmakeargs+=( -DUSE_QT="yes" ) + if ! use qt6; then + mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6="yes" ) + fi + else + mycmakeargs+=( -DUSE_QT="no" ) + fi + + if use optix; then + mycmakeargs+=( + -DOptiX_FIND_QUIETLY="no" + -DCUDA_FIND_QUIETLY="no" + + -DOPTIXHOME="${EPREFIX}/opt/optix" + -DCUDA_TOOLKIT_ROOT_DIR="${EPREFIX}/opt/cuda" + + -DCUDA_NVCC_FLAGS="--compiler-bindir;$(cuda_gccdir)" + -DOSL_EXTRA_NVCC_ARGS="--compiler-bindir;$(cuda_gccdir)" + -DCUDA_VERBOSE_BUILD="yes" + ) + fi + + if use partio; then + mycmakeargs+=( + -Dpartio_DIR="${EPREFIX}/usr" + ) + fi + + cmake_src_configure +} + +src_test() { + # A bunch of tests only work when installed. + # So install them into the temp directory now. + DESTDIR="${T}" cmake_build install + + ln -s "${CMAKE_USE_DIR}/src/cmake/" "${BUILD_DIR}/src/cmake" || die + + if use optix; then + cp \ + "${BUILD_DIR}/src/liboslexec/shadeops_cuda.ptx" \ + "${BUILD_DIR}/src/testrender/"{optix_raytracer,quad,rend_lib_testrender,sphere,wrapper}".ptx" \ + "${BUILD_DIR}/src/testshade/"{optix_grid_renderer,rend_lib_testshade}".ptx" \ + "${BUILD_DIR}/bin/" || die + + # NOTE this should go to cuda eclass + addwrite /dev/nvidiactl + addwrite /dev/nvidia0 + addwrite /dev/nvidia-uvm + addwrite /dev/nvidia-caps + addwrite "/dev/char/" + fi + + CMAKE_SKIP_TESTS=( + "broken" + "^render" + + # broken with in-tree <=dev-libs/optix-7.5.0 and out of date + "^example-cuda$" + + # outright fail + "^transform-reg.regress.batched.opt$" + + # SIGABRT similar to https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1363 + "^derivs.opt.rs_bitcode$" + "^geomath.batched$" + "^matrix.batched$" + "^matrix.batched.opt$" + "^spline-reg.regress.batched.opt$" + "^transformc.batched$" + ) + + # These only fail inside sandbox + if [[ "${OSL_OPTIONAL_TESTS}" != "true" ]]; then + CMAKE_SKIP_TESTS+=( + # TODO: investigate failures + # SIGABRT similar to https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1363 + "^andor-reg.regress.batched.opt$" + "^arithmetic-reg.regress.batched.opt$" + "^array-assign-reg.regress.batched.opt$" + "^array-copy-reg.regress.batched.opt$" + "^array-length-reg.regress.batched$" + "^closure-parameters.batched$" + "^closure-parameters.batched.opt$" + "^closure.batched$" + "^closure.batched.opt$" + "^debug-uninit$" + "^debug-uninit.batched$" + "^debug-uninit.batched.opt$" + "^debug-uninit.opt$" + "^debug-uninit.opt.rs_bitcode$" + "^derivs$" + "^derivs.batched$" + "^derivs.batched.opt$" + "^derivs.opt$" + "^exponential$" + "^exponential.opt$" + "^exponential.opt.rs_bitcode$" + "^filterwidth-reg.regress.batched.opt$" + "^geomath$" + "^geomath.batched.opt$" + "^geomath.opt$" + "^geomath.opt.rs_bitcode$" + "^getattribute-camera.batched$" + "^getattribute-camera.batched.opt$" + "^getattribute-shader.batched.opt$" + "^gettextureinfo-reg.regress.batched.opt$" + "^gettextureinfo-udim-reg.regress.batched.opt$" + "^gettextureinfo.batched$" + "^hyperb.batched.opt$" + "^hyperb.opt$" + "^hyperb.opt.rs_bitcode$" + "^initlist.batched$" + "^initlist.batched.opt$" + "^linearstep.batched$" + "^linearstep.batched.opt$" + "^loop.batched$" + "^loop.batched.opt$" + "^matrix$" + "^matrix-compref-reg.regress.batched.opt$" + "^matrix-reg.regress.rsbitcode.opt$" + "^matrix.opt$" + "^matrix.opt.rs_bitcode$" + "^matrix.rsbitcode.opt$" + "^message-no-closure.batched$" + "^message-no-closure.batched.opt$" + "^message-reg.regress.batched.opt$" + "^miscmath$" + "^miscmath.batched$" + "^miscmath.batched.opt$" + "^miscmath.opt$" + "^miscmath.opt.rs_bitcode$" + "^noise-cell.batched$" + "^noise-gabor-reg.regress.batched.opt$" + "^noise-gabor.batched$" + "^noise-gabor.batched.opt$" + "^noise-generic.batched$" + "^noise-generic.batched.opt$" + "^noise-perlin.batched$" + "^noise-perlin.batched.opt$" + "^noise-reg.regress.batched.opt$" + "^noise-simplex.batched$" + "^noise-simplex.batched.opt$" + "^noise.batched$" + "^opt-warnings.batched$" + "^opt-warnings.batched.opt$" + "^pnoise-cell.batched$" + "^pnoise-gabor.batched$" + "^pnoise-gabor.batched.opt$" + "^pnoise-generic.batched$" + "^pnoise-generic.batched.opt$" + "^pnoise-perlin.batched$" + "^pnoise-perlin.batched.opt$" + "^pnoise-reg.regress.batched.opt$" + "^pnoise.batched$" + "^pointcloud.batched$" + "^pointcloud.batched.opt$" + "^regex-reg.regress.batched.opt$" + "^select.batched$" + "^select.batched.opt$" + "^shaderglobals.batched$" + "^shaderglobals.batched.opt$" + "^smoothstep-reg.regress.batched.opt$" + "^spline-derivbug.batched$" + "^spline-derivbug.batched.opt$" + "^spline.batched$" + "^spline.batched.opt$" + "^splineinverse-ident.batched$" + "^splineinverse-ident.batched.opt$" + "^split-reg.regress.batched.opt$" + "^string$" + "^string-reg.regress.batched.opt$" + "^string.batched$" + "^string.batched.opt$" + "^string.opt$" + "^string.opt.rs_bitcode$" + "^struct-array-mixture.batched$" + "^struct-array-mixture.batched.opt$" + "^struct.batched$" + "^test-fmt-matrixcolor.opt.rs_bitcode$" + "^testoptix-noise.optix.opt$" + "^testoptix-reparam.optix.opt$" + "^texture-environment-opts-reg.regress.batched.opt$" + "^texture-opts-reg.regress.batched.opt$" + "^texture-wrap.batched$" + "^texture-wrap.batched.opt$" + "^transcendental-reg.regress.batched.opt$" + "^transform$" + "^transform.batched$" + "^transform.batched.opt$" + "^transform.opt$" + "^transform.opt.rs_bitcode$" + "^transformc$" + "^transformc.batched.opt$" + "^transformc.opt$" + "^transformc.opt.rs_bitcode$" + "^transformc.rsbitcode.opt$" + "^trig$" + "^trig-reg.regress.batched.opt$" + "^trig.batched$" + "^trig.batched.opt$" + "^trig.opt$" + "^trig.opt.rs_bitcode$" + "^vecctr.batched$" + "^vecctr.batched.opt$" + "^vector$" + "^vector-reg.regress.batched.opt$" + "^vector.opt$" + "^vector.opt.rs_bitcode$" + "^xml-reg.regress.batched.opt$" + # diff + "^testoptix.optix.opt$" + ) + fi + + myctestargs=( + # src/build-scripts/ci-test.bash + '--force-new-ctest-process' + ) + + local -x DEBUG CXXFLAGS LD_LIBRARY_PATH DIR OSL_DIR OSL_SOURCE_DIR PYTHONPATH + DEBUG=1 # doubles the floating point tolerance + CXXFLAGS="-I${T}/usr/include" + LD_LIBRARY_PATH="${T}/usr/$(get_libdir)" + OSL_DIR="${T}/usr/$(get_libdir)/cmake/OSL" + OSL_SOURCE_DIR="${S}" + + if use python; then + PYTHONPATH="${BUILD_DIR}/lib/python/site-packages" + fi + + cmake_src_test + + CMAKE_SKIP_TESTS=( + "^render-background$" + "^render-mx-furnace-sheen$" + "^render-mx-burley-diffuse$" + "^render-mx-conductor$" + "^render-microfacet$" + "^render-veachmis$" + "^render-ward$" + "^render-raytypes.opt$" + "^render-raytypes.opt.rs_bitcode$" + ) + + myctestargs=( + # src/build-scripts/ci-test.bash + '--force-new-ctest-process' + --repeat until-pass:10 + -R "^render" + ) + + cmake_src_test +} diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask index e38f87231bfa..ebc94c196b5f 100644 --- a/profiles/arch/amd64/use.mask +++ b/profiles/arch/amd64/use.mask @@ -4,6 +4,10 @@ # Unmask the flag which corresponds to ARCH. -amd64 +# Paul Zander <[email protected]> (2024-03-28) +# dev-libs/optix works on amd64 +-optix + # Paul Zander <[email protected]> (2024-02-14) # sci-libs/atlas works on x86_64 -atlas diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask index 19271a8254e9..4211f21cb58e 100644 --- a/profiles/arch/arm64/use.mask +++ b/profiles/arch/arm64/use.mask @@ -4,6 +4,10 @@ # Unmask the flag which corresponds to ARCH. -arm64 +# Paul Zander <[email protected]> (2024-03-28) +# dev-libs/optix works on arm64 +-optix + # Mart Raudsepp <[email protected]> (2023-10-05) # Orc optimisations are supported on arm64 NEON since 0.4.33 -orc diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask index 0c7fe30d5a49..14aad0722e3b 100644 --- a/profiles/arch/base/use.mask +++ b/profiles/arch/base/use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Paul Zander <[email protected]> (2024-03-28) +# dev-libs/optix only works on amd64 and arm64 +optix + # Paul Zander <[email protected]> (2024-02-14) # media-libs/jasper is only supported on specific architectures jasper
