File tree Expand file tree Collapse file tree 2 files changed +6
-5
lines changed Expand file tree Collapse file tree 2 files changed +6
-5
lines changed Original file line number Diff line number Diff line change @@ -261,7 +261,7 @@ jobs:
261261 - desc : VFX2023 icx/C++17 py3.10 exr3.1 ocio2.3 qt5.15
262262 nametag : linux-vfx2023.icx
263263 # runner: ubuntu-latest
264- runner : ${{ (github.repository_owner == 'AcademySoftwareFoundation' && 'ubuntu-24 .04-arm64-2C-8G-75H ') || 'ubuntu-latest' }}
264+ runner : ${{ (github.repository_owner == 'AcademySoftwareFoundation' && 'ubuntu-22 .04-8c-32g-300h ') || 'ubuntu-latest' }}
265265 container : aswf/ci-osl:2023
266266 cc_compiler : icx
267267 cxx_compiler : icpx
@@ -270,12 +270,12 @@ jobs:
270270 pybind11_ver : v2.10.0
271271 simd : " avx2,f16c"
272272 benchmark : 1
273- setenvs : export USE_OPENVDB=0 USE_OPENCV=0 USE_FFMPEG=0
273+ setenvs : export USE_OPENVDB=0 USE_OPENCV=0 USE_FFMPEG=0 USE_LIBUHDR=0
274274 UHDR_CMAKE_C_COMPILER=gcc
275275 UHDR_CMAKE_CXX_COMPILER=g++
276276 # Building libuhdr with icx results in test failures
277277 # so we force using gcc/g++.
278- optional_deps_append : " LibRaw;Ptex;Qt6"
278+ optional_deps_append : " LibRaw;Ptex;Qt6;libuhdr "
279279 - desc : VFX2024 gcc11/C++17 py3.11 exr3.2 ocio2.3
280280 nametag : linux-vfx2024
281281 runner : ubuntu-latest
Original file line number Diff line number Diff line change @@ -39,10 +39,11 @@ if [[ "$ASWF_ORG" != "" ]] ; then
3939 time sudo yum remove -y nsight-compute-2022.3.0 libcublas-devel-11-8 libcublas-11-8 libcusparse-devel-11-8 libnpp-devel-11-8 libnpp-11-8 libcurand-devel-11-8 libcurand-11-8 || true
4040 time sudo yum remove -y nsight-compute-2024.3.1 libcublas-devel-12-6 libcublas-12-6 libcusparse-devel-12-6 libnpp-devel-12-6 libnpp-12-6 libcurand-devel-12-6 libcurand-12-6 || true
4141 df -h
42- sudo lsof | grep deleted
4342
4443 # time sudo dnf upgrade --refresh || true
45- time sudo dnf install --nogpgcheck https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-$( rpm -E %rhel) .noarch.rpm -y || true
44+ if [[ " ${DO_RPMFUSION_REPO:- 0} " != " 0" ]] ; then
45+ time sudo dnf install --nogpgcheck https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-$( rpm -E %rhel) .noarch.rpm -y || true
46+ fi
4647
4748 if [[ " $ASWF_VFXPLATFORM_VERSION " == " 2022" ]] ; then
4849 # CentOS 7 based containers need the now-nonexistent centos repo to be
You can’t perform that action at this time.
0 commit comments